diff -Naur phpbb-3.1.0-RC4/adm/style/acp_attachments.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_attachments.html
--- phpbb-3.1.0-RC4/adm/style/acp_attachments.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_attachments.html	2014-09-21 12:00:00.000000000 +0200
@@ -28,9 +28,9 @@
 	<h2>{L_UPLOADING_FILES}</h2>
 
 	<!-- BEGIN upload -->
-		:: {upload.FILE_INFO}<br />
+		:: {upload.FILE_INFO}<br>
 		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
-		<br /><br />
+		<br><br>
 	<!-- END upload -->
 
 <!-- ENDIF -->
@@ -54,7 +54,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
 			</dl>
 
@@ -64,8 +64,8 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</fieldset>
 
 	<!-- IF not S_SECURE_DOWNLOADS -->
@@ -82,13 +82,13 @@
 		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
-		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
-			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio"> {L_YES}</label>
+			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio"> {L_NO}</label></dd>
 	</dl>
 
 	<p class="quick">
-		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}">
 	</p>
 	</fieldset>
 
@@ -102,7 +102,7 @@
 		</dl>
 
 		<p class="quick">
-			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" />
+			<input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}">
 		</p>
 		</fieldset>
 
@@ -116,8 +116,7 @@
 <!-- ELSEIF S_EXTENSION_GROUPS -->
 
 	<!-- IF S_EDIT_GROUP -->
-		<script type="text/javascript" defer="defer">
-		// <![CDATA[
+		<script defer="defer">
 			function update_image(newimage)
 			{
 				if (newimage == 'no_image')
@@ -161,42 +160,40 @@
 					document.getElementById('ext').firstChild.nodeValue = str;
 				}
 			}
-
-		// ]]>
 		</script>
 
 		<form id="extgroups" method="post" action="{U_ACTION}">
 		<fieldset>
-			<input type="hidden" name="action" value="{ACTION}" />
-			<input type="hidden" name="g" value="{GROUP_ID}" />
+			<input type="hidden" name="action" value="{ACTION}">
+			<input type="hidden" name="g" value="{GROUP_ID}">
 
 			<legend>{L_LEGEND}</legend>
 		<dl>
 			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>
-			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
+			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}"></dd>
 		</dl>
 		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
 			<dd>{S_CATEGORY_SELECT}</dd>
 		</dl>
 		<dl>
 			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>
-			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
+			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
 			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}{L_COLON}</label></dt>
-			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
+			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
 			<dt><label for="upload_icon">{L_UPLOAD_ICON}{L_COLON}</label></dt>
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="">&nbsp;</dd>
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}"> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -204,15 +201,15 @@
 			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label></dd>
-			<dd><label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF -->> {L_ALLOW_ALL_FORUMS}</label></dd>
+			<dd><label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF -->> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
 		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		</p>
 		{S_FORM_TOKEN}
 		</fieldset>
@@ -225,7 +222,7 @@
 		<legend>{L_TITLE}</legend>
 
 		<table class="table1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
+			<col class="row1"><col class="row1"><col class="row2">
 		<thead>
 		<tr>
 			<th>{L_EXTENSION_GROUP}</th>
@@ -242,10 +239,10 @@
 			<!-- ENDIF -->
 			<tr>
 				<td><strong>{groups.GROUP_NAME}</strong>
-					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
-					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
-					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
+					<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span>
+					<!-- ELSEIF not groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br><span>&raquo; {L_NOT_ALLOWED_IN_PM_POST}</span>
+					<!-- ELSE --><br><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
 				</td>
 				<td>{groups.CATEGORY}</td>
 				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
@@ -254,8 +251,8 @@
 		</tbody>
 		</table>
 		<p class="quick">
-				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30" />
-				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
+				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30">
+				<input class="button2" name="add" type="submit" value="{L_SUBMIT}">
 		</p>
 		{S_FORM_TOKEN}
 		</fieldset>
@@ -270,7 +267,7 @@
 		<legend>{L_ADD_EXTENSION}</legend>
 	<dl>
 		<dt><label for="add_extension">{L_EXTENSION}</label></dt>
-		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd>
+		<dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}"></dd>
 	</dl>
 	<dl>
 		<dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt>
@@ -278,7 +275,7 @@
 	</dl>
 
 	<p class="quick">
-		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" />
+		<input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -290,7 +287,7 @@
 	<legend>{L_TITLE}</legend>
 
 	<table class="table1">
-		<col class="row1" /><col class="row1" /><col class="row2" />
+		<col class="row1"><col class="row1"><col class="row2">
 	<thead>
 	<tr>
 		<th>{L_EXTENSION}</th>
@@ -308,15 +305,15 @@
 		<tr>
 			<td><strong>{extensions.EXTENSION}</strong></td>
 			<td>{extensions.GROUP_OPTIONS}</td>
-			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}" /><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}" /></td>
+			<td><input type="checkbox" class="radio" name="extension_id_list[]" value="{extensions.EXTENSION_ID}"><input type="hidden" name="extension_change_list[]" value="{extensions.EXTENSION_ID}"></td>
 		</tr>
 	<!-- END extensions -->
 	</tbody>
 	</table>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -346,9 +343,9 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
-			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
-			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;"></td>
+			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]"></td>
+			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]"></td>
 		</tr>
 	<!-- END orphan -->
 	<tr class="row4">
@@ -359,11 +356,11 @@
 	</tbody>
 	</table>
 
-	<br />
+	<br>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -401,12 +398,12 @@
 	<!-- BEGIN attachments -->
 		<tr>
 			<td>
-				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
-				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
+				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br>{attachments.L_DOWNLOAD_COUNT}<br>{L_IN} {L_PRIVATE_MESSAGE}
+				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br>{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
 			</td>
-			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
+			<td>{attachments.FILETIME}<br>{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
 			<td class="centered-text">{attachments.FILESIZE}</td>
-			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
+			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]"></td>
 		</tr>
 	<!-- END attachments -->
 	</tbody>
@@ -430,14 +427,14 @@
 
 	<fieldset class="display-options">
 		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+		<input class="button2" type="submit" value="{L_GO}" name="sort">
 	</fieldset>
 
-	<hr />
+	<hr>
 
 <!-- IF .attachments -->
 	<fieldset class="quick">
-		<input class="button2" type="submit" name="submit" value="{L_DELETE_MARKED}" /><br />
+		<input class="button2" type="submit" name="submit" value="{L_DELETE_MARKED}"><br>
 		<p class="small">
 			<a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> &bull;
 			<a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a>		
@@ -453,8 +450,8 @@
 		<legend>{L_RESYNC_STATS}</legend>
 		<form id="action_stats_form" method="post" action="{U_ACTION}">
 			<dl>
-				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br /><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt>
+				<dd><input type="hidden" name="action" value="stats"><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}"></dd>
 			</dl>
 		</form>
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_avatar_options_gravatar.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_gravatar.html
--- phpbb-3.1.0-RC4/adm/style/acp_avatar_options_gravatar.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_gravatar.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox"></dd>
 </dl>
 <dl>
-	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth"> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth"> {L_PIXEL}
 	</dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_avatar_options_local.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_local.html
--- phpbb-3.1.0-RC4/adm/style/acp_avatar_options_local.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_local.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,15 +4,15 @@
 		<!-- 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 type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
+	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2"></dd>
 </dl>
 	<!-- IF AVATAR_LOCAL_SHOW -->
 	<ul id="gallery">
 	<!-- BEGIN avatar_local_row -->
 	<!-- BEGIN avatar_local_col -->
 		<li>
-			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
-			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt=""><br>
+			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"></label>
 		</li>
 	<!-- END avatar_local_col -->
 	<!-- END avatar_local_row -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_avatar_options_remote.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_remote.html
--- phpbb-3.1.0-RC4/adm/style/acp_avatar_options_remote.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_remote.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox"></dd>
 </dl>
 <dl>
-	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth"> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth"> {L_PIXEL}
 	</dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_avatar_options_upload.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_upload.html
--- phpbb-3.1.0-RC4/adm/style/acp_avatar_options_upload.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_avatar_options_upload.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
 	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}"><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth"></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox"></dd>
 	</dl>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ban.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ban.html
--- phpbb-3.1.0-RC4/adm/style/acp_ban.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ban.html	2014-09-21 12:00:00.000000000 +0200
@@ -8,9 +8,7 @@
 
 <p>{L_EXPLAIN}</p>
 
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	var ban_reason = new Array();
@@ -42,8 +40,6 @@
 			document.getElementById('unbangivereason').innerHTML = '';
 		}
 	}
-
-// ]]>
 </script>
 
 <form id="acp_ban" method="post" action="{U_ACTION}">
@@ -58,31 +54,31 @@
 <dl>
 	<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
 	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
+	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox"><br><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 </dl>
 <dl>
-	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
-		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" name="banexclude" value="1" class="radio"> {L_YES}</label>
+		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio"> {L_NO}</label></dd>
 </dl>
 <dl>
 	<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>
-	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
+	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason"></dd>
 </dl>
 <dl>
 	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
-	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
+	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason"></dd>
 </dl>
 
 <p class="submit-buttons">
-	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}">&nbsp;
+	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}">
 </p>
 {S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<br /><br />
+<br><br>
 
 <h1>{L_UNBAN_TITLE}</h1>
 
@@ -100,7 +96,7 @@
 	</dl>
 	<dl>
 		<dt><label for="unbanlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
-		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
+		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength"></dd>
 	</dl>
 	<dl>
 		<dt><label for="unbanreason">{L_BAN_REASON}{L_COLON}</label></dt>
@@ -112,8 +108,8 @@
 	</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_bbcodes.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_bbcodes.html
--- phpbb-3.1.0-RC4/adm/style/acp_bbcodes.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_bbcodes.html	2014-09-21 12:00:00.000000000 +0200
@@ -16,7 +16,7 @@
 		<legend>{L_BBCODE_USAGE}</legend>
 		<p>{L_BBCODE_USAGE_EXPLAIN}</p>
 	<dl>
-		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br /><br /><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
+		<dt><label for="bbcode_match">{L_EXAMPLES}</label><br><br><span>{L_BBCODE_USAGE_EXAMPLE}</span></dt>
 		<dd><textarea id="bbcode_match" name="bbcode_match" cols="60" rows="5">{BBCODE_MATCH}</textarea></dd>
 	</dl>
 	</fieldset>
@@ -25,7 +25,7 @@
 		<legend>{L_HTML_REPLACEMENT}</legend>
 		<p>{L_HTML_REPLACEMENT_EXPLAIN}</p>
 	<dl>
-		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br /><br /><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
+		<dt><label for="bbcode_tpl">{L_EXAMPLES}</label><br><br><span>{L_HTML_REPLACEMENT_EXAMPLE}</span></dt>
 		<dd><textarea id="bbcode_tpl" name="bbcode_tpl" cols="60" rows="8">{BBCODE_TPL}</textarea></dd>
 	</dl>
 	</fieldset>
@@ -35,7 +35,7 @@
 		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
 	<dl>
 		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
-		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
+		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}"></dd>
 	</dl>
 	</fieldset>
 
@@ -43,7 +43,7 @@
 		<legend>{L_SETTINGS}</legend>
 	<dl>
 		<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
-		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
+		<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF -->></dd>
 	</dl>
 	</fieldset>
 
@@ -51,12 +51,12 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	
-	<br />
+	<br>
 
 	<table class="table1" id="down">
 	<thead>
@@ -114,7 +114,7 @@
 	</table>
 
 	<p class="quick">
-		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" />
+		<input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_board.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_board.html
--- phpbb-3.1.0-RC4/adm/style/acp_board.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_board.html	2014-09-21 12:00:00.000000000 +0200
@@ -25,7 +25,7 @@
 	<!-- ELSE -->
 
 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>
 
@@ -42,8 +42,8 @@
 <!-- ENDIF -->
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_bots.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_bots.html
--- phpbb-3.1.0-RC4/adm/style/acp_bots.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_bots.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,15 +22,15 @@
 	<fieldset>
 		<legend>{L_TITLE}</legend>
 	<dl>
-		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
-		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
+		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255"></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
 		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br><span>{L_BOT_LANG_EXPLAIN}</span></dt>
 		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
 	</dl>
 	<dl>
@@ -38,17 +38,17 @@
 		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
-		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
+		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255"></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
-		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
+		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255"></dd>
 	</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -79,19 +79,19 @@
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a>&nbsp;</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}"></td>
 		</tr>
 	<!-- END bots -->
 	</tbody>
 	</table>
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
+		<input class="button2" name="add" type="submit" value="{L_BOT_ADD}">
 	</fieldset>
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<select name="action">{S_BOT_OPTIONS}</select>
-		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
+		<input class="button2" name="submit" type="submit" value="{L_SUBMIT}">
 		<p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p>
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_captcha.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_captcha.html
--- phpbb-3.1.0-RC4/adm/style/acp_captcha.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_captcha.html	2014-09-21 12:00:00.000000000 +0200
@@ -14,40 +14,40 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF -->> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF -->> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}"></dd>
 </dl>
 <dl>
-	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
+	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}"></dd>
 </dl>
 <dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF -->> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF -->> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF -->> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF -->> {L_DISABLED}</label></dd>
 </dl>
 </fieldset>
 
 <fieldset>
 <legend>{L_AVAILABLE_CAPTCHAS}</legend>
 <dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
 	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
 </dl>
  <!-- IF S_CAPTCHA_HAS_CONFIG -->
 <dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
-	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}"></dd>
 </dl>
 <!-- ENDIF -->
 </fieldset>
@@ -62,8 +62,8 @@
 <fieldset>
 	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}" />&nbsp;
+		<input class="button1" type="submit" id="main_submit" name="main_submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="form_reset" name="reset" value="{L_RESET}">&nbsp;
 	</p>
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_contact.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_contact.html
--- phpbb-3.1.0-RC4/adm/style/acp_contact.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_contact.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,15 +1,11 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	var form_name = 'acp_contact';
 	var text_name = 'contact_admin_info';
 	var load_draft = false;
 	var upload = false;
 	var imageTag = false;
-
-// ]]>
 </script>
 
 <a id="maincontent"></a>
@@ -22,10 +18,10 @@
 	<fieldset>
 		<legend>{L_GENERAL_OPTIONS}</legend>
 		<dl>
-			<dt><label for="contact_admin_form_enable">{L_CONTACT_US_ENABLE}{L_COLON}</label><br /><span>{L_CONTACT_US_ENABLE_EXPLAIN}</span></dt>
+			<dt><label for="contact_admin_form_enable">{L_CONTACT_US_ENABLE}{L_COLON}</label><br><span>{L_CONTACT_US_ENABLE_EXPLAIN}</span></dt>
 			<dd>
-				<label><input type="radio" class="radio" id="contact_admin_form_enable" name="contact_admin_form_enable" value="1"<!-- IF CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-				<label><input type="radio" class="radio" name="contact_admin_form_enable" value="0"<!-- IF not CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label>
+				<label><input type="radio" class="radio" id="contact_admin_form_enable" name="contact_admin_form_enable" value="1"<!-- IF CONTACT_ENABLED --> checked="checked"<!-- ENDIF -->> {L_ENABLED}</label>
+				<label><input type="radio" class="radio" name="contact_admin_form_enable" value="0"<!-- IF not CONTACT_ENABLED --> checked="checked"<!-- ENDIF -->> {L_DISABLED}</label>
 			</dd>
 		</dl>
 	</fieldset>
@@ -53,13 +49,13 @@
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_DISABLE_BBCODE}</label>
 				<!-- ENDIF -->
 				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_DISABLE_SMILIES}</label>
 				<!-- ENDIF -->
 				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
+				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_DISABLE_MAGIC_URL}</label>
 				<!-- ENDIF -->
 			</dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
@@ -67,8 +63,8 @@
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}">
 		{S_FORM_TOKEN}
 	</fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_database.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_database.html
--- phpbb-3.1.0-RC4/adm/style/acp_database.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_database.html	2014-09-21 12:00:00.000000000 +0200
@@ -18,9 +18,9 @@
 	</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
-		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
-		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}">&nbsp;
+		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}">&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -36,9 +36,7 @@
 
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
-	<script type="text/javascript">
-	// <![CDATA[
-
+	<script>
 		function selector(bool)
 		{
 			var table = document.getElementById('table');
@@ -48,8 +46,6 @@
 				table.options[i].selected = bool;
 			}
 		}
-
-	// ]]>
 	</script>
 
 	<form id="acp_backup" method="post" action="{U_ACTION}">
@@ -58,21 +54,21 @@
 		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
 		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
-			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
-			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
+		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked"> {L_FULL_BACKUP}</label>
+			<label><input type="radio" name="type" class="radio" value="structure"> {L_STRUCTURE_ONLY}</label>
+			<label><input type="radio" class="radio" name="type" value="data"> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="method">{L_FILE_TYPE}{L_COLON}</label></dt>
 		<dd><!-- BEGIN methods -->
-		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
+		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}"> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
 	<dl>
 		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
 		<dd>
-			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
-			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked"> {L_STORE_LOCAL}</label>
+			<label><input type="radio" class="radio" name="where" value="download"> {L_DOWNLOAD}</label>
 		</dd>
 	</dl>
 	<dl>
@@ -86,8 +82,8 @@
 	</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_disallow.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_disallow.html
--- phpbb-3.1.0-RC4/adm/style/acp_disallow.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_disallow.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,12 +11,12 @@
 <fieldset>
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
-	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
+	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user"></dd>
 </dl>
 
 <p class="quick">
-	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" />
+	<input class="button1" type="submit" name="disallow" value="{L_SUBMIT}">
 </p>
 </fieldset>
 
@@ -33,7 +33,7 @@
 	</dl>
 
 	<p class="quick">
-		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="allow" value="{L_SUBMIT}">
 	</p>
 <!-- ELSE -->
 	<p>{L_NO_DISALLOWED}</p>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_email.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_email.html
--- phpbb-3.1.0-RC4/adm/style/acp_email.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_email.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,16 +22,16 @@
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
+	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
-	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
+	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}"></dd>
 </dl>
 <dl>
-	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
+	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
 	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
 </dl>
 <dl>
@@ -39,17 +39,17 @@
 	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
-	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>
+	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
+	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio"></dd>
 </dl>
 <dl>
 	<dt><label for="send">{L_SEND_IMMEDIATELY}{L_COLON}</label></dt>
-	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
+	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked"></dd>
 </dl>
 
 <p class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}">&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 </p>
 {S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ext_delete_data.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_delete_data.html
--- phpbb-3.1.0-RC4/adm/style/acp_ext_delete_data.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_delete_data.html	2014-09-21 12:00:00.000000000 +0200
@@ -21,8 +21,8 @@
 	<form id="acp_extensions" method="post" action="{U_PURGE}">
 	<fieldset class="submit-buttons">
 		<legend>{L_EXTENSION_DELETE_DATA}</legend>
-		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}">
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}">
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
@@ -32,7 +32,7 @@
 	<!-- ELSE -->
 		<div class="successbox">
 			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
-			<br />
+			<br>
 			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ext_disable.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_disable.html
--- phpbb-3.1.0-RC4/adm/style/acp_ext_disable.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_disable.html	2014-09-21 12:00:00.000000000 +0200
@@ -15,8 +15,8 @@
 
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}">
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}">
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
@@ -26,7 +26,7 @@
 	<!-- ELSE -->
 		<div class="successbox">
 			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
-			<br />
+			<br>
 			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ext_enable.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_enable.html
--- phpbb-3.1.0-RC4/adm/style/acp_ext_enable.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_enable.html	2014-09-21 12:00:00.000000000 +0200
@@ -21,8 +21,8 @@
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}">
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}">
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
@@ -32,7 +32,7 @@
 	<!-- ELSE -->
 		<div class="successbox">
 			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
-			<br />
+			<br>
 			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
 	<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ext_list.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_list.html
--- phpbb-3.1.0-RC4/adm/style/acp_ext_list.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ext_list.html	2014-09-21 12:00:00.000000000 +0200
@@ -17,15 +17,15 @@
 		<dl>
 			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
 			<dd>
-				<label><input type="radio" id="force_unstable" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" id="force_unstable" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 
 		<p class="submit-buttons">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-			<input type="hidden" name="action" value="set_config_version_check_force_unstable" />
+			<input class="button1" type="submit" name="update" value="{L_SUBMIT}">&nbsp;
+			<input class="button2" type="reset" name="reset" value="{L_RESET}">
+			<input type="hidden" name="action" value="set_config_version_check_force_unstable">
 			{S_FORM_TOKEN}
 		</p>
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_forums.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_forums.html
--- phpbb-3.1.0-RC4/adm/style/acp_forums.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_forums.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,7 @@
 
 <!-- IF S_EDIT_FORUM -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		/**
 		* Handle displaying/hiding several options based on the forum type
 		*/
@@ -90,8 +89,6 @@
 			phpbb.toggleDisplay('forum_rules_options', -1);
 			<!-- ENDIF -->
 		}
-
-	// ]]>
 	</script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -119,8 +116,8 @@
 	<div id="type_actions">
 		<dl>
 			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
-			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
+			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF -->> {L_DELETE_ALL_POSTS}</label></dd>
+			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked"> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
 		</dl>
 	</div>
 	<!-- ENDIF -->
@@ -129,9 +126,9 @@
 		<dl>
 			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}{L_COLON}</label></dt>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked"> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ELSE -->
-				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked"> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- ENDIF -->
 		</dl>
 	</div>
@@ -142,40 +139,40 @@
 	</dl>
 	<!-- IF S_CAN_COPY_PERMISSIONS -->
 		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}{L_COLON}</label></dt>
-		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
+		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255"></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
+		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
 		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" data-bbcode="true">{FORUM_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
-		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
+		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
+		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255"></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
-			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
+			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}"></dd>
 		<!-- ENDIF -->
 	</dl>
 	<dl>
-		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off"></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off"></dd>
 	</dl>
 	<!-- IF S_FORUM_PASSWORD_SET -->
 	<dl>
-		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
-		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox"></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
@@ -188,9 +185,9 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -203,43 +200,43 @@
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999"></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -247,49 +244,49 @@
 		<fieldset>
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
 		<dl>
-			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999"> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999"> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999"> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_shadow_prune">{L_FORUM_PRUNE_SHADOW}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_shadow_prune" value="1"<!-- IF S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="enable_shadow_prune">{L_FORUM_PRUNE_SHADOW}{L_COLON}</label><br><span>{L_FORUM_PRUNE_SHADOW_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="enable_shadow_prune" value="1"<!-- IF S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999"> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999"> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -298,18 +295,18 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
+			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255"></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -318,8 +315,8 @@
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
 		<dl>
-			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
+			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255"></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
@@ -328,19 +325,19 @@
 		</dl>
 	<!-- ENDIF -->
 		<dl>
-			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
+			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
 			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70" data-bbcode="true">{FORUM_RULES_PLAIN}</textarea></dd>
-			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_URLS}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -371,24 +368,24 @@
 	<!-- IF S_FORUM_POST -->
 		<dl>
 			<dt><label for="delete_action">{L_ACTION}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
+			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked"> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
-				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
+				<dd><label><input type="radio" class="radio" name="action_posts" value="move"> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
 			<dt><label for="sub_delete_action">{L_ACTION}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
+			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked"> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- IF S_FORUMS_LIST -->
-				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
+				<dd><label><input type="radio" class="radio" name="action_subforums" value="move"> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ENDIF -->
 		</dl>
 	<!-- ENDIF -->
 
 	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -396,12 +393,10 @@
 
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		var close_waitscreen = 0;
 		// no scrollbars...
 		popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
-	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -412,8 +407,7 @@
 
 <!-- ELSE -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		/**
 		* Popup search progress bar
 		*/
@@ -423,7 +417,6 @@
 			// no scrollbars...
 			popup('{UA_PROGRESS_BAR}', 400, 240, '_sync');
 		}
-	// ]]>
 	</script>
 
 	<h1>{L_FORUM_ADMIN}</h1>
@@ -438,10 +431,8 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_RESYNCED -->
-		<script type="text/javascript">
-		// <![CDATA[
+		<script>
 			var close_waitscreen = 1;
-		// ]]>
 		</script>
 
 		<div class="successbox">
@@ -454,7 +445,7 @@
 
 	<!-- IF .forums -->
 		<table class="table1 forums">
-			<col class="row1" /><col class="row1" /><col class="row2" />
+			<col class="row1"><col class="row1"><col class="row2">
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
@@ -462,8 +453,8 @@
 				<td class="forum-desc">
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
-					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
+					<!-- IF forums.FORUM_DESCRIPTION --><br><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br><br><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
 				<td class="actions">
 					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
@@ -489,7 +480,7 @@
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
 
-		<input class="button2" type="submit" value="{L_GO}" />
+		<input class="button2" type="submit" value="{L_GO}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -497,10 +488,10 @@
 	<form id="forums" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick">
-		<input type="hidden" name="action" value="add" />
+		<input type="hidden" name="action" value="add">
 
-		<input type="text" name="forum_name" value="" maxlength="255" />
-		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" />
+		<input type="text" name="forum_name" value="" maxlength="255">
+		<input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_forums_copy_perm.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_forums_copy_perm.html
--- phpbb-3.1.0-RC4/adm/style/acp_forums_copy_perm.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_forums_copy_perm.html	2014-09-21 12:00:00.000000000 +0200
@@ -9,11 +9,11 @@
 
 <fieldset>
 	<dl>
-		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
-		<input type="submit" name="update" value="{L_CONTINUE}" class="button2" />&nbsp;
+		<input type="submit" name="update" value="{L_CONTINUE}" class="button2">&nbsp;
 	</div>
 </fieldset>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_groups.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_groups.html
--- phpbb-3.1.0-RC4/adm/style/acp_groups.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_groups.html	2014-09-21 12:00:00.000000000 +0200
@@ -23,32 +23,32 @@
 		<legend>{L_GROUP_DETAILS}</legend>
 	<dl>
 		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></dt>
-		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
+		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}"></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>
 		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
-		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
-			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_BBCODE}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_SMILIES}</label>
+			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
-			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
-				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE}> {L_GROUP_OPEN}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN}> {L_GROUP_REQUEST}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED}> {L_GROUP_CLOSED}</label>
+				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN}> {L_GROUP_HIDDEN}</label>
 			</dd>
 		</dl>
 	<!-- ELSE -->
-		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
+		<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}">
 	<!-- ENDIF -->
 
 	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
 		<dl>
-			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
@@ -59,25 +59,25 @@
 	<!-- EVENT acp_group_options_before -->
 	<!-- IF S_USER_FOUNDER -->
 	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
-		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
+		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
+		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE}></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
-		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
+		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
+		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH}></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_legend">{L_GROUP_LEGEND}{L_COLON}</label></dt>
-		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
+		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND}></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}{L_COLON}</label></dt>
-		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd>
+		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE}></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
-		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
+		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM}></dd>
 	</dl>
 	<!-- EVENT acp_group_options_after -->
 	</fieldset>
@@ -85,17 +85,17 @@
 	<fieldset>
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
-		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd>
-			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6">
 			<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&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>
@@ -110,9 +110,9 @@
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br><span>{L_AVATAR_EXPLAIN}</span></dt>
 		<dd>{AVATAR}</dd>
-		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete"> {L_DELETE_AVATAR}</label></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
@@ -134,8 +134,8 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -174,7 +174,7 @@
 			<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;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{leader.USER_ID}"></td>
 		</tr>
 	<!-- BEGINELSE -->
 		<tr>
@@ -195,7 +195,7 @@
 			<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>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}"></td>
 		</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
@@ -213,7 +213,7 @@
 
 	<fieldset class="quick">
 		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}">
 		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
 	</fieldset>
 
@@ -225,22 +225,22 @@
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
-		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
+		<dd><label><input name="leader" type="radio" class="radio" value="1"> {L_YES}</label>
+			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked"> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
-		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
-			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
+		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dd><label><input name="default" type="radio" class="radio" value="1"> {L_YES}</label>
+			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked"> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
 
 	<p class="quick">
-		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />
+		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -266,7 +266,7 @@
 	<form id="acp_groups" method="post" action="{U_ACTION}">
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1"><col class="col1"><col class="col2"><col class="col2"><col class="col2">
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
@@ -288,8 +288,8 @@
 
 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
+			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value=""> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}">
+			<input type="hidden" name="add" value="1">
 		<!-- ENDIF -->
 		{S_FORM_TOKEN}
 	</fieldset>
@@ -300,7 +300,7 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1"><col class="col1"><col class="col2"><col class="col2"><col class="col2">
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_groups_position.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_groups_position.html
--- phpbb-3.1.0-RC4/adm/style/acp_groups_position.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_groups_position.html	2014-09-21 12:00:00.000000000 +0200
@@ -9,17 +9,17 @@
 	<fieldset>
 		<legend>{L_LEGEND_SETTINGS}</legend>
 		<dl>
-			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
+			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
 			<dd>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_legend" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}">
+		<input type="hidden" name="action" value="set_config_legend">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -28,7 +28,7 @@
 	<p>{L_LEGEND_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col1"><col class="col2"><col class="col2">
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
@@ -65,8 +65,8 @@
 					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
 				<!-- END add_legend -->
 			</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD}">
+			<input type="hidden" name="action" value="add">
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -80,23 +80,23 @@
 		<dl>
 			<dt><label for="teampage_memberships">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
 			<dd>
-				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
-				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
-				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_ALL}</label>
+				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF -->> {L_TEAMPAGE_DISP_FIRST}</label><br>
+				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF -->> {L_TEAMPAGE_DISP_DEFAULT}</label><br>
+				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF -->> {L_TEAMPAGE_DISP_ALL}</label>
 			</dd>
 		</dl>
 		<dl>
-			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
+			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
 			<dd>
-				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_teampage" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}">
+		<input type="hidden" name="action" value="set_config_teampage">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -107,7 +107,7 @@
 	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
 
 	<table class="table1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col1"><col class="col2"><col class="col2">
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
@@ -146,9 +146,9 @@
 	<!-- IF not S_TEAMPAGE_CATEGORY -->
 	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
 		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
-			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
-			<input type="hidden" name="action" value="add_category" />
+			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}">
+			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}">
+			<input type="hidden" name="action" value="add_category">
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -162,8 +162,8 @@
 					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
 				<!-- END add_teampage -->
 			</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
+			<input class="button2" type="submit" name="submit" value="{L_ADD}">
+			<input type="hidden" name="action" value="add">
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_icons.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_icons.html
--- phpbb-3.1.0-RC4/adm/style/acp_icons.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_icons.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<script type="text/javascript" defer="defer">
-	// <![CDATA[
+	<script defer="defer">
 	<!-- IF S_ADD_CODE -->
 	
 			var smiley = Array();
@@ -60,7 +59,6 @@
 			nodisp.className = '';
 		}
 	}
-	// ]]>
 	</script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -102,18 +100,18 @@
 	<!-- BEGIN items -->
 		<tr>
 	
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title=""><input type="hidden" name="image[{items.IMG}]" value="1"></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
-			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
-			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
+			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50"></td>
+			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50"></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}"></td>
+		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}"></td>
 		<td>
-			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
+			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');">
 			<!-- IF items.S_ID -->
-				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}" />
+				<input type="hidden" name="id[{items.IMG}]" value="{items.ID}">
 			<!-- ENDIF -->
 		</td>
 		<!-- IF ID or S_ADD -->
@@ -123,7 +121,7 @@
 			</select></td>
 		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
-			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
+			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1"></td>
 		<!-- ENDIF -->
 		</tr>
 	<!-- END items -->
@@ -133,17 +131,17 @@
 	</tr>
 	<tr class="row1">
 		<td style="text-align: center;"><select name="add_image" id="add_image" onchange="update_image(this.options[selectedIndex].value);">{S_IMG_OPTIONS}</select></td>
-		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
-		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
-		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
+		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title=""></td>
+		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50"></td>
+		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50"></td>
+		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}"></td>
+		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}"></td>
+		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"></td>
  		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
 				<optgroup id="order_no_disp_add_order" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup>
 		</select></td>
-		<td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td>
+		<td><input type="checkbox" class="radio" name="add_additional_code" value="1"></td>
 	</tr>
 	<!-- ENDIF -->
 	<!-- ELSE -->
@@ -155,8 +153,8 @@
 	</table>
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -183,14 +181,14 @@
 			<dt><label for="pak">{L_SELECT_PACKAGE}</label></dt>
 			<dd><select id="pak" name="pak">{S_PAK_OPTIONS}</select></dd>
 		</dl>
-			<dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL}</label>
-				<label><input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES}</label>
-				<label><input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL}</label></dd>
+			<dt><label for="current">{L_CURRENT}</label><br><span>{L_CURRENT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked"> {L_KEEP_ALL}</label>
+				<label><input type="radio" class="radio" name="current" value="replace"> {L_REPLACE_MATCHES}</label>
+				<label><input type="radio" class="radio" name="current" value="delete"> {L_DELETE_ALL}</label></dd>
 		</dl>
 
 	<p class="quick">
-		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" />
+		<input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}">
 	</p>
 	<!-- ENDIF -->
 	{S_FORM_TOKEN}
@@ -237,7 +235,7 @@
 			</tr>
 		<!-- ENDIF -->
 		<tr>
-			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
+			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}"></td>
 			<!-- IF S_SMILIES -->
 				<td style="text-align: center;">{items.CODE}</td>
 				<td style="text-align: center;">{items.EMOTION}</td>
@@ -263,7 +261,7 @@
 	<!-- ENDIF -->
 	</div>
 	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
+		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}">&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_inactive.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_inactive.html
--- phpbb-3.1.0-RC4/adm/style/acp_inactive.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_inactive.html	2014-09-21 12:00:00.000000000 +0200
@@ -30,16 +30,16 @@
 	<tr>
 		<td style="vertical-align: top;">
 			{inactive.USERNAME_FULL}
-			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+			<!-- IF inactive.POSTS --><br>{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 		</td>
 		<td style="vertical-align: top;">{inactive.JOINED}</td>
 		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
 		<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
 		<td style="vertical-align: top;">
 			{inactive.REASON}
-			<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+			<!-- IF inactive.REMINDED --><br>{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
 		</td>
-		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}" />&nbsp;</td>
+		<td>&nbsp;<input type="checkbox" class="radio" name="mark[]" value="{inactive.USER_ID}">&nbsp;</td>
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
@@ -50,11 +50,11 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}"><!-- ENDIF -->
+	<input class="button2" type="submit" value="{L_GO}" name="sort">
 </fieldset>
 
-<hr />
+<hr>
 
 <!-- IF .pagination -->
 	<div class="pagination">
@@ -64,7 +64,7 @@
 
 <fieldset class="quick">
 	<select name="action">{S_INACTIVE_OPTIONS}</select>
-	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+	<input class="button2" type="submit" name="submit" value="{L_SUBMIT}">
 	<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_jabber.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_jabber.html
--- phpbb-3.1.0-RC4/adm/style/acp_jabber.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_jabber.html	2014-09-21 12:00:00.000000000 +0200
@@ -21,43 +21,43 @@
 	<p>{L_JAB_GTALK_NOTE}</p>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF -->> {L_ENABLED}</label>
+		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF -->> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
+	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}"></dd>
 </dl>
 <dl>
-	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5"></dd>
 </dl>
 <dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
-	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
+	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}"></dd>
 </dl>
 <dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}"></dd>
 </dl>
 <!-- IF S_CAN_USE_SSL -->
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999"></dd>
 </dl>
 
 </fieldset>
 
 <fieldset class="submit-buttons">
-	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_language.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_language.html
--- phpbb-3.1.0-RC4/adm/style/acp_language.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_language.html	2014-09-21 12:00:00.000000000 +0200
@@ -14,11 +14,11 @@
 		<legend>{LANG_LOCAL_NAME}</legend>
 	<dl>
 		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}{L_COLON}</label></dt>
-		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
+		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100"></dd>
 	</dl>
 	<dl>
 		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}{L_COLON}</label></dt>
-		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
+		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255"></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_LANG_ISO_CODE}{L_COLON}</label></dt>
@@ -26,11 +26,11 @@
 	</dl>
 	<dl>
 		<dt><label for="lang_author">{L_LANG_AUTHOR}{L_COLON}</label></dt>
-		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
+		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255"></dd>
 	</dl>
 
 	<p class="quick" style="margin-top: -15px;">
-		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" />
+		<input type="submit" name="update_details" class="button2" value="{L_SUBMIT}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -42,7 +42,7 @@
 		<fieldset>
 			<legend>{L_MISSING_LANG_FILES}</legend>
 			<!-- BEGIN missing_files -->
-			&raquo; {missing_files.FILE_NAME}<br />
+			&raquo; {missing_files.FILE_NAME}<br>
 			<!-- END missing_files -->
 		</fieldset>
 	<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_logs.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_logs.html
--- phpbb-3.1.0-RC4/adm/style/acp_logs.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_logs.html	2014-09-21 12:00:00.000000000 +0200
@@ -9,7 +9,7 @@
 <form id="list" method="post" action="{U_ACTION}">
 
 <fieldset class="display-options" style="float: left">
-	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}">&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}">
 </fieldset>
 
 <!-- IF .pagination -->
@@ -37,14 +37,14 @@
 			<td>
 				{log.USERNAME}
 				<!-- IF log.REPORTEE_USERNAME -->
-				<br />&raquo; {log.REPORTEE_USERNAME}
+				<br>&raquo; {log.REPORTEE_USERNAME}
 				<!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">{log.IP}</td>
 			<td style="text-align: center;">{log.DATE}</td>
-			<td>{log.ACTION}<!-- IF log.DATA --><br /><span>{log.DATA}</span><!-- ENDIF --></td>
+			<td>{log.ACTION}<!-- IF log.DATA --><br><span>{log.DATA}</span><!-- ENDIF --></td>
 			<!-- IF S_CLEARLOGS -->
-				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+				<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}"></td>
 			<!-- ENDIF -->
 		</tr>
 	<!-- END log -->
@@ -65,22 +65,22 @@
 
 <fieldset class="display-options">
 	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
-	<input class="button2" type="submit" value="{L_GO}" name="sort" />
+	<input class="button2" type="submit" value="{L_GO}" name="sort">
 	{S_FORM_TOKEN}
 </fieldset>
-<hr />
+<hr>
 
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
+		<input class="button2" type="submit" value="{L_GO}">
 	</fieldset>
 <!-- ENDIF -->
 
 <!-- IF .log and S_CLEARLOGS -->
 	<fieldset class="quick">
-		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br />
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}">&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}"><br>
 		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
 	</fieldset>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_main.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_main.html
--- phpbb-3.1.0-RC4/adm/style/acp_main.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_main.html	2014-09-21 12:00:00.000000000 +0200
@@ -87,7 +87,7 @@
 
 	<table class="table1 two-columns no-header" data-no-responsive-header="true">
 		<caption>{L_FORUM_STATS}</caption>
-		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+		<col class="col1"><col class="col2"><col class="col1"><col class="col2">
 	<thead>
 	<tr>
 		<th>{L_STATISTIC}</th>
@@ -163,52 +163,52 @@
 
 			<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
-					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
+					<dt><label for="action_online">{L_RESET_ONLINE}</label><br><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="online"><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
 			<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
-					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
-					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
+					<dt><label for="action_date">{L_RESET_DATE}</label><br><span>&nbsp;</span></dt>
+					<dd><input type="hidden" name="action" value="date"><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
 			<form id="action_stats_form" method="post" action="{U_ACTION}">
 				<dl>
-					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
+					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="stats"><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
 			<form id="action_user_form" method="post" action="{U_ACTION}">
 				<dl>
-					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
+					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="user"><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
 			<form id="action_db_track_form" method="post" action="{U_ACTION}">
 				<dl>
-					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>
+					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="db_track"><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
 			<!-- IF S_FOUNDER -->
 			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
-					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
+					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_sessions"><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 			<!-- ENDIF -->
 
 			<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">
 				<dl>
-					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
-					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
+					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
+					<dd><input type="hidden" name="action" value="purge_cache"><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}"></dd>
 				</dl>
 			</form>
 
@@ -267,14 +267,14 @@
 			<tr>
 				<td style="vertical-align: top;">
 					{inactive.USERNAME_FULL}
-					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+					<!-- IF inactive.POSTS --><br>{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 				</td>
 				<td style="vertical-align: top;">{inactive.JOINED}</td>
 				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
 				<td style="vertical-align: top;">{inactive.LAST_VISIT}</td>
 				<td style="vertical-align: top;">
 					{inactive.REASON}
-					<!-- IF inactive.REMINDED --><br />{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
+					<!-- IF inactive.REMINDED --><br>{inactive.REMINDED_EXPLAIN}<!-- ENDIF -->
 				</td>
 			</tr>
 		<!-- BEGINELSE -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_modules.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_modules.html
--- phpbb-3.1.0-RC4/adm/style/acp_modules.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_modules.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,7 @@
 
 <!-- IF S_EDIT_MODULE -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		function display_options(value)
 		{
 			if (value == 'category')
@@ -50,8 +49,6 @@
 			// select first item
 			item.options[0].selected = true;
 		}
-
-	// ]]>
 	</script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -72,9 +69,9 @@
 	<fieldset>
 		<legend>{L_GENERAL_OPTIONS}</legend>
 	<dl>
-		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br />
+		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br>
 		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
-		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
+		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}"></dd>
 	</dl>
 	<dl>
 		<dt><label for="module_type">{L_MODULE_TYPE}{L_COLON}</label></dt>
@@ -84,36 +81,36 @@
 		<dt><label for="parent_id">{L_PARENT}{L_COLON}</label></dt>
 		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
 	</dl>
-	<hr />
+	<hr>
 	<dl>
 		<dt><label for="module_enabled">{L_MODULE_ENABLED}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 		<dl>
-			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br />
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br>
 			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
 			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br />
+			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br>
 			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
 			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
 		</dl>
 	</div>
 
 	<p class="submit-buttons">
-		<input type="hidden" name="action" value="{ACTION}" />
-		<input type="hidden" name="m" value="{MODULE_ID}" />
+		<input type="hidden" name="action" value="{ACTION}">
+		<input type="hidden" name="m" value="{MODULE_ID}">
 		
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -142,7 +139,7 @@
 
 	<!-- IF .modules -->
 		<table class="table1">
-			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
+			<col class="row1"><col class="row1"><col class="row2"><col class="row2">
 		<tbody>
 		<!-- BEGIN modules -->
 			<tr>
@@ -168,10 +165,10 @@
 	<form id="quick" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input type="hidden" name="action" value="quickadd" />
+		<input type="hidden" name="action" value="quickadd">
 
 		<select name="quick_install">{S_INSTALL_OPTIONS}</select>
-		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}" />
+		<input class="button2" name="quickadd" type="submit" value="{L_ADD_MODULE}">
 	</fieldset>
 	
 	</form>
@@ -179,22 +176,22 @@
 	<form id="module" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-		<input type="hidden" name="action" value="add" />
-		<input type="hidden" name="module_parent_id" value="{PARENT_ID}" />
+		<input type="hidden" name="action" value="add">
+		<input type="hidden" name="module_parent_id" value="{PARENT_ID}">
 
-		<input type="text" name="module_langname" maxlength="255" /> 
-		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" />
+		<input type="text" name="module_langname" maxlength="255"> 
+		<input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}">
 	</fieldset>
 
 	</form>
 
-	<div class="clearfix">&nbsp;</div><br style="clear: both;" />
+	<div class="clearfix">&nbsp;</div><br style="clear: both;">
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
 		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
 
-		<input class="button2" type="submit" value="{L_GO}" />
+		<input class="button2" type="submit" value="{L_GO}">
 	</fieldset>
 	</form>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_permission_roles.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_permission_roles.html
--- phpbb-3.1.0-RC4/adm/style/acp_permission_roles.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_permission_roles.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		var active_pmask = '0';
 		var active_fmask = '0';
 		var active_cat = '0';
@@ -17,10 +16,9 @@
 		<!-- IF S_ROLE_JS_ARRAY -->
 			{S_ROLE_JS_ARRAY}
 		<!-- ENDIF -->
-	// ]]>
 	</script>
 
-	<script type="text/javascript" src="style/permissions.js"></script>
+	<script src="style/permissions.js"></script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
@@ -28,7 +26,7 @@
 
 	<p>{L_EXPLAIN}</p>
 
-	<br />
+	<br>
 	<a href="#acl">&raquo; {L_SET_ROLE_PERMISSIONS}</a>
 
 	<form id="acp_roles" method="post" action="{U_ACTION}">
@@ -37,15 +35,15 @@
 		<legend>{L_ROLE_DETAILS}</legend>
 	<dl>
 		<dt><label for="role_name">{L_ROLE_NAME}{L_COLON}</label></dt>
-		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
+		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255"></dd>
 	</dl>
 	<dl>
-		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
+		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
 		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
 	</dl>
 
 	<p class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -62,8 +60,8 @@
 
 	<a id="acl"></a>
 
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br /><br />
+	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br>
+	<br><br>
 
 	</p>
 
@@ -93,10 +91,10 @@
 				<div class="tablewrap">
 					<table id="table00{auth.S_ROW_COUNT}" class="table1 not-responsive">
 					<colgroup>
-						<col class="permissions-name" />
-						<col class="permissions-yes" />
-						<col class="permissions-no" />
-						<col class="permissions-never" />
+						<col class="permissions-name">
+						<col class="permissions-yes">
+						<col class="permissions-no">
+						<col class="permissions-never">
 					</colgroup>
 					<thead>
 					<tr>
@@ -111,9 +109,9 @@
 						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
 						<th class="permissions-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
 							
-						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+						<td class="permissions-yes"><label for="setting_{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1"></label></td>
+						<td class="permissions-no"><label for="setting_{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1"></label></td>
+						<td class="permissions-never"><label for="setting_{auth.mask.FIELD_NAME}_n"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting_{auth.mask.FIELD_NAME}_n" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0"></label></td>
 					</tr>
 					<!-- END mask -->
 					</tbody>
@@ -126,13 +124,13 @@
 	</fieldset>
 
 	<fieldset class="quick">
-		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}" />
+		<input type="submit" class="button1" name="submit" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 
-	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
-	<br />
+	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br>
+	<br>
 
 <!-- ELSE -->
 
@@ -143,7 +141,7 @@
 	<form id="acp_roles" method="post" action="{U_ACTION}">
 
 	<table class="table1">
-		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col2"><col class="col2"><col class="col1"><col class="col2"><col class="col2">
 	<thead>
 	<tr>
 		<th>{L_ROLE_NAME}</th>
@@ -154,7 +152,7 @@
 	<!-- BEGIN roles -->
 	<tr>
 		<td style="vertical-align: top;"><strong>{roles.ROLE_NAME}</strong>
-			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
+			<!-- IF roles.ROLE_DESCRIPTION --><br><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
 		</td>
 		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
 		<td class="actions">
@@ -171,7 +169,7 @@
 	</table>
 
 	<fieldset class="quick">
-		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
+		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255"><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}"><br>
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_permissions.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_permissions.html
--- phpbb-3.1.0-RC4/adm/style/acp_permissions.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_permissions.html	2014-09-21 12:00:00.000000000 +0200
@@ -32,13 +32,13 @@
 		<dl>
 			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
-			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
+			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1"> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
 
 		<p class="quick">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 		</p>
 
 		</fieldset>
@@ -59,7 +59,7 @@
 			<p class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+				<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 			</p>
 
 			</fieldset>
@@ -75,15 +75,15 @@
 			<legend>{L_LOOK_UP_USER}</legend>
 		<dl>
 			<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
-			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
+			<dd><input class="text medium" type="text" id="username" name="username[]"></dd>
 			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}"> {L_SELECT_ANONYMOUS}</label></dd>
 		</dl>
 
 		<p class="quick">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 		</p>
 		</fieldset>
 		</form>
@@ -102,7 +102,7 @@
 		<p class="quick">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+			<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 		</p>
 
 		</fieldset>
@@ -122,14 +122,14 @@
 				<legend>{L_MANAGE_USERS}</legend>
 			<dl>
 				<dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF -->
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1"> {L_ALL_USERS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
+				<input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;"> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;">
 			</fieldset>
 			</form>
 
@@ -140,14 +140,14 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}"> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
+				<input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}">
 			</fieldset>
 			</form>
 
@@ -167,14 +167,14 @@
 				<legend>{L_MANAGE_GROUPS}</legend>
 			<dl>
 				<dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd>
-				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
+				<!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1"> {L_ALL_GROUPS}</label></dd><!-- ENDIF -->
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" />
+				<input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;"> &nbsp; <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;">
 			</fieldset>
 			</form>
 
@@ -190,7 +190,7 @@
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
+				<input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}">
 			</fieldset>
 			</form>
 
@@ -216,7 +216,7 @@
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
+				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}">
 			</fieldset>
 			</form>
 
@@ -226,16 +226,16 @@
 				<legend>{L_LOOK_UP_USER}</legend>
 			<dl>
 				<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
-				<dd><input type="text" id="username" name="username[]" /></dd>
+				<dd><input type="text" id="username" name="username[]"></dd>
 				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}"> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>
 
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
+				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1">
 			</fieldset>
 			</form>
 
@@ -257,7 +257,7 @@
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" />
+				<input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}">
 			</fieldset>
 			</form>
 
@@ -275,7 +275,7 @@
 			<fieldset class="quick">
 				{S_HIDDEN_FIELDS}
 				{S_FORM_TOKEN}
-				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" />
+				<input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1">
 			</fieldset>
 			</form>
 
@@ -305,7 +305,7 @@
 
 	<p>{L_ACL_SET_EXPLAIN}</p>
 
-	<br />
+	<br>
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<strong>&raquo; {L_PERMISSION_TYPE}</strong>
@@ -319,19 +319,17 @@
 			{S_FORM_TOKEN}
 			{L_SELECT_TYPE}{L_COLON} <select name="type">{S_PERMISSION_DROPDOWN}</select>
 
-			<input class="button2" type="submit" name="submit" value="{L_GO}" />
+			<input class="button2" type="submit" name="submit" value="{L_GO}">
 		</fieldset>
 		</form>
 	<!-- ENDIF -->
 
-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br class="responsive-hide"><br class="responsive-hide">
 
 	<!-- include tooltip file -->
-	<script type="text/javascript" src="style/tooltip.js"></script>
-	<script type="text/javascript">
-	// <![CDATA[
+	<script src="style/tooltip.js"></script>
+	<script>
 		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
-	// ]]>
 	</script>
 
 	<form id="set-permissions" method="post" action="{U_ACTION}">
@@ -340,15 +338,15 @@
 
 	<!-- INCLUDE permission_mask.html -->
 
-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br class="responsive-hide"><br class="responsive-hide">
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}">
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);">
 		{S_FORM_TOKEN}
 	</fieldset>
 
-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br class="responsive-hide"><br class="responsive-hide">
 
 	</form>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_posting_buttons.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_posting_buttons.html
--- phpbb-3.1.0-RC4/adm/style/acp_posting_buttons.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_posting_buttons.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,6 +1,4 @@
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	// 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 -->);
@@ -25,32 +23,30 @@
 			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
 	}
-
-// ]]>
 </script>
 
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <!-- EVENT acp_posting_buttons_before -->
 <div id="format-buttons">
-	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
+	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}">
+	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}">
 	<!-- IF S_BBCODE_QUOTE -->
-		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}">
 	<!-- ENDIF -->
-	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}">
+	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}">
+	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}">
+	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}">
 	<!-- IF S_BBCODE_IMG -->
-		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}">
 	<!-- ENDIF -->
 	<!-- IF S_LINKS_ALLOWED -->
-		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}">
 	<!-- ENDIF -->
 	<!-- IF S_BBCODE_FLASH -->
-		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}">
 	<!-- ENDIF -->
 	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
@@ -64,7 +60,7 @@
 		<!-- ENDIF -->
 	</select>
 	<!-- BEGIN custom_tags -->
-	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}">
 	<!-- END custom_tags -->
 </div>
 <!-- EVENT acp_posting_buttons_after -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_profile.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_profile.html
--- phpbb-3.1.0-RC4/adm/style/acp_profile.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_profile.html	2014-09-21 12:00:00.000000000 +0200
@@ -24,72 +24,72 @@
 		<fieldset>
 			<legend>{L_TITLE}</legend>
 		<dl>
-			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
+			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
 			<dd><strong>{FIELD_TYPE}</strong></dd>
 		</dl>
 		<!-- IF S_EDIT_MODE -->
 		<dl>
-			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
+			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}"><strong>{FIELD_IDENT}</strong></dd>
 		</dl>
 		<!-- ELSE -->
 		<dl>
-			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
-			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
+			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}"></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 		</dl>
 		</fieldset>
 
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
-			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_ml">{L_DISPLAY_ON_MEMBERLIST}{L_COLON}</label><br /><span>{L_DISPLAY_ON_MEMBERLIST_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_ml" name="field_show_on_ml" value="1"<!-- IF S_SHOW_ON_MEMBERLIST --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_on_ml">{L_DISPLAY_ON_MEMBERLIST}{L_COLON}</label><br><span>{L_DISPLAY_ON_MEMBERLIST_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_on_ml" name="field_show_on_ml" value="1"<!-- IF S_SHOW_ON_MEMBERLIST --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
+			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF -->></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
-			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
-			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
+			<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF -->></dd>
+			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}"> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
+			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}"> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
 		</dl>
 		</fieldset>
 
 		<!-- IF S_EDIT_MODE -->
 			<fieldset class="quick">
-				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
+				<input class="button1" type="submit" name="save" value="{L_SAVE}">
 			</fieldset>
 		<!-- ENDIF -->
 
@@ -97,32 +97,32 @@
 			<legend>{L_LANG_SPECIFIC}</legend>
 		<dl>
 			<dt><label for="lang_name">{L_USER_FIELD_NAME}{L_COLON}</label></dt>
-			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
+			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}"></dd>
 		</dl>
 		<dl>
-			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
+			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
 			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
 		</dl>
 		<!-- IF S_TEXT or S_STRING -->
 			<dl>
-				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
-				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
+				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
+				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}"><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_BOOL or S_DROPDOWN -->
 			<dl>
 				<dt><label for="lang_options">{L_ENTRIES}{L_COLON}</label>
 					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
-						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
+						<br><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
 					<!-- ELSE -->
-						<br /><span>{L_LANG_OPTIONS_EXPLAIN}</span>
+						<br><span>{L_LANG_OPTIONS_EXPLAIN}</span>
 					<!-- ENDIF -->
 				</dt>
 			<!-- IF S_DROPDOWN -->
 				<dd><textarea id="lang_options" name="lang_options" rows="5" cols="80">{LANG_OPTIONS}</textarea></dd>
 			<!-- ELSE -->
-				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}" /> {L_FIRST_OPTION}</dd>
-				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}" /> {L_SECOND_OPTION}</dd>
+				<dd><input class="medium" id="lang_options" name="lang_options[0]" value="{FIRST_LANG_OPTION}"> {L_FIRST_OPTION}</dd>
+				<dd><input class="medium" name="lang_options[1]" value="{SECOND_LANG_OPTION}"> {L_SECOND_OPTION}</dd>
 			<!-- ENDIF -->
 			</dl>
 		<!-- ENDIF -->
@@ -131,7 +131,7 @@
 		<fieldset class="quick">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" />
+			<input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}">
 		</fieldset>
 
 	<!-- ELSEIF S_STEP_TWO -->
@@ -140,20 +140,20 @@
 			<legend>{L_TITLE}</legend>
 		<!-- BEGIN option -->
 			<dl>
-				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{option.FIELD}</dd>
 			</dl>
 		<!-- END option -->
 		</fieldset>
 
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" />
+			<input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}">
 		</fieldset>
 
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" />
+			<input class="button1" type="submit" name="next" value="{L_NEXT_STEP}">
 		</fieldset>
 
 	<!-- ELSEIF S_STEP_THREE -->
@@ -163,7 +163,7 @@
 				<legend>{options.LANGUAGE}</legend>
 			<!-- BEGIN field -->
 				<dl>
-					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
 					{options.field.FIELD}
 				</dl>
 			<!-- END field -->
@@ -171,12 +171,12 @@
 		<!-- END options -->
 
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" />
+			<input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}">
 		</fieldset>
 
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 			{S_HIDDEN_FIELDS}
-			<input class="button1" type="submit" name="save" value="{L_SAVE}" />
+			<input class="button1" type="submit" name="save" value="{L_SAVE}">
 			{S_FORM_TOKEN}
 		</fieldset>
 
@@ -235,9 +235,9 @@
 	<form id="profile_fields" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick">
-		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
-		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
-		<input type="hidden" name="create" value="1" />
+		<input class="text small" type="text" name="field_ident"> <select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}">
+		<input type="hidden" name="create" value="1">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_prune_forums.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_prune_forums.html
--- phpbb-3.1.0-RC4/adm/style/acp_prune_forums.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_prune_forums.html	2014-09-21 12:00:00.000000000 +0200
@@ -45,11 +45,11 @@
 	<dl>
 		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
-		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
+		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1"> {L_ALL_FORUMS}</label></dd>
 	</dl>
 	
 	<p class="quick">
-		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" />
+		<input class="button1" type="submit" value="{L_LOOK_UP_FORUM}">
 	</p>
 	</fieldset>
 
@@ -73,32 +73,32 @@
 		<legend>{L_FORUM_PRUNE}</legend>
 	<dl>
 		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt>
-		<dd><input type="number" id="prune_days" name="prune_days" /></dd>
+		<dd><input type="number" id="prune_days" name="prune_days"></dd>
 	</dl>
 	<dl>
 		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt>
-		<dd><input type="number" id="prune_vieweddays" name="prune_vieweddays" /></dd>
+		<dd><input type="number" id="prune_vieweddays" name="prune_vieweddays"></dd>
 	</dl>
 	<dl>
-		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
+		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"> {L_YES}</label>
+			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked"> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="prune_announce" value="1"> {L_YES}</label>
+			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked"> {L_NO}</label></dd>
 	</dl>
 	<dl>
 		<dt><label for="sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
-			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"> {L_YES}</label>
+			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked"> {L_NO}</label></dd>
 	</dl>
 	
 	<p class="quick">
 		{S_HIDDEN_FIELDS}
 		{S_FORM_TOKEN}
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">
 	</p>
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_prune_users.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_prune_users.html
--- phpbb-3.1.0-RC4/adm/style/acp_prune_users.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_prune_users.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,34 +12,34 @@
 	<legend>{L_CRITERIA}</legend>
 <dl>
 	<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-	<dd><input type="text" id="username" name="username" /></dd>
+	<dd><input type="text" id="username" name="username"></dd>
 </dl>
 <dl>
 	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
-	<dd><input type="text" id="email" name="email" /></dd>
+	<dd><input type="text" id="email" name="email"></dd>
 </dl>
 <dl>
-	<dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br><span>{L_JOINED_EXPLAIN}</span></dt>
 	<dd>
-		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
-		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
+		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after">
+		<br> <br> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before">
 	</dd>
 </dl>
 <dl>
-	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
-	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
+	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
+	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active"></dd>
 </dl>
 <dl>
 	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
-	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="number" id="count" name="count" /></dd>
+	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="number" id="count" name="count"></dd>
 </dl>
 <dl>
 	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
-	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></dd>
+	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue"></dd>
 </dl>
 <!-- IF S_GROUP_LIST -->
 <dl>
-	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
+	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
 	<dd><select id="group_id" name="group_id">{S_GROUP_LIST}</select></dd>
 </dl>
 <!-- ENDIF -->
@@ -48,7 +48,7 @@
 <fieldset>
 	<legend>{L_USERNAMES}</legend>
 <dl>
-	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
+	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
@@ -57,21 +57,21 @@
 <fieldset>
 	<legend>{L_OPTIONS}</legend>
 <dl>
-	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
-		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
+	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="deleteposts" value="1"> {L_YES}</label>
+		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked"> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
-		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
+	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="action" value="delete"> {L_DELETE_USERS}</label>
+		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked"> {L_DEACTIVATE}</label></dd>
 </dl>
 
 <p class="submit-buttons">
-	<input type="hidden" name="prune" value="1" />
+	<input type="hidden" name="prune" value="1">
 
-	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
-	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}">&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 	{S_FORM_TOKEN}
 </p>
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_ranks.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_ranks.html
--- phpbb-3.1.0-RC4/adm/style/acp_ranks.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_ranks.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,14 +6,11 @@
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		function update_image(newimage)
 		{
 			document.getElementById('image').src = (newimage) ? "{RANKS_PATH}/" + encodeURI(newimage) : "./images/spacer.gif";
 		}
-
-	// ]]>
 	</script>
 
 	<h1>{L_ACP_MANAGE_RANKS}</h1>
@@ -29,32 +26,32 @@
 
 	<dl>
 		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>
-		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
+		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255"></dd>
 	</dl>
 	<dl>
 		<dt><label for="rank_image">{L_RANK_IMAGE}{L_COLON}</label></dt>
 		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
-		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
+		<dd><img src="{RANK_IMAGE}" id="image" alt=""></dd>
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>
-		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}"></dd>
 	</dl>
 	</div>
 
 	<!-- EVENT acp_ranks_edit_after -->
 
 	<p class="submit-buttons">
-		<input type="hidden" name="action" value="save" />
+		<input type="hidden" name="action" value="save">
 
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -85,7 +82,7 @@
 	<!-- BEGIN ranks -->
 	<tr>
 		<!-- EVENT acp_ranks_list_column_before -->
-		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
+		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}"><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
 		<!-- EVENT acp_ranks_list_column_after -->
@@ -96,7 +93,7 @@
 	</table>
 
 	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}" />
+		<input class="button2" name="add" type="submit" value="{L_ADD_RANK}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_reasons.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_reasons.html
--- phpbb-3.1.0-RC4/adm/style/acp_reasons.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_reasons.html	2014-09-21 12:00:00.000000000 +0200
@@ -30,7 +30,7 @@
 		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
 	<dl>
 		<dt><label for="reason_title">{L_REASON_TITLE}{L_COLON}</label></dt>
-		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
+		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255"></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
 	<dl>
@@ -50,8 +50,8 @@
 	<!-- ENDIF -->
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -69,7 +69,7 @@
 
 	<!-- IF .reasons -->
 		<table class="table1">
-			<col class="row1" /><col class="row1" /><col class="row2" />
+			<col class="row1"><col class="row1"><col class="row2">
 		<thead>
 		<tr>
 			<th>{L_REASON}</th>
@@ -83,7 +83,7 @@
 				<td>
 					<i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i>
 					<strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong>
-					<br /><span>{reasons.REASON_DESCRIPTION}</span>
+					<br><span>{reasons.REASON_DESCRIPTION}</span>
 				</td>
 				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
 				<td class="actions" style="width: 80px;">
@@ -106,10 +106,10 @@
 	<!-- ENDIF -->
 
 	<p class="quick">
-		<input type="hidden" name="action" value="add" />
+		<input type="hidden" name="action" value="add">
 
-		<input type="text" name="reason_title" /> 
-		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" />
+		<input type="text" name="reason_title"> 
+		<input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_search.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_search.html
--- phpbb-3.1.0-RC4/adm/style/acp_search.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_search.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,40 +12,40 @@
 	<fieldset>
 		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}"> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}"> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
-		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
+		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
+		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
+		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
+		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}"> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
 
 	<fieldset>
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
+		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
 		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>
@@ -61,16 +61,15 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 
 <!-- ELSEIF S_INDEX -->
 
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		/**
 		* Popup search progress bar
 		*/
@@ -80,7 +79,6 @@
 			// no scrollbars
 			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
 		}
-	// ]]>
 	</script>
 
 	<h1>{L_ACP_SEARCH_INDEX}</h1>
@@ -91,8 +89,8 @@
 		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
 			<fieldset class="submit-buttons">
 				<legend>{L_SUBMIT}</legend>
-				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
-				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
+				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');">&nbsp;
+				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}">
 				{S_FORM_TOKEN}
 			</fieldset>
 		</form>
@@ -114,7 +112,7 @@
 
 				<table class="table1">
 					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
-					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+					<col class="col1"><col class="col2"><col class="col1"><col class="col2">
 				<thead>
 				<tr>
 					<th>{L_STATISTIC}</th>
@@ -139,11 +137,11 @@
 
 			<p class="quick">
 			<!-- IF backend.S_INDEXED -->
-				<input type="hidden" name="action" value="delete" />
-				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+				<input type="hidden" name="action" value="delete">
+				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');">
 			<!-- ELSE -->
-				<input type="hidden" name="action" value="create" />
-				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+				<input type="hidden" name="action" value="create">
+				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');">
 			<!-- ENDIF -->
 			</p>
 			{S_FORM_TOKEN}
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_send_statistics.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_send_statistics.html
--- phpbb-3.1.0-RC4/adm/style/acp_send_statistics.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_send_statistics.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,8 +6,7 @@
 
 <p>{L_EXPLAIN_SEND_STATISTICS}</p>
 
-<script type="text/javascript">
-//<![CDATA[
+<script>
 var iframect = 0;
 
 function iframe_updated()
@@ -20,7 +19,6 @@
 	phpbb.toggleDisplay('questionnaire-form', -1);
 	phpbb.toggleDisplay('questionnaire-thanks', 1);
 }
-//]]>
 </script>
 
 <iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
@@ -31,12 +29,12 @@
 
 	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
 
-	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}"></p>
 
 	<div id="configlist">
-		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}">
 		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}">
 		</p>
 
 		<!-- BEGIN providers -->
@@ -52,13 +50,13 @@
 		<!-- END providers -->
 	</div>
 	<p class="submit-buttons">
-		<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+		<input type="hidden" name="systemdata" value="{RAW_DATA}">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}">
 	</p>
 </form>
 
 <div id="questionnaire-thanks" class="successbox">
-	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
+	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br><br><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
 </div>
 
 <!-- INCLUDE overall_footer.html -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_styles.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_styles.html
--- phpbb-3.1.0-RC4/adm/style/acp_styles.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_styles.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,14 +13,14 @@
 	<h1>{MESSAGE_TITLE}</h1>
 	<p>{MESSAGE_TEXT}</p>
 	<!-- IF S_CONFIRM_DELETE -->
-	<label><input type="checkbox" class="checkbox" name="confirm_delete_files" /> {L_DELETE_FROM_FS}</label>
+	<label><input type="checkbox" class="checkbox" name="confirm_delete_files"> {L_DELETE_FROM_FS}</label>
 	<!-- ENDIF -->
 
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button2">&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2">
 	</div>
 
 </fieldset>
@@ -37,11 +37,11 @@
 {S_FORM_TOKEN}
 
 <!-- IF S_STYLE_DETAILS -->
-	<input type="hidden" name="id" value="{STYLE_ID}" />
+	<input type="hidden" name="id" value="{STYLE_ID}">
 	<fieldset>
 	<dl>
 		<dt><label for="name">{L_STYLE_NAME}{L_COLON}</label></dt>
-		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>
+		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}"></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
@@ -62,22 +62,22 @@
 	</dl>
 	<dl>
 		<dt><label for="style_active">{L_STYLE_ACTIVE}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<!-- IF not S_STYLE_DEFAULT -->
 		<dl>
 			<dt><label for="style_default">{L_STYLE_DEFAULT}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+			<dd><label><input type="radio" class="radio" name="style_default" value="1"> {L_YES}</label>
+				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked"> {L_NO}</label></dd>
 		</dl>
 	<!-- ENDIF -->
 	</fieldset>
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</fieldset>
 <!-- ENDIF -->
@@ -104,20 +104,20 @@
 		<td class="{$ROW_CLASS}" style="padding-{S_CONTENT_FLOW_BEGIN}: {styles_list.PADDING}px;">
 			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE -->
 				<div class="default-style" style="display: none; float: {S_CONTENT_FLOW_END};">
-					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" />
+					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}">
 				</div>
 			<!-- ENDIF -->
 			<!-- IF styles_list.DEFAULT or styles_list.SHOW_COPYRIGHT -->
 				<strong>{styles_list.STYLE_NAME}</strong>
-				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br />{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF -->
+				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br>{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF -->
 			<!-- ELSE -->
 				<span>{styles_list.STYLE_NAME}</span>
 			<!-- ENDIF -->
 			<!-- IF styles_list.COMMENT != '' -->
-				<span class="error"><br />{styles_list.COMMENT}</span>
+				<span class="error"><br>{styles_list.COMMENT}</span>
 			<!-- ENDIF -->
 			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' -->
-				<span class="style-path"><br />{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
+				<span class="style-path"><br>{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
 			<!-- ENDIF -->
 		</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
@@ -135,12 +135,12 @@
 		{styles_list.EXTRA}
 		<td class="{$ROW_CLASS} mark" width="20">
 			<!-- IF styles_list.STYLE_ID -->
-				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
+				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}">
 			<!-- ELSE -->
 				<!-- IF styles_list.COMMENT != '' -->
 					&nbsp;
 				<!-- ELSE -->
-					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}" />
+					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}">
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 		</td>
@@ -153,7 +153,7 @@
 <!-- IF .extra_actions -->
 	<fieldset class="quick">
 		<!-- BEGIN extra_actions -->
-			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}" />
+			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}">
 		<!-- END extra_actions -->
 	</fieldset>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_update.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_update.html
--- phpbb-3.1.0-RC4/adm/style/acp_update.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_update.html	2014-09-21 12:00:00.000000000 +0200
@@ -40,7 +40,7 @@
 
 <!-- IF not S_UP_TO_DATE -->
 	{UPDATE_INSTRUCTIONS}
-	<br /><br />
+	<br><br>
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users.html
--- phpbb-3.1.0-RC4/adm/style/acp_users.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users.html	2014-09-21 12:00:00.000000000 +0200
@@ -14,13 +14,13 @@
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
 		<dt><label for="username">{L_ENTER_USERNAME}{L_COLON}</label></dt>
-		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
+		<dd><input class="text medium" type="text" id="username" name="username"></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}"> {L_SELECT_ANONYMOUS}</label></dd>
 	</dl>
 
 	<p class="quick">
-		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+		<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1">
 	</p>
 	</fieldset>
 
@@ -39,13 +39,13 @@
 	<fieldset>
 		<legend>{L_USER_ADMIN_MOVE_POSTS}</legend>
 	<dl>
-		<dt><label for="new_forum">{L_USER_ADMIN_MOVE_POSTS}</label><br /><span>{L_MOVE_POSTS_EXPLAIN}</span></dt>
+		<dt><label for="new_forum">{L_USER_ADMIN_MOVE_POSTS}</label><br><span>{L_MOVE_POSTS_EXPLAIN}</span></dt>
 		<dd><select id="new_forum" name="new_f">{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
 
 	<fieldset class="quick">
-		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+		<input type="submit" name="update" value="{L_SUBMIT}" class="button1">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -68,7 +68,7 @@
 	<form id="mode_select" method="post" action="{U_MODE_SELECT}">
 
 	<fieldset class="quick">
-		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
+		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -112,7 +112,7 @@
 	</fieldset>
 
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -146,7 +146,7 @@
 
 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
-			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
@@ -177,11 +177,11 @@
 	<tbody>
 	<!-- BEGIN attach -->
 	<tr>
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
+		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
 		<td style="text-align: center">{attach.POST_TIME}</td>
 		<td style="text-align: center">{attach.SIZE}</td>
 		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
-		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}" /></td>
+		<td style="text-align: center"><input type="checkbox" class="radio" name="mark[]" value="{attach.ATTACH_ID}"></td>
 	</tr>
 	<!-- END attach -->
 	</tbody>
@@ -193,9 +193,9 @@
 	<!-- ENDIF -->
 	<fieldset class="display-options">
 		{L_SORT_BY}{L_COLON} <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+		<input class="button2" type="submit" value="{L_GO}" name="sort">
 	</fieldset>
-	<hr />
+	<hr>
 	<div class="pagination">
 	<!-- IF .pagination -->
 		<!-- INCLUDE pagination.html -->
@@ -203,7 +203,7 @@
 	</div>
 
 	<fieldset class="quick">
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}">
 		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
 		{S_FORM_TOKEN}
 	</fieldset>
@@ -212,7 +212,7 @@
 <!-- ELSEIF S_PERMISSIONS -->
 
 	<div style="float: {S_CONTENT_FLOW_END};">
-		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br />
+		<a href="{U_USER_PERMISSIONS}">&raquo; {L_SET_USERS_PERMISSIONS}</a><br>
 		<a href="{U_USER_FORUM_PERMISSIONS}">&raquo; {L_SET_USERS_FORUM_PERMISSIONS}</a>
 	</div>
 
@@ -220,7 +220,7 @@
 
 		<fieldset class="quick" style="text-align: left;">
 			{L_SELECT_FORUM}{L_COLON} <select name="f">{S_FORUM_OPTIONS}</select>
-			<input class="button2" type="submit" value="{L_GO}" name="select" />
+			<input class="button2" type="submit" value="{L_GO}" name="select">
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_avatar.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_avatar.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_avatar.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_avatar.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,9 +4,9 @@
 		<legend>{L_ACP_USER_AVATAR}</legend>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br><span>{L_AVATAR_EXPLAIN}</span></dt>
 			<dd>{AVATAR}</dd>
-			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete"> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<fieldset>
@@ -30,7 +30,7 @@
 	</fieldset>
 
 	<fieldset class="quick">
-		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+		<input type="submit" name="update" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_feedback.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_feedback.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_feedback.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_feedback.html	2014-09-21 12:00:00.000000000 +0200
@@ -25,9 +25,9 @@
 			<td style="text-align: center;">{log.DATE}</td>
 			<td>
 				{log.ACTION}
-				<!-- IF log.DATA --><br />&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
+				<!-- IF log.DATA --><br>&#187; <span class="gensmall">[ {log.DATA} ]</span><!-- ENDIF -->
 			</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{log.ID}"></td>
 		</tr>
 	<!-- END log -->
 	</tbody>
@@ -40,9 +40,9 @@
 	
 	<fieldset class="display-options">
 		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
+		<input class="button2" type="submit" value="{L_GO}" name="sort">
 	</fieldset>
-	<hr />
+	<hr>
 	<div class="pagination">
 	<!-- IF .pagination -->
 		<!-- INCLUDE pagination.html -->
@@ -51,8 +51,8 @@
 
 	<!-- IF S_CLEARLOGS -->
 		<fieldset class="quick">
-			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}">&nbsp;
+			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}">
 			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
 		</fieldset>
 	<!-- ENDIF -->
@@ -69,7 +69,7 @@
 	</fieldset>
 
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_overview.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_overview.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_overview.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_overview.html	2014-09-21 12:00:00.000000000 +0200
@@ -3,8 +3,8 @@
 <fieldset>
 	<legend>{L_ACP_USER_OVERVIEW}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
-	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
+	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dd><input type="text" id="user" name="user" value="{USER}"></dd>
 	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
 </dl>
 <!-- IF S_USER_INACTIVE -->
@@ -50,27 +50,27 @@
 	<dd><strong>{USER_WARNINGS}</strong></dd>
 </dl>
 <dl>
-	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
+	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF -->> {L_YES}</label>
+		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF -->> {L_NO}</label></dd>
 </dl>
 <dl>
 	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt>
-	<dd><input class="text medium" type="email" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
+	<dd><input class="text medium" type="email" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off"></dd>
 </dl>
 <dl>
-	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>
+	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off"></dd>
 </dl>
 <dl>
-	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off"></dd>
 </dl>
 <!-- EVENT acp_users_overview_options_append -->
 
 <p class="quick">
-	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-	<input type="hidden" name="action" value="" />
+	<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
+	<input type="hidden" name="action" value="">
 	{S_FORM_TOKEN}
 </p>
 
@@ -79,9 +79,7 @@
 
 <!-- IF not S_USER_FOUNDER or S_FOUNDER -->
 
-	<script type="text/javascript">
-	// <![CDATA[
-
+	<script>
 		function display_reason(option)
 		{
 			if (option != 'banuser' && option != 'banemail' && option != 'banip')
@@ -112,8 +110,6 @@
 				element.value = '{LA_USER_ADMIN_BAN_IP_REASON}';
 			}
 		}
-
-	// ]]>
 	</script>
 
 	<form id="user_quick_tools" method="post" action="{U_ACTION}">
@@ -127,16 +123,16 @@
 	<div style="display: none;" id="reasons">
 		<dl>
 			<dt><label for="ban_reason">{L_BAN_REASON}{L_COLON}</label></dt>
-			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
+			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason"></dd>
 		</dl>
 		<dl>
 			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
-			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
+			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason"></dd>
 		</dl>
 	</div>
 
 	<p class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</p>
 
@@ -149,18 +145,18 @@
 			<fieldset>
 				<legend>{L_DELETE_USER}</legend>
 				<dl>
-					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 					<dd>
 					<!-- IF USER_HAS_POSTS -->
 						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select>
 					<!-- ELSE -->
-						{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
+						{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain">
 					<!-- ENDIF -->
 					</dd>
 				</dl>
 				<p class="quick">
-					<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-					<input type="hidden" name="delete" value="1" />
+					<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
+					<input type="hidden" name="delete" value="1">
 					{S_FORM_TOKEN}
 				</p>
 			</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_prefs.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_prefs.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_prefs.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_prefs.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,5 @@
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
-// ]]>
 </script>
 
 	<form id="user_prefs" method="post" action="{U_ACTION}">
@@ -11,34 +9,34 @@
 	<!-- EVENT acp_users_prefs_personal_prepend -->
 	<dl> 
 		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="massemail">{L_ADMIN_EMAIL}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="hideonline">{L_HIDE_ONLINE}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
+		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF -->> {L_NOTIFY_METHOD_EMAIL}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF -->> {L_NOTIFY_METHOD_IM}</label>
+			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF -->> {L_NOTIFY_METHOD_BOTH}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
@@ -50,9 +48,9 @@
 	</dl>
 	<!-- INCLUDE timezone_option.html -->
 	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><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></dd>
-		<dd><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" /></div></dd>
+		<dd><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"></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>
@@ -62,23 +60,23 @@
 	<!-- EVENT acp_users_prefs_post_prepend -->
 	<dl> 
 		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="smilies">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="sig">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="notify">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_post_append -->
 	</fieldset>
@@ -88,33 +86,33 @@
 	<!-- EVENT acp_users_prefs_view_prepend -->
 	<dl> 
 		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_flash">{L_VIEW_FLASH}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_smilies">{L_VIEW_SMILIES}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_sigs">{L_VIEW_SIGS}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_avatars">{L_VIEW_AVATARS}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
@@ -144,7 +142,7 @@
 	</fieldset>
 	<!-- EVENT acp_users_prefs_append -->
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</fieldset>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_profile.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_profile.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_profile.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_profile.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,10 +4,10 @@
 		<legend>{L_USER_PROFILE}</legend>
 	<dl>
 		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
+		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -17,7 +17,7 @@
 			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
 		<!-- BEGIN profile_fields -->
 		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
 			<!-- IF profile_fields.ERROR -->
 				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
@@ -28,7 +28,7 @@
 	<!-- ENDIF -->
 
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_signature.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_signature.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_signature.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_signature.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,13 +1,9 @@
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	var form_name = 'user_signature';
 	var text_name = 'signature';
 	var load_draft = false;
 	var upload = false;
 	var imageTag = false;
-
-// ]]>
 </script>
 
 <form id="user_signature" method="post" action="{U_ACTION}">
@@ -31,13 +27,13 @@
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED}> {L_DISABLE_BBCODE}</label>
 			<!-- ENDIF -->
 			<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+				<label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED}> {L_DISABLE_SMILIES}</label>
 			<!-- ENDIF -->
 			<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED}> {L_DISABLE_MAGIC_URL}</label>
 			<!-- ENDIF -->
 			</dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
@@ -45,8 +41,8 @@
 	</fieldset>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}">
 		{S_FORM_TOKEN}
 	</fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_users_warnings.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_warnings.html
--- phpbb-3.1.0-RC4/adm/style/acp_users_warnings.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_users_warnings.html	2014-09-21 12:00:00.000000000 +0200
@@ -16,7 +16,7 @@
 			<td>{warn.USERNAME}</td>
 			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
 			<td>{warn.ACTION}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}"></td>
 		</tr>
 	<!-- END warn -->
 	</tbody>
@@ -28,8 +28,8 @@
 	<!-- ENDIF -->
 
 	<fieldset class="quick">
-		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}">&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}">
 		<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
 	</fieldset>
 	{S_FORM_TOKEN}
diff -Naur phpbb-3.1.0-RC4/adm/style/acp_words.html phpbb-3.1.0-RC4-HTML5/adm/style/acp_words.html
--- phpbb-3.1.0-RC4/adm/style/acp_words.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/acp_words.html	2014-09-21 12:00:00.000000000 +0200
@@ -16,17 +16,17 @@
 		<legend>{L_EDIT_WORD}</legend>
 		<dl>
 			<dt><label for="word">{L_WORD}</label></dt>
-			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd>
+			<dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255"></dd>
 		</dl>
 		<dl>
 			<dt><label for="replacement">{L_REPLACEMENT}</label></dt>
-			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd>
+			<dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255"></dd>
 		</dl>
 		{S_HIDDEN_FIELDS}
 
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_FORM_TOKEN}
 	</p>
 	</fieldset>
@@ -44,7 +44,7 @@
 	<legend>{L_ACP_WORDS}</legend>
 	<p class="quick">
 		{S_HIDDEN_FIELDS}
-		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
+		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}">
 	</p>
 
 	<table class="table1 zebra-table">
diff -Naur phpbb-3.1.0-RC4/adm/style/admin.js phpbb-3.1.0-RC4-HTML5/adm/style/admin.js
--- phpbb-3.1.0-RC4/adm/style/admin.js	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/admin.js	2014-09-21 12:00:00.000000000 +0200
@@ -169,7 +169,7 @@
 			ul = $this.children(),
 			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
-			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div><ul class="dropdown-contents"></div></li>').find('li.responsive-tab'),
 			menu = item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
diff -Naur phpbb-3.1.0-RC4/adm/style/auth_provider_ldap.html phpbb-3.1.0-RC4-HTML5/adm/style/auth_provider_ldap.html
--- phpbb-3.1.0-RC4/adm/style/auth_provider_ldap.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/auth_provider_ldap.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,35 +1,35 @@
 <fieldset id="auth_ldap_settings">
 	<legend>{L_LDAP}</legend>
 	<dl>
-		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
+		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
+		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
+		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br><span>{L_LDAP_DN_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
+		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br><span>{L_LDAP_UID_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
+		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
+		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
+		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br><span>{L_LDAP_USER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
+		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off"></dd>
 	</dl>
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/auth_provider_oauth.html phpbb-3.1.0-RC4-HTML5/adm/style/auth_provider_oauth.html
--- phpbb-3.1.0-RC4/adm/style/auth_provider_oauth.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/auth_provider_oauth.html	2014-09-21 12:00:00.000000000 +0200
@@ -7,11 +7,11 @@
 		<legend>{oauth_services.ACTUAL_NAME}</legend>
 		<dl>
 			<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
-			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}"></dd>
 		</dl>
 		<dl>
 			<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
-			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}"></dd>
 		</dl>
 	</fieldset>
 	<!-- END oauth_services -->
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_default_acp_demo.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_default_acp_demo.html
--- phpbb-3.1.0-RC4/adm/style/captcha_default_acp_demo.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_default_acp_demo.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,4 +1,4 @@
 <dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
-	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
+	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview"></dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_gd_acp.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_gd_acp.html
--- phpbb-3.1.0-RC4/adm/style/captcha_gd_acp.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_gd_acp.html	2014-09-21 12:00:00.000000000 +0200
@@ -14,35 +14,35 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number" /></dd>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number"></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number" /></dd>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number"></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
-	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
-		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
-		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
+	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
+	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF -->> {L_CAPTCHA_FONT_DEFAULT}</label>
+		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF -->> {L_CAPTCHA_FONT_NEW}</label>
+		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF -->> {L_CAPTCHA_FONT_LOWER}</label>
 
 </dd>
 </dl>
@@ -59,13 +59,13 @@
 <fieldset>
 	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
-		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">&nbsp;
+		<input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}">&nbsp;
 	</p>
 
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}">
+	<input type="hidden" name="configure" value="1">
 
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_qa_acp.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_qa_acp.html
--- phpbb-3.1.0-RC4/adm/style/captcha_qa_acp.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_qa_acp.html	2014-09-21 12:00:00.000000000 +0200
@@ -36,10 +36,10 @@
 	</tbody>
 	</table>
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="add" value="{L_ADD}" />
-		<input  type="hidden" name="action" value="add" />
-		<input  type="hidden" name="configure" value="1" />
-		<input  type="hidden" name="select_captcha" value="{CLASS}" />
+		<input class="button1" type="submit" name="add" value="{L_ADD}">
+		<input  type="hidden" name="action" value="add">
+		<input  type="hidden" name="configure" value="1">
+		<input  type="hidden" name="select_captcha" value="{CLASS}">
 
 		{S_FORM_TOKEN}
 	</fieldset>
@@ -57,30 +57,30 @@
 	<fieldset>
 		<legend>{L_EDIT_QUESTION}</legend>
 	<dl>
-		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
-		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF -->> {L_NO}</label></dd>
 	</dl>
 
 	<dl>
-		<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
+		<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
 		<dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
 	</dl>
 	<dl>
-		<dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
-		<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
+		<dt><label for="question_text">{L_QUESTION_TEXT}</label><br><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
+		<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
+		<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br><span>{L_ANSWERS_EXPLAIN}</span></dt>
 		<dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd>
 	</dl>
 	</fieldset>
 	<fieldset class="quick">
-		<input class="button1" type="submit" name="submit" value="{L_SUBMIT}" />
-		<input type="hidden" name="question_id" value="{QUESTION_ID}" />
-		<input type="hidden" name="action" value="add" />
-		<input  type="hidden" name="configure" value="1" />
-		<input  type="hidden" name="select_captcha" value="{CLASS}" />
+		<input class="button1" type="submit" name="submit" value="{L_SUBMIT}">
+		<input type="hidden" name="question_id" value="{QUESTION_ID}">
+		<input type="hidden" name="action" value="add">
+		<input  type="hidden" name="configure" value="1">
+		<input  type="hidden" name="select_captcha" value="{CLASS}">
 
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_qa_acp_demo.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_qa_acp_demo.html
--- phpbb-3.1.0-RC4/adm/style/captcha_qa_acp_demo.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_qa_acp_demo.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,7 @@
 <dl>
-	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+	<dt><label for="answer"><!-- IF QA_CONFIRM_QUESTION --> {QA_CONFIRM_QUESTION} <!-- ELSE --> {L_CONFIRM_QUESTION} <!-- ENDIF -->{L_COLON}</label><br><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
 
 	<dd>
-		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}"  />
+		<input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" >
 	</dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_recaptcha.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_recaptcha.html
--- phpbb-3.1.0-RC4/adm/style/captcha_recaptcha.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_recaptcha.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,29 +1,25 @@
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
 	<dd>
-		<script type="text/javascript">
-		// <![CDATA[
+		<script>
 		var RecaptchaOptions = {
 			lang : '{LA_RECAPTCHA_LANG}',
 			theme : 'clean'
 		};
-		// ]]>
 		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
-		<script type="text/javascript">
-		// <![CDATA[
+		<script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
+		<script>
 		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
 			document.getElementById('recaptcha_table').style.direction = 'ltr';
 		<!-- ENDIF -->
-		// ]]>
 		</script>
 
 
 	<noscript>
 	<div>
-		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
+		<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br>
 		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-		<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+		<input type="hidden" name="recaptcha_response_field" value="manual_challenge">
 	</div>
 	</noscript>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/captcha_recaptcha_acp.html phpbb-3.1.0-RC4-HTML5/adm/style/captcha_recaptcha_acp.html
--- phpbb-3.1.0-RC4/adm/style/captcha_recaptcha_acp.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/captcha_recaptcha_acp.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,12 +13,12 @@
 <legend>{L_GENERAL_OPTIONS}</legend>
 
 <dl>
-	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}{L_COLON}</label><br /><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text" /></dd>
+	<dt><label for="recaptcha_pubkey">{L_RECAPTCHA_PUBLIC}{L_COLON}</label><br><span>{L_RECAPTCHA_PUBLIC_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_pubkey" name="recaptcha_pubkey" value="{RECAPTCHA_PUBKEY}" size="50" type="text"></dd>
 </dl>
 <dl>
-	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}{L_COLON}</label><br /><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
-	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text" /></dd>
+	<dt><label for="recaptcha_privkey">{L_RECAPTCHA_PRIVATE}{L_COLON}</label><br><span>{L_RECAPTCHA_PRIVATE_EXPLAIN}</span></dt>
+	<dd><input id="recaptcha_privkey" name="recaptcha_privkey" value="{RECAPTCHA_PRIVKEY}" size="50" type="text"></dd>
 </dl>
 
 
@@ -37,11 +37,11 @@
 <fieldset>
 	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">&nbsp;
 	</p>
-	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}" />
-	<input type="hidden" name="configure" value="1" />
+	<input type="hidden" name="select_captcha" value="{CAPTCHA_NAME}">
+	<input type="hidden" name="configure" value="1">
 
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/confirm_bbcode.html phpbb-3.1.0-RC4-HTML5/adm/style/confirm_bbcode.html
--- phpbb-3.1.0-RC4/adm/style/confirm_bbcode.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/confirm_bbcode.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,8 +11,8 @@
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_CANCEL}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button2">&nbsp; 
+		<input type="submit" name="cancel" value="{L_CANCEL}" class="button2">
 	</div>
 
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/confirm_body.html phpbb-3.1.0-RC4-HTML5/adm/style/confirm_body.html
--- phpbb-3.1.0-RC4/adm/style/confirm_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/confirm_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,8 @@
 	<p>{MESSAGE_TEXT}</p>
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		<input type="button" name="confirm" value="{L_YES}" class="button2">&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2">
 	</fieldset>
 
 <!-- ELSE -->
@@ -21,8 +21,8 @@
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button2">&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2">
 	</div>
 
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/confirm_body_prune.html phpbb-3.1.0-RC4-HTML5/adm/style/confirm_body_prune.html
--- phpbb-3.1.0-RC4/adm/style/confirm_body_prune.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/confirm_body_prune.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,13 +6,13 @@
 	<h2>{L_PRUNE_USERS_LIST}</h2>
 	<!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF -->
 
-	<br />
+	<br>
 	<!-- BEGIN users -->
-	&raquo; <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" />
+	&raquo; <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked">
 	<a href="{users.U_PROFILE}">{users.USERNAME}</a>
-	<!-- IF users.U_USER_ADMIN --> [ <a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --><br />
+	<!-- IF users.U_USER_ADMIN --> [ <a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --><br>
 	<!-- END users -->
-	<br />
+	<br>
 	<span class="small">
 	<a href="#" onclick="marklist('userlist', 'user_ids', true)">{L_MARK_ALL}</a> &bull;
 	<a href="#" onclick="marklist('userlist', 'user_ids', false)">{L_UNMARK_ALL}</a>
@@ -26,8 +26,8 @@
 	{S_HIDDEN_FIELDS}
 
 	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button2">&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2">
 	</div>
 </fieldset>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/install_convert.html phpbb-3.1.0-RC4-HTML5/adm/style/install_convert.html
--- phpbb-3.1.0-RC4/adm/style/install_convert.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_convert.html	2014-09-21 12:00:00.000000000 +0200
@@ -24,7 +24,7 @@
 	<!-- IF S_LIST -->
 		<table class="table1">
 			<caption>{L_AVAILABLE_CONVERTORS}</caption>
-			<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+			<col class="col1"><col class="col2"><col class="col1"><col class="col2">
 		<thead>
 		<tr>
 			<th>{L_SOFTWARE}</th>
@@ -60,11 +60,11 @@
 
 		<fieldset class="submit-buttons">
 			<form method="post" action="{U_NEW_ACTION}">
-				<input class="button1" type="submit" name="submit_new" value="{L_NEW}" />
+				<input class="button1" type="submit" name="submit_new" value="{L_NEW}">
 			</form>
-			<br />
+			<br>
 			<form method="post" action="{U_CONTINUE_ACTION}">
-				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" />
+				<input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}">
 			</form>
 		</fieldset>
 
@@ -86,7 +86,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{checks.RESULT}</dd>
 				</dl>
 			<!-- ENDIF -->
@@ -109,7 +109,7 @@
 			<!-- ELSE -->
 
 				<dl>
-					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 					<dd>{options.CONTENT}</dd>
 				</dl>
 
@@ -124,7 +124,7 @@
 
 		<fieldset class="submit-buttons">
 			{S_HIDDEN}
-			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+			<!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}"><!-- ENDIF -->
 		</fieldset>
 	<!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/adm/style/install_footer.html phpbb-3.1.0-RC4-HTML5/adm/style/install_footer.html
--- phpbb-3.1.0-RC4/adm/style/install_footer.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_footer.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,9 +11,9 @@
 	</div>
 </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" 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>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff -Naur phpbb-3.1.0-RC4/adm/style/install_header.html phpbb-3.1.0-RC4-HTML5/adm/style/install_header.html
--- phpbb-3.1.0-RC4/adm/style/install_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" media="screen">
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">
@@ -19,7 +19,7 @@
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
 				{S_LANG_SELECT}
-				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}">
 			</fieldset>
 		</form>
 		<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/install_install.html phpbb-3.1.0-RC4-HTML5/adm/style/install_install.html
--- phpbb-3.1.0-RC4/adm/style/install_install.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_install.html	2014-09-21 12:00:00.000000000 +0200
@@ -20,7 +20,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{checks.RESULT}</dd>
 			</dl>
 		<!-- ENDIF -->
@@ -43,7 +43,7 @@
 		<!-- ELSE -->
 
 			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
 			</dl>
 
@@ -60,7 +60,7 @@
 	<fieldset class="submit-buttons">
 		<legend>{L_DL_CONFIG}</legend>
 		{S_HIDDEN}
-		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" />&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" />
+		<input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}">&nbsp;<input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}">
 	</fieldset>
 <!-- ENDIF -->
 
@@ -68,7 +68,7 @@
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		{S_HIDDEN}
-		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF -->
+		<!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}"><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/adm/style/install_update.html phpbb-3.1.0-RC4-HTML5/adm/style/install_update.html
--- phpbb-3.1.0-RC4/adm/style/install_update.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_update.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,6 @@
 <!-- INCLUDE install_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	function popup(url, width, height, name)
 	{
 		if (!name)
@@ -18,7 +17,6 @@
 		popup(url, 950, 600, '_diff');
 		return false;
 	}
-// ]]>
 </script>
 
 <!-- IF S_ERROR -->
@@ -55,7 +53,7 @@
 	<p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
+		<input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}">
 	</fieldset>
 
 	</form>
@@ -68,7 +66,7 @@
 	<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
 
 	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
+		<input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}">
 	</fieldset>
 
 	</form>
@@ -113,7 +111,7 @@
 
 	<fieldset class="submit-buttons">
 		<p>{L_CHECK_FILES_EXPLAIN}</p>
-		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
+		<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}">
 	</fieldset>
 
 	</form>
@@ -125,10 +123,10 @@
 		<h1>{L_PERFORM_DATABASE_UPDATE}</h1>
 
 		<p>
-			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
+			{L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br>
 		</p>
 
-		<br /><br />
+		<br><br>
 
 		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
 
@@ -161,7 +159,7 @@
 		<form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
 
 		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
+			<input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}">
 		</fieldset>
 
 		</form>
@@ -175,7 +173,7 @@
 			<div class="errorbox">
 				<h3>{L_NO_UPDATE_FILES}</h3>
 
-				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
+				<p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br>
 
 				<strong>{NO_UPDATE_FILES}</strong>
 
@@ -190,10 +188,10 @@
 			<p>{L_FILES_DELETED_EXPLAIN}</p>
 
 			<fieldset id="deleted">
-				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}"></legend>
 				<!-- BEGIN deleted -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
+					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
 						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
@@ -210,40 +208,40 @@
 
 			<!-- BEGIN conflict -->
 			<fieldset id="conflict">
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}"></legend>
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br><!-- ENDIF -->{conflict.FILE_PART}</strong>
+						<!-- IF conflict.S_CUSTOM --><br><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
 					</dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
+						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br>{L_DOWNLOAD_CONFLICTS_EXPLAIN}
 						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 					</dd>
 					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio"> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
 				</dl>
 				<!-- IF conflict.S_BINARY -->
 					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked"> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
 						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
 					</dl>
 				<!-- ELSE -->
 					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked"> {L_MERGE_NEW_FILE_OPTION}</label></dt>
 						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
 					</dl>
 					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4"> {L_MERGE_MOD_FILE_OPTION}</label></dt>
 						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
 					</dl>
 					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1"> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
 						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 					</dl>
 					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2"> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
 						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
 					</dl>
 				<!-- ENDIF -->
@@ -258,17 +256,17 @@
 			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
 
 			<fieldset id="new_conflict">
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}"></legend>
 			<!-- BEGIN new_conflict -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
+					<!-- IF new_conflict.S_CUSTOM --><br><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
 					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 				</dd>
 				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio"> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 			<!-- END new_conflict -->
@@ -283,26 +281,26 @@
 
 			<!-- BEGIN modified -->
 			<fieldset id="modified">
-				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}"></legend>
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br><!-- ENDIF -->{modified.FILE_PART}</strong>
+					<!-- IF modified.S_CUSTOM --><br><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
 				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio"> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked"> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
 				</dl>
 				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1"> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 				</dl>
 				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2"> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
 				</dl>
 			</fieldset>
@@ -316,17 +314,17 @@
 			<p>{L_FILES_NEW_EXPLAIN}</p>
 
 			<fieldset id="new_files" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}"></legend>
 			<!-- BEGIN new -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong>
-					<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br><!-- ENDIF -->{new.FILE_PART}</strong>
+					<!-- IF new.S_CUSTOM --><br><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 				</dt>
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
 					<!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
 				</dd>
 				<!-- IF new.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio"> {L_DO_NOT_UPDATE}</label></dd>
 				<!-- ENDIF -->
 				</dl>
 			<!-- END new -->
@@ -340,15 +338,15 @@
 			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 			<fieldset id="not_modified" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}"></legend>
 			<!-- BEGIN not_modified -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
-						<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+					<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br><!-- ENDIF -->{not_modified.FILE_PART}</strong>
+						<!-- IF not_modified.S_CUSTOM --><br><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
 					</dt>
 					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
 					<!-- IF not_modified.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio"> {L_DO_NOT_UPDATE}</label></dd>
 					<!-- ENDIF -->
 				</dl>
 			<!-- END not_modified -->
@@ -362,7 +360,7 @@
 			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
 
 			<fieldset id="up_to_date" style="display: none;">
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
+				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}"></legend>
 			<!-- BEGIN up_to_date -->
 				<dl>
 					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
@@ -372,20 +370,20 @@
 
 		<!-- ENDIF -->
 
-		<br />
+		<br>
 
 		<fieldset class="quick">
-			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+			<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}">
 		</fieldset>
 
-		<br />
+		<br>
 
 		<h1>{L_UPDATE_METHOD}</h1>
 
 		<p>{L_UPDATE_METHOD_EXPLAIN}</p>
 
 		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}" />
+			<input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}">&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD_BUTTON}">
 		</fieldset>
 
 		</form>
@@ -410,17 +408,17 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+		<input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again">&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download">
 	</fieldset>
 
 	</form>
 
-	<br /><br />
+	<br><br>
 
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
 	<table class="table1">
-		<col class="row1" /><col class="row2" /><col class="row1" />
+		<col class="row1"><col class="row2"><col class="row1">
 	<thead>
 	<tr>
 		<th style="width: 49%">{L_ARCHIVE_FILE}</th>
@@ -454,12 +452,12 @@
 			<p>{L_TRY_DOWNLOAD_METHOD}</p>
 
 			<fieldset class="quick">
-				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" />
+				<input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}">
 			</fieldset>
 		</div>
 
 		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
+			<p>{L_CONNECTION_FAILED}<br>{ERROR_MSG}</p>
 		</div>
 	<!-- ENDIF -->
 
@@ -471,17 +469,17 @@
 	</dl>
 	<!-- BEGIN data -->
 	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br><span>{data.EXPLAIN}</span></dt>
+		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}"></dd>
 	</dl>
 	<!-- END data -->
 	</fieldset>
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
+		<input class="button2" type="submit" name="check_again" value="{L_BACK}">
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}">
+		<input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}">
 	</fieldset>
 
 	</form>
diff -Naur phpbb-3.1.0-RC4/adm/style/install_update_diff.html phpbb-3.1.0-RC4-HTML5/adm/style/install_update_diff.html
--- phpbb-3.1.0-RC4/adm/style/install_update_diff.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/install_update_diff.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,14 +2,13 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" media="screen">
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 function resize_panel()
 {
 	var block = document.getElementById('diff_content');
@@ -27,13 +26,9 @@
 }
 
 window.onresize = resize_panel;
-
-// ]]>
 </script>
 
-<style type="text/css">
-/* <![CDATA[ */
-
+<style>
 #main, .rtl #main {
 	font-size: 1em;
 	line-height: 0.7em;
@@ -201,8 +196,6 @@
 }
 
 <!-- ENDIF -->
-
-/* ]]> */
 </style>
 
 </head>
@@ -228,13 +221,13 @@
 			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
 			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
 
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}">
 		</fieldset>
 		</form>
 <!-- ENDIF -->
 <!-- IF S_DIFF_CONFLICT_FILE -->
 		<div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div>
-		<br style="clear: both;" />
+		<br style="clear: both;">
 <!-- ENDIF -->
 	</div>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/overall_footer.html phpbb-3.1.0-RC4-HTML5/adm/style/overall_footer.html
--- phpbb-3.1.0-RC4/adm/style/overall_footer.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/overall_footer.html	2014-09-21 12:00:00.000000000 +0200
@@ -8,11 +8,11 @@
 		<div class="copyright">
 			<!-- IF S_COPYRIGHT_HTML -->
 				{CREDIT_LINE}
-				<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+				<!-- IF TRANSLATION_INFO --><br>{TRANSLATION_INFO}<!-- ENDIF -->
 			<!-- ENDIF -->
 
 			<!-- IF DEBUG_OUTPUT -->
-				<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
+				<!-- IF S_COPYRIGHT_HTML --><br><!-- ENDIF -->
 				{DEBUG_OUTPUT}
 			<!-- ENDIF -->
 		</div>
@@ -33,9 +33,9 @@
 	</div>
 </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>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
 
diff -Naur phpbb-3.1.0-RC4/adm/style/overall_header.html phpbb-3.1.0-RC4-HTML5/adm/style/overall_header.html
--- phpbb-3.1.0-RC4/adm/style/overall_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/overall_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,14 +2,13 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width">
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
+<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen">
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
@@ -81,8 +80,6 @@
 	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
 	return false;
 }
-
-// ]]>
 </script>
 
 <!-- EVENT acp_overall_header_head_append -->
@@ -116,7 +113,7 @@
 		<div id="acp">
 				<div id="content">
 					<div id="menu">
-						<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
+						<p>{L_LOGGED_IN_AS}<br><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;][&nbsp;<a href="{U_ADM_LOGOUT}">{L_ADM_LOGOUT}</a>&nbsp;]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
diff -Naur phpbb-3.1.0-RC4/adm/style/permission_forum_copy.html phpbb-3.1.0-RC4-HTML5/adm/style/permission_forum_copy.html
--- phpbb-3.1.0-RC4/adm/style/permission_forum_copy.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/permission_forum_copy.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,7 +12,7 @@
 		<legend>{L_LOOK_UP_FORUM}</legend>
 
 		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
 			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
@@ -22,15 +22,15 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 
 		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
 			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}">&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}">
 		{S_HIDDEN_FIELDS}
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/adm/style/permission_mask.html phpbb-3.1.0-RC4-HTML5/adm/style/permission_mask.html
--- phpbb-3.1.0-RC4/adm/style/permission_mask.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/permission_mask.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,6 +1,5 @@
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var active_pmask = '0';
 	var active_fmask = '0';
 	var active_cat = '0';
@@ -12,9 +11,8 @@
 	<!-- IF S_ROLE_JS_ARRAY -->
 		{S_ROLE_JS_ARRAY}
 	<!-- ENDIF -->
-// ]]>
 </script>
-<script type="text/javascript" src="style/permissions.js"></script>
+<script src="style/permissions.js"></script>
 
 <!-- BEGIN p_mask -->
 <div class="clearfix"></div>
@@ -25,7 +23,7 @@
 <fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
+			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')"> 
 		<!-- ELSE -->
 		<!-- ENDIF -->
 		<!-- IF p_mask.f_mask.PADDING --><span class="padding">{p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}</span><!-- ENDIF -->{p_mask.f_mask.NAME}
@@ -78,11 +76,11 @@
 			<div class="tablewrap">
 				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" class="table1 not-responsive">
 				<colgroup>
-					<col class="permissions-name" />
-					<col class="permissions-yes" />
-					<col class="permissions-no" />
+					<col class="permissions-name">
+					<col class="permissions-yes">
+					<col class="permissions-no">
 					<!-- IF not p_mask.S_VIEW -->
-						<col class="permissions-never" />
+						<col class="permissions-never">
 					<!-- ENDIF -->
 				</colgroup>
 				<thead>
@@ -101,14 +99,14 @@
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th class="permissions-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="{p_mask.f_mask.category.mask.U_TRACE}" class="trace" onclick="popup(this.href, 750, 515, '_trace'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}"></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
 						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
 						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
 					<!-- ELSE -->
-						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
-						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
-						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0" /></label></td>
+						<td class="permissions-yes"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_y" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1"></label></td>
+						<td class="permissions-no"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_u" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1"></label></td>
+						<td class="permissions-never"><label for="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n"><input onclick="reset_role('role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); set_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}', false)" id="{p_mask.f_mask.category.mask.S_FIELD_NAME}_n" name="{p_mask.f_mask.category.mask.S_FIELD_NAME}" class="radio" type="radio"<!-- IF p_mask.f_mask.category.mask.S_NEVER --> checked="checked"<!-- ENDIF --> value="0"></label></td>
 					<!-- ENDIF -->
 				</tr>
 				<!-- END mask -->
@@ -119,7 +117,7 @@
 			<!-- IF not p_mask.S_VIEW -->
 			<fieldset class="quick" style="margin-{S_CONTENT_FLOW_END}{L_COLON} 11px;">
 				<p class="small">{L_APPLY_PERMISSIONS_EXPLAIN}</p>
-				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}" />
+				<input class="button1" type="submit" name="psubmit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" value="{L_APPLY_PERMISSIONS}">
 				<!-- IF .p_mask.f_mask gt 1 or .p_mask gt 1 -->
 					<p class="small"><a href="#" onclick="reset_opacity(0, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="reset_opacity(1, '{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); return false;">{L_UNMARK_ALL}</a></p>
 				<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/adm/style/permission_trace.html phpbb-3.1.0-RC4-HTML5/adm/style/permission_trace.html
--- phpbb-3.1.0-RC4/adm/style/permission_trace.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/permission_trace.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,7 +6,7 @@
 
 	<h3>{L_TRACE_FOR}{L_COLON} {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3>
 
-	<br />
+	<br>
 
 	<table class="table1">
 	<thead>
@@ -51,7 +51,7 @@
 	</tbody>
 	</table>
 
-	<br />
+	<br>
 
 </div>
 
diff -Naur phpbb-3.1.0-RC4/adm/style/profilefields/bool.html phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/bool.html
--- phpbb-3.1.0-RC4/adm/style/profilefields/bool.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/bool.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,7 @@
 <!-- BEGIN bool -->
 <!-- IF bool.FIELD_LENGTH eq 1 -->
-	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
+	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED}> {bool.options.VALUE}</label> <!-- END options -->
 <!-- ELSE -->
-	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF -->>
 <!-- ENDIF -->
 <!-- END bool -->
diff -Naur phpbb-3.1.0-RC4/adm/style/profilefields/int.html phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/int.html
--- phpbb-3.1.0-RC4/adm/style/profilefields/int.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/int.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN int -->
-<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}">
 <!-- END int -->
diff -Naur phpbb-3.1.0-RC4/adm/style/profilefields/string.html phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/string.html
--- phpbb-3.1.0-RC4/adm/style/profilefields/string.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/string.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN string -->
-<input type="text" class="autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+<input type="text" class="autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}">
 <!-- END string -->
diff -Naur phpbb-3.1.0-RC4/adm/style/profilefields/url.html phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/url.html
--- phpbb-3.1.0-RC4/adm/style/profilefields/url.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/profilefields/url.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN url -->
-<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
+<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}">
 <!-- END url -->
diff -Naur phpbb-3.1.0-RC4/adm/style/progress_bar.html phpbb-3.1.0-RC4-HTML5/adm/style/progress_bar.html
--- phpbb-3.1.0-RC4/adm/style/progress_bar.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/progress_bar.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	/**
 	* Close previously opened popup
 	*/
@@ -22,19 +21,16 @@
 		setTimeout("close_popup()", 1000);
 		return 0;
 	}
-// ]]>
 </script>
 
 <div class="successbox">
 	<h3>{L_PROGRESS}</h3>
-	<img src="images/progress_bar.gif" alt="{L_PROGRESS}" />
+	<img src="images/progress_bar.gif" alt="{L_PROGRESS}">
 	<p>{L_PROGRESS_EXPLAIN}</p>
 </div>
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	close_popup();
-// ]]>
 </script>
 
 <!-- INCLUDE simple_footer.html -->
diff -Naur phpbb-3.1.0-RC4/adm/style/simple_footer.html phpbb-3.1.0-RC4-HTML5/adm/style/simple_footer.html
--- phpbb-3.1.0-RC4/adm/style/simple_footer.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/simple_footer.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,24 +1,24 @@
 		<div style="text-align: {S_CONTENT_FLOW_END};"><a href="#" onclick="self.close(); return false;">{L_CLOSE_WINDOW}</a></div>
-	<br /><br />
+	<br><br>
 </div>
 
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />{CREDIT_LINE}
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<br>{CREDIT_LINE}
+		<!-- IF TRANSLATION_INFO --><br>{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
 	<!-- IF DEBUG_OUTPUT -->
-		<!-- IF S_COPYRIGHT_HTML --><br /><br /><!-- ENDIF -->
+		<!-- IF S_COPYRIGHT_HTML --><br><br><!-- ENDIF -->
 		{DEBUG_OUTPUT}
 	<!-- ENDIF -->
 
 </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>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
 {$SCRIPTS}
diff -Naur phpbb-3.1.0-RC4/adm/style/simple_header.html phpbb-3.1.0-RC4-HTML5/adm/style/simple_header.html
--- phpbb-3.1.0-RC4/adm/style/simple_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/adm/style/simple_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,10 +5,9 @@
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
+<link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen">
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
@@ -79,8 +78,6 @@
 	popup(url, 760, 570, '_usersearch');
 	return false;
 }
-
-// ]]>
 </script>
 <!-- EVENT acp_simple_header_head_append -->
 {$STYLESHEETS}
diff -Naur phpbb-3.1.0-RC4/assets/javascript/plupload.js phpbb-3.1.0-RC4-HTML5/assets/javascript/plupload.js
--- phpbb-3.1.0-RC4/assets/javascript/plupload.js	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/assets/javascript/plupload.js	2014-09-21 12:00:00.000000000 +0200
@@ -208,7 +208,7 @@
 	row.find('input[type="hidden"]').remove();
 
 	for (var key in attach) {
-		var input = $('<input />')
+		var input = $('<input>')
 			.attr('type', 'hidden')
 			.attr('name', 'attachment_data[' + index + '][' + key +']')
 			.attr('value', attach[key]);
diff -Naur phpbb-3.1.0-RC4/docs/CHANGELOG.html phpbb-3.1.0-RC4-HTML5/docs/CHANGELOG.html
--- phpbb-3.1.0-RC4/docs/CHANGELOG.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/CHANGELOG.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.1.x Changelog" />
+<meta name="keywords" content="">
+<meta name="description" content="phpBB 3.1.x Changelog">
 <title>phpBB3 &bull; Changelog</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>phpBB 3.1.x Changelog</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
@@ -88,7 +88,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="changelog"></a><h2>1. Changelog</h2>
 
@@ -4216,7 +4216,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>2. Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/docs/FAQ.html phpbb-3.1.0-RC4-HTML5/docs/FAQ.html
--- phpbb-3.1.0-RC4/docs/FAQ.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/FAQ.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.1.x frequently asked questions" />
+<meta name="keywords" content="">
+<meta name="description" content="phpBB 3.1.x frequently asked questions">
 <title>phpBB3 &bull; FAQ</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>phpBB 3.1.x FAQ</h1>
 				<p>phpBB 3.1.x frequently asked questions</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
@@ -69,7 +69,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="install"></a><h2>I am finding phpBB too difficult to install. Will you do it for me?</h2>
 
@@ -91,11 +91,11 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
-<a name="legal"></a><h2>I am having problems with the admin at a certain board, help!<br />
-A board has ripped off my graphics/software/etc., stop them!<br />
-A board is dealing in warez/porn/etc., you need to prevent them doing this!<br />
+<a name="legal"></a><h2>I am having problems with the admin at a certain board, help!<br>
+A board has ripped off my graphics/software/etc., stop them!<br>
+A board is dealing in warez/porn/etc., you need to prevent them doing this!<br>
 I want to sue you because i think you host an illegal board!</h2>
 
 	<div class="paragraph">
@@ -114,7 +114,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="viewonline"></a><h2>According to viewonline a user is doing/reading something they should not be able to!</h2>
 
@@ -134,7 +134,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="mail"></a><h2>I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!</h2>
 
@@ -154,7 +154,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="mail_language"></a><h2>My users are complaining that emails are not in their selected language!</h2>
 
@@ -174,7 +174,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="aol_browser"></a><h2>My AOL based users keep getting logged out!</h2>
 
@@ -196,7 +196,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="avatars"></a><h2>I am unable to upload avatars from my computer, regardless of the settings.</h2>
 
@@ -216,7 +216,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="gallery_avatars"></a><h2>I just cannot get gallery avatars to appear!</h2>
 
@@ -234,7 +234,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="permissions"></a><h2>How do I use/set permissions?</h2>
 
@@ -252,7 +252,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="login_issues"></a><h2>I (or my users) cannot stay logged in to the forum!</h2>
 
@@ -272,7 +272,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="logout_issues"></a><h2>My users are complaining about being logged out too quickly!</h2>
 
@@ -290,7 +290,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="not_answered"></a><h2>My question isn't answered here!</h2>
 
@@ -312,7 +312,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/docs/INSTALL.html phpbb-3.1.0-RC4-HTML5/docs/INSTALL.html
--- phpbb-3.1.0-RC4/docs/INSTALL.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/INSTALL.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.1.x Installation, updating and conversion informations" />
+<meta name="keywords" content="">
+<meta name="description" content="phpBB 3.1.x Installation, updating and conversion informations">
 <title>phpBB3 &bull; Install</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>phpBB 3.1.x Install</h1>
 				<p>phpBB 3.1.x Installation, updating and conversion informations</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
@@ -85,7 +85,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="quickinstall"></a><h2>1. Quick install</h2>
 
@@ -100,7 +100,7 @@
 		<li>Decompress the phpBB3 archive to a local directory on your system.</li>
 		<li>Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account.</li>
 		<li>Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)</li>
-		<li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br />
+		<li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br>
 			<code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li>
 		<li>Point your web browser to the location where you uploaded the phpBB3 files with the addition of <code>install/index.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/index.php</code>, <code>http://www.example.com/forum/install/</code>.</li>
 		<li>Click the <strong><em>INSTALL</em></strong> tab, follow the steps and fill out all the requested information.</li>
@@ -117,7 +117,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="require"></a><h2>2. Requirements</h2>
 
@@ -167,7 +167,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="install"></a><h2>3. New installation</h2>
 
@@ -247,7 +247,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="update"></a><h2>4. Updating from stable releases of phpBB 3.1.x</h2>
 
@@ -323,7 +323,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="update30"></a><h2>5. Updating from phpBB 3.0.x to phpBB 3.1.x</h2>
 
@@ -357,7 +357,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="convert"></a><h2>6. Conversion from phpBB 2.0.x to phpBB 3.1.x</h2>
 
@@ -420,7 +420,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="postinstall"></a><h2>7. Important (security related) post-Install tasks for all installation methods</h2>
 
@@ -458,7 +458,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="anti_spam"></a><h2>8. Anti-Spam Measures</h2>
 		
@@ -474,7 +474,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>9. Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/docs/README.html phpbb-3.1.0-RC4-HTML5/docs/README.html
--- phpbb-3.1.0-RC4/docs/README.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/README.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.1.x Readme" />
+<meta name="keywords" content="">
+<meta name="description" content="phpBB 3.1.x Readme">
 <title>phpBB3 &bull; Readme</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>phpBB 3.1.x Readme</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
@@ -76,7 +76,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="install"></a><h2>1. Installing phpBB3</h2>
 
@@ -113,7 +113,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 	<a name="run"></a><h2>2. Running phpBB3</h2>
 
@@ -165,7 +165,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="help"></a><h2>3. Getting help with phpBB3</h2>
 
@@ -211,7 +211,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="status"></a><h2>4. Status of this version</h2>
 
@@ -235,7 +235,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="bugs"></a><h2>5. Reporting Bugs</h2>
 
@@ -251,9 +251,9 @@
 	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
 
 	<ul>
-		<li>First, determine if your bug is reproduceable; how to determine this depends on the bug in question. Only if the bug is reproduceable is it likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br /><br /></li>
-		<li>Next, please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
-		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it&rsquo;s related to something you have done rather than phpBB3<br /><br /></li>
+		<li>First, determine if your bug is reproduceable; how to determine this depends on the bug in question. Only if the bug is reproduceable is it likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br><br></li>
+		<li>Next, please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br><br></li>
+		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it&rsquo;s related to something you have done rather than phpBB3<br><br></li>
 		<li>If no existing bug exists then please feel free to add it</li>
 	</ul>
 
@@ -286,7 +286,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="curbugs"></a><h2>6. Overview of current bug list</h2>
 
@@ -310,7 +310,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="php"></a><h2>7. PHP compatibility issues</h2>
 
@@ -336,7 +336,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>8. Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/docs/auth_api.html phpbb-3.1.0-RC4-HTML5/docs/auth_api.html
--- phpbb-3.1.0-RC4/docs/auth_api.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/auth_api.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
+<meta name="keywords" content="">
+<meta name="description" content="This is an explanation of how to use the phpBB auth/acl API">
 <title>phpBB3 &bull; Auth API</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>Auth API</h1>
 				<p>This is an explanation of how to use the phpBB auth/acl API</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
@@ -68,7 +68,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="intro"></a><h2>1. Introduction</h2>
 
@@ -98,7 +98,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="methods"></a><h2>2. Methods</h2>
 
@@ -233,7 +233,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="admin_related"></a><h2>3. Admin related functions</h2>
 
@@ -259,7 +259,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>4. Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/docs/coding-guidelines.html phpbb-3.1.0-RC4-HTML5/docs/coding-guidelines.html
--- phpbb-3.1.0-RC4/docs/coding-guidelines.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/docs/coding-guidelines.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta name="keywords" content="" />
-<meta name="description" content="Ascraeus coding guidelines document" />
+<meta name="keywords" content="">
+<meta name="description" content="Ascraeus coding guidelines document">
 <title>phpBB3 &bull; Coding Guidelines</title>
 
-<link href="stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
+<link href="stylesheet.css" rel="stylesheet" media="screen, projection">
 
 </head>
 
@@ -19,7 +19,7 @@
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div id="doc-description">
-				<a href="../index.php" id="logo"><img src="site_logo.gif" alt="" /></a>
+				<a href="../index.php" id="logo"><img src="site_logo.gif" alt=""></a>
 				<h1>Coding Guidelines</h1>
 				<p>Ascraeus coding guidelines document</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
@@ -92,7 +92,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="defaults"></a><h2>1. Defaults</h2>
 
@@ -195,27 +195,27 @@
 	<p>The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:</p>
 
 	<ul>
-		<li><strong>phpBB3</strong><br />Core files and all files not assigned to a separate package</li>
-		<li><strong>acm</strong><br /><code>/phpbb/cache</code><br />Cache System</li>
-		<li><strong>acp</strong><br /><code>/adm</code>, <code>/includes/acp</code>, <code>/includes/functions_admin.php</code><br />Administration Control Panel</li>
-		<li><strong>dbal</strong><br /><code>/phpbb/db</code>, <code>/includes/db</code><br />Database Abstraction Layer.
+		<li><strong>phpBB3</strong><br>Core files and all files not assigned to a separate package</li>
+		<li><strong>acm</strong><br><code>/phpbb/cache</code><br>Cache System</li>
+		<li><strong>acp</strong><br><code>/adm</code>, <code>/includes/acp</code>, <code>/includes/functions_admin.php</code><br>Administration Control Panel</li>
+		<li><strong>dbal</strong><br><code>/phpbb/db</code>, <code>/includes/db</code><br>Database Abstraction Layer.
 			<ul>
-				<li><code>/phpbb/db/driver/</code><br />Database Abstraction Layer classes</li>
-				<li><code>/phpbb/db/migration/</code><br />Migrations are used for updating the database from one release to another</li>
+				<li><code>/phpbb/db/driver/</code><br>Database Abstraction Layer classes</li>
+				<li><code>/phpbb/db/migration/</code><br>Migrations are used for updating the database from one release to another</li>
 			</ul>
 		</li>
-		<li><strong>diff</strong><br /><code>/includes/diff</code><br />Diff Engine</li>
-		<li><strong>docs</strong><br /><code>/docs</code><br />phpBB Documentation</li>
-		<li><strong>images</strong><br /><code>/images</code><br />All global images not connected to styles</li>
-		<li><strong>install</strong><br /><code>/install</code><br />Installation System</li>
-		<li><strong>language</strong><br /><code>/language</code><br />All language files</li>
-		<li><strong>login</strong><br /><code>/phpbb/auth</code><br />Login Authentication Plugins</li>
-		<li><strong>VC</strong><br /><code>/includes/captcha</code><br />CAPTCHA</li>
-		<li><strong>mcp</strong><br /><code>mcp.php</code>, <code>/includes/mcp</code>, <code>report.php</code><br />Moderator Control Panel</li>
-		<li><strong>ucp</strong><br /><code>ucp.php</code>, <code>/includes/ucp</code><br />User Control Panel</li>
-		<li><strong>utf</strong><br /><code>/includes/utf</code><br />UTF8-related functions/classes</li>
-		<li><strong>search</strong><br /><code>/phpbb/search</code>, <code>search.php</code><br />Search System</li>
-		<li><strong>styles</strong><br /><code>/styles</code><br />phpBB Styles/Templates/Themes</li>
+		<li><strong>diff</strong><br><code>/includes/diff</code><br>Diff Engine</li>
+		<li><strong>docs</strong><br><code>/docs</code><br>phpBB Documentation</li>
+		<li><strong>images</strong><br><code>/images</code><br>All global images not connected to styles</li>
+		<li><strong>install</strong><br><code>/install</code><br>Installation System</li>
+		<li><strong>language</strong><br><code>/language</code><br>All language files</li>
+		<li><strong>login</strong><br><code>/phpbb/auth</code><br>Login Authentication Plugins</li>
+		<li><strong>VC</strong><br><code>/includes/captcha</code><br>CAPTCHA</li>
+		<li><strong>mcp</strong><br><code>mcp.php</code>, <code>/includes/mcp</code>, <code>report.php</code><br>Moderator Control Panel</li>
+		<li><strong>ucp</strong><br><code>ucp.php</code>, <code>/includes/ucp</code><br>User Control Panel</li>
+		<li><strong>utf</strong><br><code>/includes/utf</code><br>UTF8-related functions/classes</li>
+		<li><strong>search</strong><br><code>/phpbb/search</code>, <code>search.php</code><br>Search System</li>
+		<li><strong>styles</strong><br><code>/styles</code><br>phpBB Styles/Templates/Themes</li>
 	</ul>
 
 	<a name="constants"></a><h3>1.iv. Special Constants</h3>
@@ -277,7 +277,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="code"></a><h2>2. Code Layout/Guidelines</h2>
 
@@ -571,7 +571,7 @@
 	</pre></div>
 
 	<h4>Comments:</h4>
-	<p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.<br /><br />Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.<br /><br />Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p>
+	<p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.<br><br>Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.<br><br>Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p>
 
 	<h4>Magic numbers:</h4>
 	<p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not keep a very close eye on it).</p>
@@ -1172,7 +1172,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="styling"></a><h2>3. Styling</h2>
 	<div class="paragraph">
@@ -1255,7 +1255,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="templating"></a><h2>4. Templating</h2>
 	<div class="paragraph">
@@ -1319,7 +1319,7 @@
 <span class="comment">&lt;!-- INCLUDEPHP somefile&#46;php --&gt;</span>
 </pre></div>
 
-<p>it will be included and executed inline.<br /><br />A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="https://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p>
+<p>it will be included and executed inline.<br><br>A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence <!-- w --><a href="https://www.phpbb.com">www.phpbb.com</a><!-- w --> will <strong>not</strong> make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).</p>
 
 <h4>Conditionals/Control structures</h4>
 <p>The most significant addition to 3.x are conditions or control structures, &quot;if something then do this else do that&quot;. The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:</p>
@@ -1393,7 +1393,7 @@
 <span class="comment">&lt;!-- ENDIF --&gt;</span>
 </pre></div>
 
-<p>Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match &quot;everything else&quot;.<br /><br />So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:</p>
+<p>Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match &quot;everything else&quot;.<br><br>So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:</p>
 
 <div class="codebox"><pre>
 &lt;table&gt;
@@ -1425,7 +1425,7 @@
 &lt;/table&gt;
 </pre></div>
 
-<p>This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a &quot;nice&quot; gradient effect, for example.<br /><br />What else can you do? Well, you could use IF to do common checks on for example the login state of a user:</p>
+<p>This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a &quot;nice&quot; gradient effect, for example.<br><br>What else can you do? Well, you could use IF to do common checks on for example the login state of a user:</p>
 
 <div class="codebox"><pre>
 <span class="comment">&lt;!-- IF S_USER_LOGGED_IN --&gt;</span>
@@ -1446,11 +1446,11 @@
 </pre></div>
 
 <p>Will start the loop on the third entry (note that indexes start at zero). Extensions of this are:
-<br /><br />
-<code>loopname(2)</code>: Will start the loop on the 3rd entry<br />
-<code>loopname(-2)</code>: Will start the loop two entries from the end<br />
-<code>loopname(3,4)</code>: Will start the loop on the fourth entry and end it on the fifth<br />
-<code>loopname(3,-4)</code>: Will start the loop on the fourth entry and end it four from last<br />
+<br><br>
+<code>loopname(2)</code>: Will start the loop on the 3rd entry<br>
+<code>loopname(-2)</code>: Will start the loop two entries from the end<br>
+<code>loopname(3,4)</code>: Will start the loop on the fourth entry and end it on the fifth<br>
+<code>loopname(3,-4)</code>: Will start the loop on the fourth entry and end it four from last<br>
 </p>
 
 <p>A further extension to begin is BEGINELSE:</p>
@@ -1662,7 +1662,7 @@
 		{S_FORM_TOKEN}
 	&lt;/fieldset&gt;
 &lt;/form&gt;
-		</pre></div><br />
+		</pre></div><br>
 
 	<a name="stylestree"></a><h3>4.ii. Styles Tree</h3>
 		<p>When basing a new style on an existing one, it is not necessary to provide all the template files. By declaring the base style name in the <strong>parent</strong> field in the style configuration file, the style can be set to reuse template files from the parent style.</p>
@@ -1742,7 +1742,7 @@
     + styles/subsilver2/template/forumlist_body.html
 * Purpose: Add content before the post title of the latest post in a forum on the forum list.
 * Since: 3.1.0-a1
-</pre></div></ul><br />
+</pre></div></ul><br>
 
 		</div>
 
@@ -1751,7 +1751,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 
 
@@ -1824,7 +1824,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="translation"></a><h2>6. Translation (<abbr title="Internationalisation">i18n</abbr>/<abbr title="Localisation">L10n</abbr>) Guidelines</h2>
 
@@ -2133,8 +2133,8 @@
 	<tr>
 		<th scope="col">Raw language tag</th>
 		<th scope="col">Description</th>
-		<th scope="col">Value of <code>USER_LANG</code><br />in <code>./common.php</code></th>
-		<th scope="col">Language pack directory<br />name in <code>/language/</code></th>
+		<th scope="col">Value of <code>USER_LANG</code><br>in <code>./common.php</code></th>
+		<th scope="col">Language pack directory<br>name in <code>/language/</code></th>
 	</tr>
 	</thead>
 	<tbody>
@@ -2237,11 +2237,11 @@
 	<caption>Unicode bidirectional control characters &amp; HTML elements/entities</caption>
 	<thead>
 	<tr>
-		<th scope="col">Unicode character<br />abbreviation</th>
-		<th scope="col">Unicode<br />code-point</th>
-		<th scope="col">Unicode character<br />name</th>
-		<th scope="col">Equivalent HTML<br />markup/entity</th>
-		<th scope="col">Raw character<br />(enclosed between '')</th>
+		<th scope="col">Unicode character<br>abbreviation</th>
+		<th scope="col">Unicode<br>code-point</th>
+		<th scope="col">Unicode character<br>name</th>
+		<th scope="col">Equivalent HTML<br>markup/entity</th>
+		<th scope="col">Raw character<br>(enclosed between '')</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -2305,7 +2305,7 @@
 	<tr>
 		<th scope="col">Directionality</th>
 		<th scope="col">Raw character view</th>
-		<th scope="col">Display of localised<br />description in <code>iso.txt</code></th>
+		<th scope="col">Display of localised<br>description in <code>iso.txt</code></th>
 		<th scope="col">Ordering</th>
 	</tr>
 	</thead>
@@ -2382,9 +2382,9 @@
 	<a name="usingplurals"></a><h3>6.iv. Using plurals</h3>
 
 	<p>
-		The english language is very simple when it comes to plurals.<br />
-		You have <code>0 elephants</code>, <code>1 elephant</code>, or <code>2+ elephants</code>. So basically you have 2 different forms: one singular and one plural.<br />
-		But for some other languages this is quite more difficult. Let's take the Bosnian language as another example:<br />
+		The english language is very simple when it comes to plurals.<br>
+		You have <code>0 elephants</code>, <code>1 elephant</code>, or <code>2+ elephants</code>. So basically you have 2 different forms: one singular and one plural.<br>
+		But for some other languages this is quite more difficult. Let's take the Bosnian language as another example:<br>
 		You have <code>[1/21/31] slon</code>, <code>[2/3/4] slona</code>, <code>[0/5/6] slonova</code> and <code>[7/8/9/11] ...</code> and some more difficult rules.
 	</p>
 
@@ -2541,7 +2541,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<hr />
+	<hr>
 
 <a name="disclaimer"></a><h2>7. Copyright and disclaimer</h2>
 
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_attachments.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_attachments.php
--- phpbb-3.1.0-RC4/includes/acp/acp_attachments.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_attachments.php	2014-09-21 12:00:00.000000000 +0200
@@ -269,7 +269,7 @@
 					'S_DEFINED_IPS'			=> ($defined_ips != '') ? true : false,
 					'S_WARNING'				=> (sizeof($error)) ? true : false,
 
-					'WARNING_MSG'			=> implode('<br />', $error),
+					'WARNING_MSG'			=> implode('<br>', $error),
 					'DEFINED_IPS'			=> $defined_ips,
 
 					'L_SECURE_TITLE'		=> $user->lang['DEFINE_' . $allow_deny . '_IPS'],
@@ -1215,7 +1215,7 @@
 					$row = $attachments_list[$i];
 
 					$row['extension'] = strtolower(trim((string) $row['extension']));
-					$comment = ($row['attach_comment'] && !$row['in_message']) ? str_replace(array("\n", "\r"), array('<br />', "\n"), $row['attach_comment']) : '';
+					$comment = ($row['attach_comment'] && !$row['in_message']) ? str_replace(array("\n", "\r"), array('<br>', "\n"), $row['attach_comment']) : '';
 					$display_cat = $extensions[$row['extension']]['display_cat'];
 					$l_downloaded_viewed = ($display_cat == ATTACHMENT_CATEGORY_NONE) ? 'DOWNLOAD_COUNTS' : 'VIEWED_COUNTS';
 
@@ -1249,7 +1249,7 @@
 		{
 			$template->assign_vars(array(
 				'S_WARNING'		=> true,
-				'WARNING_MSG'	=> implode('<br />', $error))
+				'WARNING_MSG'	=> implode('<br>', $error))
 			);
 		}
 
@@ -1257,7 +1257,7 @@
 		{
 			$template->assign_vars(array(
 				'S_NOTIFY'		=> true,
-				'NOTIFY_MSG'	=> implode('<br />', $notify))
+				'NOTIFY_MSG'	=> implode('<br>', $notify))
 			);
 		}
 	}
@@ -1733,7 +1733,7 @@
 		$value = $filesize['value'];
 
 		// size="8" and maxlength="15" attributes as a fallback for browsers that do not support type="number" yet.
-		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" name="config[' . $key . ']" value="' . $value . '"> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
 	}
 
 	/**
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_board.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_board.php
--- phpbb-3.1.0-RC4/includes/acp/acp_board.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_board.php	2014-09-21 12:00:00.000000000 +0200
@@ -615,7 +615,7 @@
 			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
 
 			'S_ERROR'			=> (sizeof($error)) ? true : false,
-			'ERROR_MSG'			=> implode('<br />', $error),
+			'ERROR_MSG'			=> implode('<br>', $error),
 
 			'U_ACTION'			=> $this->u_action)
 		);
@@ -807,7 +807,7 @@
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_name_chars]" value="' . $value . '"> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '"> ' . $user->lang['MAX_CHARS'];
 	}
 
 	/**
@@ -835,7 +835,7 @@
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="255" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '"> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="255" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '"> ' . $user->lang['MAX_CHARS'];
 	}
 
 	/**
@@ -871,7 +871,7 @@
 			$s_bump_type .= '<option value="' . $type . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
 		}
 
-		return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '" />&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
+		return '<input id="' . $key . '" type="text" size="3" maxlength="4" name="config[bump_interval]" value="' . $value . '">&nbsp;<select name="config[bump_type]">' . $s_bump_type . '</select>';
 	}
 
 	/**
@@ -883,7 +883,7 @@
 
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
-		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
+		return h_radio('config[board_disable]', $radio_ary, $value) . '<br><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '">';
 	}
 
 	/**
@@ -896,7 +896,7 @@
 		$radio_ary = array(1 => 'YES', 0 => 'NO');
 
 		return h_radio('config[allow_quick_reply]', $radio_ary, $value) .
-			'<br /><br /><input class="button2" type="submit" id="' . $key . '_enable" name="' . $key . '_enable" value="' . $user->lang['ALLOW_QUICK_REPLY_BUTTON'] . '" />';
+			'<br><br><input class="button2" type="submit" id="' . $key . '_enable" name="' . $key . '_enable" value="' . $user->lang['ALLOW_QUICK_REPLY_BUTTON'] . '">';
 	}
 
 	/**
@@ -950,7 +950,7 @@
 		$user->timezone = $old_tz;
 
 		return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('" . addslashes($key) . "').value = '" . addslashes($value) . "'; } else { document.getElementById('" . addslashes($key) . "').value = this.value; }\">$dateformat_options</select>
-		<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />";
+		<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\">";
 	}
 
 	/**
@@ -1066,6 +1066,6 @@
 		$field_name = 'config[enable_mod_rewrite]' . ($message === 'MOD_REWRITE_DISABLED' ? '" disabled="disabled' : '');
 
 		return h_radio($field_name, array(1 => 'YES', 0 => 'NO'), $value) .
-			($message !== false ? '<br /><span>' . $user->lang($message) . '</span>' : '');
+			($message !== false ? '<br><span>' . $user->lang($message) . '</span>' : '');
 	}
 }
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_bots.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_bots.php
--- phpbb-3.1.0-RC4/includes/acp/acp_bots.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_bots.php	2014-09-21 12:00:00.000000000 +0200
@@ -334,7 +334,7 @@
 					'L_TITLE'		=> $user->lang['BOT_' . $l_title],
 					'U_ACTION'		=> $this->u_action . "&amp;id=$bot_id&amp;action=$action",
 					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'BOT_NAME'		=> $bot_row['bot_name'],
 					'BOT_IP'		=> $bot_row['bot_ip'],
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_email.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_email.php
--- phpbb-3.1.0-RC4/includes/acp/acp_email.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_email.php	2014-09-21 12:00:00.000000000 +0200
@@ -269,7 +269,7 @@
 
 		$template->assign_vars(array(
 			'S_WARNING'				=> (sizeof($error)) ? true : false,
-			'WARNING_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'WARNING_MSG'			=> (sizeof($error)) ? implode('<br>', $error) : '',
 			'U_ACTION'				=> $this->u_action,
 			'S_GROUP_OPTIONS'		=> $select_list,
 			'USERNAMES'				=> $usernames,
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_forums.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_forums.php
--- phpbb-3.1.0-RC4/includes/acp/acp_forums.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_forums.php	2014-09-21 12:00:00.000000000 +0200
@@ -228,7 +228,7 @@
 						// redirect directly to permission settings screen if authed
 						if ($action == 'add' && !$copied_permissions && $auth->acl_get('a_fauth'))
 						{
-							$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
+							$message .= '<br><br>' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
 
 							meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
 						}
@@ -631,7 +631,7 @@
 
 					'L_COPY_PERMISSIONS_EXPLAIN'	=> $user->lang['COPY_PERMISSIONS_' . strtoupper($action) . '_EXPLAIN'],
 					'L_TITLE'						=> $user->lang[$this->page_title],
-					'ERROR_MSG'						=> (sizeof($errors)) ? implode('<br />', $errors) : '',
+					'ERROR_MSG'						=> (sizeof($errors)) ? implode('<br>', $errors) : '',
 
 					'FORUM_NAME'				=> $forum_data['forum_name'],
 					'FORUM_DATA_LINK'			=> $forum_data['forum_link'],
@@ -772,7 +772,7 @@
 					'S_HAS_SUBFORUMS'		=> ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
 					'S_FORUMS_LIST'			=> $forums_list,
 					'S_ERROR'				=> (sizeof($errors)) ? true : false,
-					'ERROR_MSG'				=> (sizeof($errors)) ? implode('<br />', $errors) : '')
+					'ERROR_MSG'				=> (sizeof($errors)) ? implode('<br>', $errors) : '')
 				);
 
 				return;
@@ -796,7 +796,7 @@
 					// Redirect to permissions
 					if ($auth->acl_get('a_fauth'))
 					{
-						$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
+						$message .= '<br><br>' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
 					}
 
 					trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
@@ -850,18 +850,18 @@
 
 				if ($row['forum_status'] == ITEM_LOCKED)
 				{
-					$folder_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['LOCKED'] . '" />';
+					$folder_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['LOCKED'] . '">';
 				}
 				else
 				{
 					switch ($forum_type)
 					{
 						case FORUM_LINK:
-							$folder_image = '<img src="images/icon_folder_link.gif" alt="' . $user->lang['LINK'] . '" />';
+							$folder_image = '<img src="images/icon_folder_link.gif" alt="' . $user->lang['LINK'] . '">';
 						break;
 
 						default:
-							$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['SUBFORUM'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '" />';
+							$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['SUBFORUM'] . '">' : '<img src="images/icon_folder.gif" alt="' . $user->lang['FOLDER'] . '">';
 						break;
 					}
 				}
@@ -870,7 +870,7 @@
 
 				$template->assign_block_vars('forums', array(
 					'FOLDER_IMAGE'		=> $folder_image,
-					'FORUM_IMAGE'		=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="" />' : '',
+					'FORUM_IMAGE'		=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="">' : '',
 					'FORUM_IMAGE_SRC'	=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 					'FORUM_NAME'		=> $row['forum_name'],
 					'FORUM_DESCRIPTION'	=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
@@ -907,7 +907,7 @@
 		$db->sql_freeresult($result);
 
 		$template->assign_vars(array(
-			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br />', $errors) : '',
+			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br>', $errors) : '',
 			'NAVIGATION'	=> $navigation,
 			'FORUM_BOX'		=> $forum_box,
 			'U_SEL_ACTION'	=> $this->u_action,
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_groups.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_groups.php
--- phpbb-3.1.0-RC4/includes/acp/acp_groups.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_groups.php	2014-09-21 12:00:00.000000000 +0200
@@ -718,7 +718,7 @@
 					'S_USER_FOUNDER'	=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,
 					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 
-					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 					'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
 					'GROUP_INTERNAL_NAME'	=> $group_name,
 					'GROUP_DESC'			=> $group_desc_data['text'],
@@ -737,7 +737,7 @@
 
 					'S_RANK_OPTIONS'		=> $rank_options,
 					'S_GROUP_OPTIONS'		=> group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
-					'AVATAR'				=> empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar,
+					'AVATAR'				=> empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="">' : $avatar,
 					'AVATAR_MAX_FILESIZE'	=> $config['avatar_filesize'],
 					'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 					'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_icons.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_icons.php
--- phpbb-3.1.0-RC4/includes/acp/acp_icons.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_icons.php	2014-09-21 12:00:00.000000000 +0200
@@ -491,7 +491,7 @@
 				$errormsgs = '';
 				foreach ($errors as $img => $error)
 				{
-					$errormsgs .= '<br />' . sprintf($user->lang[$error], $img);
+					$errormsgs .= '<br>' . sprintf($user->lang[$error], $img);
 				}
 				if ($action == 'modify')
 				{
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_jabber.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_jabber.php
--- phpbb-3.1.0-RC4/includes/acp/acp_jabber.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_jabber.php	2014-09-21 12:00:00.000000000 +0200
@@ -77,13 +77,13 @@
 
 				if (!$jabber->connect())
 				{
-					trigger_error($user->lang['ERR_JAB_CONNECT'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['ERR_JAB_CONNECT'] . '<br><br>' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				// We'll try to authorise using this account
 				if (!$jabber->login())
 				{
-					trigger_error($user->lang['ERR_JAB_AUTH'] . '<br /><br />' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['ERR_JAB_AUTH'] . '<br><br>' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				$jabber->disconnect();
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_language.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_language.php
--- phpbb-3.1.0-RC4/includes/acp/acp_language.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_language.php	2014-09-21 12:00:00.000000000 +0200
@@ -332,7 +332,7 @@
 				add_log('admin', 'LOG_LANGUAGE_PACK_INSTALLED', $lang_pack['name']);
 
 				$message = sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']);
-				$message .= ($notify_cpf_update) ? '<br /><br />' . $user->lang['LANGUAGE_PACK_CPF_UPDATE'] : '';
+				$message .= ($notify_cpf_update) ? '<br><br>' . $user->lang['LANGUAGE_PACK_CPF_UPDATE'] : '';
 				trigger_error($message . adm_back_link($this->u_action));
 
 			break;
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_modules.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_modules.php
--- phpbb-3.1.0-RC4/includes/acp/acp_modules.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_modules.php	2014-09-21 12:00:00.000000000 +0200
@@ -370,7 +370,7 @@
 				{
 					$template->assign_vars(array(
 						'S_ERROR'	=> true,
-						'ERROR_MSG'	=> implode('<br />', $errors))
+						'ERROR_MSG'	=> implode('<br>', $errors))
 					);
 				}
 
@@ -387,14 +387,14 @@
 				$json_response = new \phpbb\json_response;
 				$json_response->send(array(
 					'MESSAGE_TITLE'	=> $user->lang('ERROR'),
-					'MESSAGE_TEXT'	=> implode('<br />', $errors),
+					'MESSAGE_TEXT'	=> implode('<br>', $errors),
 					'SUCCESS'	=> false,
 				));
 			}
 
 			$template->assign_vars(array(
 				'S_ERROR'	=> true,
-				'ERROR_MSG'	=> implode('<br />', $errors))
+				'ERROR_MSG'	=> implode('<br>', $errors))
 			);
 		}
 
@@ -441,11 +441,11 @@
 
 				if (!$row['module_enabled'])
 				{
-					$module_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['DEACTIVATED_MODULE'] .'" />';
+					$module_image = '<img src="images/icon_folder_lock.gif" alt="' . $user->lang['DEACTIVATED_MODULE'] .'">';
 				}
 				else
 				{
-					$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" alt="' . $user->lang['MODULE'] . '" />';
+					$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $user->lang['CATEGORY'] . '">' : '<img src="images/icon_folder.gif" alt="' . $user->lang['MODULE'] . '">';
 				}
 
 				$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_php_info.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_php_info.php
--- phpbb-3.1.0-RC4/includes/acp/acp_php_info.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_php_info.php	2014-09-21 12:00:00.000000000 +0200
@@ -65,7 +65,7 @@
 		}
 		$output = preg_replace('#<table[^>]+>#i', '<table>', $output);
 		$output = preg_replace('#<img border="0"#i', '<img', $output);
-		$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr />', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
+		$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr>', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
 
 		// Fix invalid anchor names (eg "module_Zend Optimizer")
 		$output = preg_replace_callback('#<a name="([^"]+)">#', array($this, 'remove_spaces'), $output);
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_profile.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_profile.php
--- phpbb-3.1.0-RC4/includes/acp/acp_profile.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_profile.php	2014-09-21 12:00:00.000000000 +0200
@@ -312,7 +312,7 @@
 					}
 					$db->sql_freeresult($result);
 
-					$s_hidden_fields = '<input type="hidden" name="field_id" value="' . $field_id . '" />';
+					$s_hidden_fields = '<input type="hidden" name="field_id" value="' . $field_id . '">';
 				}
 				else
 				{
@@ -346,7 +346,7 @@
 						'lang_default_value'=> '')
 					);
 
-					$s_hidden_fields = '<input type="hidden" name="field_type" value="' . $field_type . '" />';
+					$s_hidden_fields = '<input type="hidden" name="field_type" value="' . $field_type . '">';
 				}
 
 				// $exclude contains the data we gather in each step
@@ -558,7 +558,7 @@
 				$template->assign_vars(array(
 					'S_EDIT'			=> true,
 					'S_EDIT_MODE'		=> ($action == 'edit') ? true : false,
-					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'L_TITLE'			=> $user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)],
 					'L_EXPLAIN'			=> $user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)],
@@ -740,7 +740,7 @@
 			$lang_options[1]['lang_iso'] = $this->lang_defs['id'][$default_lang_id];
 			$lang_options[1]['fields'][$field] = array(
 				'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
-				'FIELD'		=> '<dd>' . ((is_array($cp->vars[$field])) ? implode('<br />', $cp->vars[$field]) : bbcode_nl2br($cp->vars[$field])) . '</dd>'
+				'FIELD'		=> '<dd>' . ((is_array($cp->vars[$field])) ? implode('<br>', $cp->vars[$field]) : bbcode_nl2br($cp->vars[$field])) . '</dd>'
 			);
 
 			if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
@@ -766,8 +766,8 @@
 							$lang_options[$lang_id]['fields'][$field] = array(
 								'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
 								'FIELD'		=> '
-											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][0])) ? $value[$lang_id][0] : $var[0]) . '" /> ' . $user->lang['FIRST_OPTION'] . '</dd>
-											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][1])) ? $value[$lang_id][1] : $var[1]) . '" /> ' . $user->lang['SECOND_OPTION'] . '</dd>'
+											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][0])) ? $value[$lang_id][0] : $var[0]) . '"> ' . $user->lang['FIRST_OPTION'] . '</dd>
+											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][1])) ? $value[$lang_id][1] : $var[1]) . '"> ' . $user->lang['SECOND_OPTION'] . '</dd>'
 							);
 						break;
 
@@ -791,7 +791,7 @@
 
 					$lang_options[$lang_id]['fields'][$field] = array(
 						'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
-						'FIELD'		=> ($field_type == 'string') ? '<dd><input class="medium" type="text" name="l_' . $field . '[' . $lang_id . ']" value="' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '" /></dd>' : '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="3" cols="80">' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '</textarea></dd>'
+						'FIELD'		=> ($field_type == 'string') ? '<dd><input class="medium" type="text" name="l_' . $field . '[' . $lang_id . ']" value="' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '"></dd>' : '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="3" cols="80">' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '</textarea></dd>'
 					);
 
 					if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_prune.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_prune.php
--- phpbb-3.1.0-RC4/includes/acp/acp_prune.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_prune.php	2014-09-21 12:00:00.000000000 +0200
@@ -205,7 +205,7 @@
 			do
 			{
 				$forum_list .= (($forum_list != '') ? ', ' : '') . '<b>' . $row['forum_name'] . '</b>';
-				$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '" />';
+				$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '">';
 			}
 			while ($row = $db->sql_fetchrow($result));
 
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_reasons.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_reasons.php
--- phpbb-3.1.0-RC4/includes/acp/acp_reasons.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_reasons.php	2014-09-21 12:00:00.000000000 +0200
@@ -172,7 +172,7 @@
 					'L_TITLE'		=> $user->lang['REASON_' . $l_title],
 					'U_ACTION'		=> $this->u_action . "&amp;id=$reason_id&amp;action=$action",
 					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'REASON_TITLE'			=> $reason_row['reason_title'],
 					'REASON_DESCRIPTION'	=> $reason_row['reason_description'],
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_search.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_search.php
--- phpbb-3.1.0-RC4/includes/acp/acp_search.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_search.php	2014-09-21 12:00:00.000000000 +0200
@@ -163,7 +163,7 @@
 							{
 								add_log('admin', 'LOG_CONFIG_SEARCH');
 							}
-							$extra_message = '<br />' . $user->lang['SWITCHED_SEARCH_BACKEND'] . '<br /><a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=search&amp;mode=index') . '">&raquo; ' . $user->lang['GO_TO_SEARCH_INDEX'] . '</a>';
+							$extra_message = '<br>' . $user->lang['SWITCHED_SEARCH_BACKEND'] . '<br><a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=search&amp;mode=index') . '">&raquo; ' . $user->lang['GO_TO_SEARCH_INDEX'] . '</a>';
 						}
 						else
 						{
@@ -547,10 +547,8 @@
 
 	function close_popup_js()
 	{
-		return "<script type=\"text/javascript\">\n" .
-			"// <![CDATA[\n" .
+		return "<script>\n" .
 			"	close_waitscreen = 1;\n" .
-			"// ]]>\n" .
 			"</script>\n";
 	}
 
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_styles.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_styles.php
--- phpbb-3.1.0-RC4/includes/acp/acp_styles.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_styles.php	2014-09-21 12:00:00.000000000 +0200
@@ -208,9 +208,9 @@
 		{
 			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		$message = implode('<br />', $messages);
-		$message .= '<br /><br /><a href="' . $this->u_base_action . '&amp;mode=style' . '">&laquo; ' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES') . '</a>';
-		$message .= '<br /><br /><a href="' . $this->u_base_action . '&amp;mode=install' . '">&raquo; ' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES') . '</a>';
+		$message = implode('<br>', $messages);
+		$message .= '<br><br><a href="' . $this->u_base_action . '&amp;mode=style' . '">&laquo; ' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES') . '</a>';
+		$message .= '<br><br><a href="' . $this->u_base_action . '&amp;mode=install' . '">&raquo; ' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES') . '</a>';
 		trigger_error($message, E_USER_NOTICE);
 	}
 
@@ -316,7 +316,7 @@
 		$this->cache->purge();
 
 		// Show message
-		trigger_error(implode('<br />', $messages) . adm_back_link($this->u_action), E_USER_NOTICE);
+		trigger_error(implode('<br>', $messages) . adm_back_link($this->u_action), E_USER_NOTICE);
 	}
 
 	/**
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_users.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_users.php
--- phpbb-3.1.0-RC4/includes/acp/acp_users.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_users.php	2014-09-21 12:00:00.000000000 +0200
@@ -1308,7 +1308,7 @@
 							}
 							else if (!empty($log_data_ary))
 							{
-								$row['action'] .= '<br />' . implode('', $log_data_ary);
+								$row['action'] .= '<br>' . implode('', $log_data_ary);
 							}
 						}
 					}
@@ -1823,8 +1823,8 @@
 
 				$template->assign_vars(array(
 					'S_AVATAR'	=> true,
-					'ERROR'			=> (!empty($error)) ? implode('<br />', $error) : '',
-					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
+					'ERROR'			=> (!empty($error)) ? implode('<br>', $error) : '',
+					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="">' : $avatar),
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
@@ -1903,7 +1903,7 @@
 
 					if (sizeof($message_parser->warn_msg))
 					{
-						$error[] = implode('<br />', $message_parser->warn_msg);
+						$error[] = implode('<br>', $message_parser->warn_msg);
 					}
 
 					if (!check_form_key($form_name))
@@ -2416,7 +2416,7 @@
 		// Assign general variables
 		$template->assign_vars(array(
 			'S_ERROR'			=> (sizeof($error)) ? true : false,
-			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '')
+			'ERROR_MSG'			=> (sizeof($error)) ? implode('<br>', $error) : '')
 		);
 	}
 
diff -Naur phpbb-3.1.0-RC4/includes/acp/acp_words.php phpbb-3.1.0-RC4-HTML5/includes/acp/acp_words.php
--- phpbb-3.1.0-RC4/includes/acp/acp_words.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/acp/acp_words.php	2014-09-21 12:00:00.000000000 +0200
@@ -64,7 +64,7 @@
 				$word_info = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
-				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '" />';
+				$s_hidden_fields .= '<input type="hidden" name="id" value="' . $word_id . '">';
 
 			case 'add':
 
diff -Naur phpbb-3.1.0-RC4/includes/bbcode.php phpbb-3.1.0-RC4-HTML5/includes/bbcode.php
--- phpbb-3.1.0-RC4/includes/bbcode.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/bbcode.php	2014-09-21 12:00:00.000000000 +0200
@@ -172,7 +172,7 @@
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				// To circumvent replacing newlines with <br /> for the generated html,
+				// To circumvent replacing newlines with <br> for the generated html,
 				// we use carriage returns here. They are later changed back to newlines
 				$row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']);
 				$row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']);
@@ -407,7 +407,7 @@
 				'i_close'	=> '</span>',
 				'u_open'	=> '<span style="text-decoration: underline">',
 				'u_close'	=> '</span>',
-				'img'		=> '<img src="$1" class="postimage" alt="' . $user->lang['IMAGE'] . '" />',
+				'img'		=> '<img src="$1" class="postimage" alt="' . $user->lang['IMAGE'] . '">',
 				'size'		=> '<span style="font-size: $1%; line-height: normal">$2</span>',
 				'color'		=> '<span style="color: $1">$2</span>',
 				'email'		=> '<a href="mailto:$1">$2</a>'
@@ -562,7 +562,7 @@
 		{
 			case 'php':
 				// Not the english way, but valid because of hardcoded syntax highlighting
-				if (strpos($code, '<span class="syntaxdefault"><br /></span>') === 0)
+				if (strpos($code, '<span class="syntaxdefault"><br></span>') === 0)
 				{
 					$code = substr($code, 41);
 				}
diff -Naur phpbb-3.1.0-RC4/includes/diff/renderer.php phpbb-3.1.0-RC4-HTML5/includes/diff/renderer.php
--- phpbb-3.1.0-RC4/includes/diff/renderer.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/diff/renderer.php	2014-09-21 12:00:00.000000000 +0200
@@ -322,17 +322,17 @@
 
 	function _context($lines)
 	{
-		return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '<br /></pre>';
+		return '<pre class="diff context">' . htmlspecialchars($this->_lines($lines, ' ')) . '<br></pre>';
 	}
 
 	function _added($lines)
 	{
-		return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '<br /></pre>';
+		return '<pre class="diff added">' . htmlspecialchars($this->_lines($lines, '+')) . '<br></pre>';
 	}
 
 	function _deleted($lines)
 	{
-		return '<pre class="diff removed">' . htmlspecialchars($this->_lines($lines, '-')) . '<br /></pre>';
+		return '<pre class="diff removed">' . htmlspecialchars($this->_lines($lines, '-')) . '<br></pre>';
 	}
 
 	function _changed($orig, $final)
@@ -389,7 +389,7 @@
 	*/
 	function get_diff_content($diff)
 	{
-		return '<pre>' . nl2br($this->render($diff)) . '<br /></pre>';
+		return '<pre>' . nl2br($this->render($diff)) . '<br></pre>';
 	}
 
 	function _start_diff()
@@ -638,8 +638,8 @@
 						$line = $current_context;
 						$current_context = '';
 
-						$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>
-							<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
+						$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td>
+							<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td></tr>';
 					}
 
 					switch ($change['type'])
@@ -649,10 +649,10 @@
 
 							foreach ($change['lines'] as $_line)
 							{
-								$line .= htmlspecialchars($_line) . '<br />';
+								$line .= htmlspecialchars($_line) . '<br>';
 							}
 
-							$output .= '<tr><td class="added_empty">&nbsp;</td><td class="added"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
+							$output .= '<tr><td class="added_empty">&nbsp;</td><td class="added"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td></tr>';
 						break;
 
 						case 'remove':
@@ -660,14 +660,14 @@
 
 							foreach ($change['lines'] as $_line)
 							{
-								$line .= htmlspecialchars($_line) . '<br />';
+								$line .= htmlspecialchars($_line) . '<br>';
 							}
 
-							$output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td><td class="removed_empty">&nbsp;</td></tr>';
+							$output .= '<tr><td class="removed"><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td><td class="removed_empty">&nbsp;</td></tr>';
 						break;
 
 						case 'empty':
-							$current_context .= htmlspecialchars($change['line']) . '<br />';
+							$current_context .= htmlspecialchars($change['line']) . '<br>';
 						break;
 
 						case 'change':
@@ -679,16 +679,16 @@
 							for ($row = 0, $row_max = max($oldsize, $newsize); $row < $row_max; ++$row)
 							{
 								$left .= isset($change['old'][$row]) ? htmlspecialchars($change['old'][$row]) : '';
-								$left .= '<br />';
+								$left .= '<br>';
 								$right .= isset($change['new'][$row]) ? htmlspecialchars($change['new'][$row]) : '';
-								$right .= '<br />';
+								$right .= '<br>';
 							}
 
 							$output .= '<tr>';
 
 							if (!empty($left))
 							{
-								$output .= '<td class="modified"><pre>' . $left . '<br /></pre></td>';
+								$output .= '<td class="modified"><pre>' . $left . '<br></pre></td>';
 							}
 							else if ($row < $oldsize)
 							{
@@ -701,7 +701,7 @@
 
 							if (!empty($right))
 							{
-								$output .= '<td class="modified"><pre>' . $right . '<br /></pre></td>';
+								$output .= '<td class="modified"><pre>' . $right . '<br></pre></td>';
 							}
 							else if ($row < $newsize)
 							{
@@ -722,8 +722,8 @@
 					$line = $current_context;
 					$current_context = '';
 
-					$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td>';
-					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br /></pre></td></tr>';
+					$output .= '<tr class="unmodified"><td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td>';
+					$output .= '<td><pre>' . ((strlen($line)) ? $line : '&nbsp;') . '<br></pre></td></tr>';
 				}
 			}
 		}
diff -Naur phpbb-3.1.0-RC4/includes/functions.php phpbb-3.1.0-RC4-HTML5/includes/functions.php
--- phpbb-3.1.0-RC4/includes/functions.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions.php	2014-09-21 12:00:00.000000000 +0200
@@ -2325,7 +2325,7 @@
 		echo '<html dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '">';
 		echo '<head>';
 		echo '<meta charset="utf-8">';
-		echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&amp;', $url) . '" />';
+		echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&amp;', $url) . '">';
 		echo '<title>' . $user->lang['REDIRECT'] . '</title>';
 		echo '</head>';
 		echo '<body>';
@@ -2438,7 +2438,7 @@
 		$url = str_replace('&', '&amp;', $url);
 
 		$template->assign_vars(array(
-			'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />')
+			'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '">')
 		);
 	}
 
@@ -3070,7 +3070,7 @@
 		$value = ($stripslashes) ? stripslashes($value) : $value;
 		$value = ($specialchar) ? htmlspecialchars($value, ENT_COMPAT, 'UTF-8') : $value;
 
-		$hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . $value . '" />' . "\n";
+		$hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . $value . '">' . "\n";
 	}
 	else
 	{
@@ -3246,12 +3246,12 @@
 		$trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
 		$trace['type'] = (!isset($trace['type'])) ? '' : $trace['type'];
 
-		$output .= '<br />';
-		$output .= '<b>FILE:</b> ' . $trace['file'] . '<br />';
-		$output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br />';
+		$output .= '<br>';
+		$output .= '<b>FILE:</b> ' . $trace['file'] . '<br>';
+		$output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br>';
 
 		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']);
-		$output .= '(' . (($argument !== '') ? "'$argument'" : '') . ')<br />';
+		$output .= '(' . (($argument !== '') ? "'$argument'" : '') . ')<br>';
 	}
 	$output .= '</div>';
 	return $output;
@@ -3277,7 +3277,7 @@
 				'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
 				'#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
 				'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
-				'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
+				'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*?\s?\/?><!\-\- s\1 \-\->#',
 				'#<!\-\- .*? \-\->#s',
 				'#<.*?>#s',
 			);
@@ -3804,14 +3804,14 @@
 				$errfile = phpbb_filter_root_path($errfile);
 				$msg_text = phpbb_filter_root_path($msg_text);
 				$error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice';
-				echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
+				echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br>' . "\n";
 
 				// we are writing an image - the user won't see the debug, so let's place it in the log
 				if (defined('IMAGE_OUTPUT') || defined('IN_CRON'))
 				{
 					add_log('critical', 'LOG_IMAGE_GENERATION_ERROR', $errfile, $errline, $msg_text);
 				}
-				// echo '<br /><br />BACKTRACE<br />' . get_backtrace() . '<br />' . "\n";
+				// echo '<br><br>BACKTRACE<br>' . get_backtrace() . '<br>' . "\n";
 			}
 
 			return;
@@ -3849,7 +3849,7 @@
 			$backtrace = get_backtrace();
 			if ($backtrace)
 			{
-				$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
+				$log_text .= '<br><br>BACKTRACE<br>' . $backtrace;
 			}
 
 			if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_'))
@@ -3887,14 +3887,13 @@
 			echo '<head>';
 			echo '<meta charset="utf-8">';
 			echo '<title>' . $msg_title . '</title>';
-			echo '<style type="text/css">' . "\n" . '/* <![CDATA[ */' . "\n";
+			echo '<style>';
 			echo '* { margin: 0; padding: 0; } html { font-size: 100%; height: 100%; margin-bottom: 1px; background-color: #E4EDF0; } body { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; color: #536482; background: #E4EDF0; font-size: 62.5%; margin: 0; } ';
 			echo 'a:link, a:active, a:visited { color: #006699; text-decoration: none; } a:hover { color: #DD6900; text-decoration: underline; } ';
 			echo '#wrap { padding: 0 20px 15px 20px; min-width: 615px; } #page-header { text-align: right; height: 40px; } #page-footer { clear: both; font-size: 1em; text-align: center; } ';
 			echo '.panel { margin: 4px 0; background-color: #FFFFFF; border: solid 1px  #A9B8C2; } ';
 			echo '#errorpage #page-header a { font-weight: bold; line-height: 6em; } #errorpage #content { padding: 10px; } #errorpage #content h1 { line-height: 1.2em; margin-bottom: 0; color: #DF075C; } ';
 			echo '#errorpage #content div { margin-top: 20px; margin-bottom: 5px; border-bottom: 1px solid #CCCCCC; padding-bottom: 5px; color: #333333; font: bold 1.2em "Lucida Grande", Arial, Helvetica, sans-serif; text-decoration: none; line-height: 120%; text-align: left; } ';
-			echo "\n" . '/* ]]> */' . "\n";
 			echo '</style>';
 			echo '</head>';
 			echo '<body id="errorpage">';
@@ -4629,7 +4628,7 @@
 		if ($value === $get_value)
 		{
 			$escaped_value = phpbb_quoteattr($value);
-			$hidden .= "<input type='hidden' name=$escaped_name value=$escaped_value />";
+			$hidden .= "<input type='hidden' name=$escaped_name value=$escaped_value>";
 		}
 	}
 	return $hidden;
@@ -4715,7 +4714,7 @@
 		$html = '<img src="' . $avatar_data['src'] . '" ' .
 			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
 			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '">';
 	}
 
 	return $html;
@@ -5251,7 +5250,7 @@
 		if ($task)
 		{
 			$url = $task->get_url();
-			$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
+			$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron">');
 		}
 		else
 		{
diff -Naur phpbb-3.1.0-RC4/includes/functions_acp.php phpbb-3.1.0-RC4-HTML5/includes/functions_acp.php
--- phpbb-3.1.0-RC4/includes/functions_acp.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_acp.php	2014-09-21 12:00:00.000000000 +0200
@@ -89,16 +89,16 @@
 
 		'T_ASSETS_VERSION'		=> $config['assets_version'],
 
-		'ICON_MOVE_UP'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_DOWN'			=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_EDIT'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_EDIT_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_DELETE'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_DELETE_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_SYNC'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
-		'ICON_SYNC_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_MOVE_UP'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '">',
+		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '">',
+		'ICON_MOVE_DOWN'			=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '">',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '">',
+		'ICON_EDIT'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '">',
+		'ICON_EDIT_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '">',
+		'ICON_DELETE'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '">',
+		'ICON_DELETE_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '">',
+		'ICON_SYNC'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '">',
+		'ICON_SYNC_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '">',
 
 		'S_USER_LANG'			=> $user->lang['USER_LANG'],
 		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
@@ -189,7 +189,7 @@
 function adm_back_link($u_action)
 {
 	global $user;
-	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>';
+	return '<br><br><a href="' . $u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>';
 }
 
 /**
@@ -221,7 +221,7 @@
 	foreach ($input_ary as $value => $title)
 	{
 		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
-		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator;
+		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio"> ' . $user->lang[$title] . '</label>' . $separator;
 		$id_assigned = true;
 	}
 
@@ -263,7 +263,7 @@
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
+			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . '>';
 		break;
 
 		case 'number':
@@ -275,7 +275,7 @@
 				$maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (( $maxlength != '' ) ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="' . $name . '" value="' . $new[$config_key] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (( $maxlength != '' ) ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="' . $name . '" value="' . $new[$config_key] . '">';
 		break;
 
 		case 'dimension':
@@ -289,7 +289,7 @@
 				$size = $maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '"> x <input type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '">';
 		break;
 
 		case 'textarea':
@@ -306,8 +306,8 @@
 			$tpl_type_cond = explode('_', $tpl_type[1]);
 			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
 
-			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']) . '</label>';
-			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']) . '</label>';
+			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio"> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']) . '</label>';
+			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio"> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']) . '</label>';
 
 			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes;
 		break;
diff -Naur phpbb-3.1.0-RC4/includes/functions_content.php phpbb-3.1.0-RC4-HTML5/includes/functions_content.php
--- phpbb-3.1.0-RC4/includes/functions_content.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_content.php	2014-09-21 12:00:00.000000000 +0200
@@ -396,12 +396,12 @@
 
 	if ($bbcode_uid)
 	{
-		$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
+		$match = array('<br>', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
 		$replace = array("\n", '', '', '', '');
 	}
 	else
 	{
-		$match = array('<br />');
+		$match = array('<br>');
 		$replace = array("\n");
 	}
 
@@ -873,8 +873,8 @@
 function bbcode_nl2br($text)
 {
 	// custom BBCodes might contain carriage returns so they
-	// are not converted into <br /> so now revert that
-	$text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text);
+	// are not converted into <br> so now revert that
+	$text = str_replace(array("\n", "\r"), array('<br>', "\n"), $text);
 	return $text;
 }
 
@@ -887,12 +887,12 @@
 
 	if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies'))
 	{
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text);
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*?\s?\/?><!\-\- s\1 \-\->#', '\1', $text);
 	}
 	else
 	{
 		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path();
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?)\s?\/?><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2>', $text);
 	}
 }
 
@@ -1013,7 +1013,7 @@
 			}
 			else if ($extensions[$attachment['extension']]['upload_icon'])
 			{
-				$upload_icon = '<img src="' . $phpbb_root_path . $config['upload_icons_path'] . '/' . trim($extensions[$attachment['extension']]['upload_icon']) . '" alt="" />';
+				$upload_icon = '<img src="' . $phpbb_root_path . $config['upload_icons_path'] . '/' . trim($extensions[$attachment['extension']]['upload_icon']) . '" alt="">';
 			}
 		}
 
diff -Naur phpbb-3.1.0-RC4/includes/functions_convert.php phpbb-3.1.0-RC4-HTML5/includes/functions_convert.php
--- phpbb-3.1.0-RC4/includes/functions_convert.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_convert.php	2014-09-21 12:00:00.000000000 +0200
@@ -2467,7 +2467,7 @@
 	{
 		$str = (sizeof($bad_dirs) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE'];
 		sort($bad_dirs);
-		$convert->p_master->error(sprintf($str, implode('<br />', $bad_dirs)), __LINE__, __FILE__);
+		$convert->p_master->error(sprintf($str, implode('<br>', $bad_dirs)), __LINE__, __FILE__);
 	}
 
 	for ($i = 0; $i < sizeof($filelist); ++$i)
diff -Naur phpbb-3.1.0-RC4/includes/functions_display.php phpbb-3.1.0-RC4-HTML5/includes/functions_display.php
--- phpbb-3.1.0-RC4/includes/functions_display.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_display.php	2014-09-21 12:00:00.000000000 +0200
@@ -80,7 +80,7 @@
 			}
 
 			trigger_error(
-				$user->lang['FORUMS_MARKED'] . '<br /><br />' .
+				$user->lang['FORUMS_MARKED'] . '<br><br>' .
 				sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
 			);
 		}
@@ -354,7 +354,7 @@
 				$json_response->send($data);
 			}
 
-			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
+			trigger_error($user->lang['FORUMS_MARKED'] . '<br><br>' . $message);
 		}
 		else
 		{
@@ -389,7 +389,7 @@
 				'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
 				'FORUM_FOLDER_IMG'		=> '',
 				'FORUM_FOLDER_IMG_SRC'	=> '',
-				'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['FORUM_CAT'] . '" />' : '',
+				'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['FORUM_CAT'] . '">' : '',
 				'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 				'U_VIEWFORUM'			=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']),
 			);
@@ -572,7 +572,7 @@
 			'FORUM_IMG_STYLE'		=> $folder_image,
 			'FORUM_FOLDER_IMG'		=> $user->img($folder_image, $folder_alt),
 			'FORUM_FOLDER_IMG_ALT'	=> isset($user->lang[$folder_alt]) ? $user->lang[$folder_alt] : '',
-			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',
+			'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '">' : '',
 			'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 			'LAST_POST_SUBJECT'		=> (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? censor_text($last_post_subject) : "",
 			'LAST_POST_SUBJECT_TRUNCATED'	=> (!$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? $last_post_subject_truncated : "",
@@ -1255,7 +1255,7 @@
 
 						if (!$request->is_ajax())
 						{
-							$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+							$message .= '<br><br>' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
 						}
 						trigger_error($message);
 					}
@@ -1270,7 +1270,7 @@
 
 					if (!$request->is_ajax())
 					{
-						$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br><br>' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
 					}
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
@@ -1329,7 +1329,7 @@
 
 						if (!$request->is_ajax())
 						{
-							$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+							$message .= '<br><br>' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
 						}
 						trigger_error($message);
 					}
@@ -1345,7 +1345,7 @@
 
 					if (!$request->is_ajax())
 					{
-						$message .= '<br /><br />' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br><br>' . $user->lang('RETURN_' . strtoupper($mode), '<a href="' . $redirect_url . '">', '</a>');
 					}
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
@@ -1424,7 +1424,7 @@
 	{
 		$rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : '';
 		$rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $phpbb_path_helper->update_web_root_path($phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image']) : '';
-		$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $rank_img_src . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '" />' : '';
+		$rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '<img src="' . $rank_img_src . '" alt="' . $ranks['special'][$user_rank]['rank_title'] . '" title="' . $ranks['special'][$user_rank]['rank_title'] . '">' : '';
 	}
 	else if ($user_posts !== false)
 	{
@@ -1436,7 +1436,7 @@
 				{
 					$rank_title = $rank['rank_title'];
 					$rank_img_src = (!empty($rank['rank_image'])) ? $phpbb_path_helper->update_web_root_path($phpbb_root_path . $config['ranks_path'] . '/' . $rank['rank_image']) : '';
-					$rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $rank_img_src . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" />' : '';
+					$rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $rank_img_src . '" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '">' : '';
 					break;
 				}
 			}
diff -Naur phpbb-3.1.0-RC4/includes/functions_download.php phpbb-3.1.0-RC4-HTML5/includes/functions_download.php
--- phpbb-3.1.0-RC4/includes/functions_download.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_download.php	2014-09-21 12:00:00.000000000 +0200
@@ -112,7 +112,7 @@
 	echo '</head>';
 	echo '<body>';
 	echo '<div>';
-	echo '<img src="' . $src . '" alt="' . $title . '" />';
+	echo '<img src="' . $src . '" alt="' . $title . '">';
 	echo '</div>';
 	echo '</body>';
 	echo '</html>';
@@ -157,7 +157,7 @@
 		if (!empty($php_errormsg))
 		{
 			send_status_line(500, 'Internal Server Error');
-			trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '<br />' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg));
+			trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '<br>' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg));
 		}
 
 		send_status_line(500, 'Internal Server Error');
diff -Naur phpbb-3.1.0-RC4/includes/functions_install.php phpbb-3.1.0-RC4-HTML5/includes/functions_install.php
--- phpbb-3.1.0-RC4/includes/functions_install.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_install.php	2014-09-21 12:00:00.000000000 +0200
@@ -266,7 +266,7 @@
 	if (is_array($db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true)))
 	{
 		$db_error = $db->sql_error();
-		$error[] = $lang['INST_ERR_DB_CONNECT'] . '<br />' . (($db_error['message']) ? utf8_convert_message($db_error['message']) : $lang['INST_ERR_DB_NO_ERROR']);
+		$error[] = $lang['INST_ERR_DB_CONNECT'] . '<br>' . (($db_error['message']) ? utf8_convert_message($db_error['message']) : $lang['INST_ERR_DB_NO_ERROR']);
 	}
 	else
 	{
diff -Naur phpbb-3.1.0-RC4/includes/functions_jabber.php phpbb-3.1.0-RC4-HTML5/includes/functions_jabber.php
--- phpbb-3.1.0-RC4/includes/functions_jabber.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_jabber.php	2014-09-21 12:00:00.000000000 +0200
@@ -263,7 +263,7 @@
 	{
 		if ($this->enable_logging && sizeof($this->log_array))
 		{
-			return implode("<br /><br />", $this->log_array);
+			return implode("<br><br>", $this->log_array);
 		}
 
 		return '';
diff -Naur phpbb-3.1.0-RC4/includes/functions_messenger.php phpbb-3.1.0-RC4-HTML5/includes/functions_messenger.php
--- phpbb-3.1.0-RC4/includes/functions_messenger.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_messenger.php	2014-09-21 12:00:00.000000000 +0200
@@ -296,7 +296,7 @@
 		// We add some standard variables we always use, no need to specify them always
 		$this->assign_vars(array(
 			'U_BOARD'	=> generate_board_url(),
-			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
+			'EMAIL_SIG'	=> str_replace('<br>', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
 			'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
 		));
 
@@ -377,7 +377,7 @@
 			break;
 		}
 
-		$message .= '<br /><em>' . htmlspecialchars($calling_page) . '</em><br /><br />' . $msg . '<br />';
+		$message .= '<br><em>' . htmlspecialchars($calling_page) . '</em><br><br>' . $msg . '<br>';
 		add_log('critical', 'LOG_ERROR_' . $type, $message);
 	}
 
@@ -595,13 +595,13 @@
 
 			if (!$this->jabber->connect())
 			{
-				$this->error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '<br />' . $this->jabber->get_log());
+				$this->error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '<br>' . $this->jabber->get_log());
 				return false;
 			}
 
 			if (!$this->jabber->login())
 			{
-				$this->error('JABBER', $user->lang['ERR_JAB_AUTH'] . '<br />' . $this->jabber->get_log());
+				$this->error('JABBER', $user->lang['ERR_JAB_AUTH'] . '<br>' . $this->jabber->get_log());
 				return false;
 			}
 
@@ -1012,7 +1012,7 @@
 		}
 
 		$err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr";
-		$err_msg .= ($error_contents) ? '<br /><br />' . htmlspecialchars($error_contents) : '';
+		$err_msg .= ($error_contents) ? '<br><br>' . htmlspecialchars($error_contents) : '';
 		return false;
 	}
 
@@ -1074,7 +1074,7 @@
 	if (!$rcpt)
 	{
 		$user->session_begin();
-		$err_msg .= '<br /><br />';
+		$err_msg .= '<br><br>';
 		$err_msg .= (isset($user->lang['INVALID_EMAIL_LOG'])) ? sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address)) : '<strong>' . htmlspecialchars($mail_to_address) . '</strong> possibly an invalid email address?';
 		$smtp->close_session($err_msg);
 		return false;
@@ -1215,7 +1215,7 @@
 
 		if ($this->backtrace)
 		{
-			$message = '<h1>Backtrace</h1><p>' . implode('<br />', $this->backtrace_log) . '</p>';
+			$message = '<h1>Backtrace</h1><p>' . implode('<br>', $this->backtrace_log) . '</p>';
 			$err_msg .= $message;
 		}
 	}
diff -Naur phpbb-3.1.0-RC4/includes/functions_posting.php phpbb-3.1.0-RC4-HTML5/includes/functions_posting.php
--- phpbb-3.1.0-RC4/includes/functions_posting.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_posting.php	2014-09-21 12:00:00.000000000 +0200
@@ -875,7 +875,7 @@
 
 			foreach ($attach_row as $key => $value)
 			{
-				$hidden .= '<input type="hidden" name="attachment_data[' . $count . '][' . $key . ']" value="' . $value . '" />';
+				$hidden .= '<input type="hidden" name="attachment_data[' . $count . '][' . $key . ']" value="' . $value . '">';
 			}
 
 			$download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&amp;id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false);
@@ -2590,14 +2590,14 @@
 
 				if (!$request->is_ajax())
 				{
-					$message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $meta_info . '">', '</a>');
+					$message .= '<br><br>' . $user->lang('RETURN_TOPIC', '<a href="' . $meta_info . '">', '</a>');
 				}
 			}
 
 			meta_refresh(3, $meta_info);
 			if (!$request->is_ajax())
 			{
-				$message .= '<br /><br />' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
+				$message .= '<br><br>' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
 			}
 			trigger_error($message);
 		}
diff -Naur phpbb-3.1.0-RC4/includes/functions_privmsgs.php phpbb-3.1.0-RC4-HTML5/includes/functions_privmsgs.php
--- phpbb-3.1.0-RC4/includes/functions_privmsgs.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/functions_privmsgs.php	2014-09-21 12:00:00.000000000 +0200
@@ -808,7 +808,7 @@
 
 			if ($message_limit && $row['pm_count'] + sizeof($move_msg_ids) > $message_limit)
 			{
-				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $row['folder_name']) . '<br /><br />';
+				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $row['folder_name']) . '<br><br>';
 				$message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $row['folder_id']) . '">', '</a>', $row['folder_name']);
 				trigger_error($message);
 			}
@@ -825,7 +825,7 @@
 
 			if ($message_limit && $num_messages + sizeof($move_msg_ids) > $message_limit)
 			{
-				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $user->lang['PM_INBOX']) . '<br /><br />';
+				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $user->lang['PM_INBOX']) . '<br><br>';
 				$message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox') . '">', '</a>', $user->lang['PM_INBOX']);
 				trigger_error($message);
 			}
@@ -960,7 +960,7 @@
 				$redirect = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $cur_folder_id);
 
 				meta_refresh(3, $redirect);
-				trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $redirect . '">', '</a>'));
+				trigger_error($user->lang[$success_msg] . '<br><br>' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $redirect . '">', '</a>'));
 			}
 			else
 			{
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_ban.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_ban.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_ban.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_ban.php	2014-09-21 12:00:00.000000000 +0200
@@ -63,7 +63,7 @@
 				{
 					user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
 
-					trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
+					trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br><br><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
 				}
 				else
 				{
@@ -89,7 +89,7 @@
 				{
 					user_unban($mode, $ban);
 
-					trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
+					trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br><br><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
 				}
 				else
 				{
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_forum.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_forum.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_forum.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_forum.php	2014-09-21 12:00:00.000000000 +0200
@@ -355,7 +355,7 @@
 	$redirect = request_var('redirect', $user->data['session_page']);
 
 	meta_refresh(3, $redirect);
-	trigger_error($msg . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+	trigger_error($msg . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
 
 	return;
 }
@@ -468,12 +468,12 @@
 		sync('forum', 'forum_id', $sync_forums, true, true);
 
 		// Link to the new topic
-		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
+		$return_link .= (($return_link) ? '<br><br>' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
 		$redirect = reapply_sid($redirect);
 
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+		trigger_error($user->lang[$success_msg] . '<br><br>' . $return_link);
 	}
 	else
 	{
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_main.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_main.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_main.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_main.php	2014-09-21 12:00:00.000000000 +0200
@@ -304,7 +304,7 @@
 
 		if (!$request->is_ajax())
 		{
-			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 		}
 		trigger_error($message);
 	}
@@ -405,7 +405,7 @@
 
 		if (!$request->is_ajax())
 		{
-			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 		}
 		trigger_error($message);
 	}
@@ -666,9 +666,9 @@
 		meta_refresh(3, $redirect);
 
 		$message = $user->lang[$success_msg];
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>');
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id") . '">', '</a>');
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$to_forum_id") . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id") . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$to_forum_id") . '">', '</a>');
 
 		trigger_error($message);
 	}
@@ -743,7 +743,7 @@
 	else
 	{
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
+		trigger_error($user->lang[$success_msg] . '<br><br>' . sprintf($user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
 	}
 }
 
@@ -871,7 +871,7 @@
 	else
 	{
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
+		trigger_error($user->lang[$success_msg] . '<br><br>' . sprintf($user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
 	}
 }
 
@@ -1035,7 +1035,7 @@
 			if ($deleted_topics)
 			{
 				// Some of topics disappeared
-				$success_msg = $user->lang['POSTS_DELETED_SUCCESS'] . '<br /><br />' . $user->lang['EMPTY_TOPICS_REMOVED_WARNING'];
+				$success_msg = $user->lang['POSTS_DELETED_SUCCESS'] . '<br><br>' . $user->lang['EMPTY_TOPICS_REMOVED_WARNING'];
 			}
 			else
 			{
@@ -1097,7 +1097,7 @@
 		}
 
 		meta_refresh(3, $redirect);
-		trigger_error($success_msg . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . '<br /><br />' . implode('<br /><br />', $return_link));
+		trigger_error($success_msg . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . '<br><br>' . implode('<br><br>', $return_link));
 	}
 }
 
@@ -1495,9 +1495,9 @@
 
 		if ($forum_id != $to_forum_id)
 		{
-			$return_link .= '<br /><br />' . sprintf($user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $to_forum_id) . '">', '</a>');
+			$return_link .= '<br><br>' . sprintf($user->lang['RETURN_NEW_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $to_forum_id) . '">', '</a>');
 		}
 
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+		trigger_error($user->lang[$success_msg] . '<br><br>' . $return_link);
 	}
 }
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_notes.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_notes.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_notes.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_notes.php	2014-09-21 12:00:00.000000000 +0200
@@ -152,7 +152,7 @@
 				}
 				$redirect = $this->u_action . '&amp;u=' . $user_id;
 				meta_refresh(3, $redirect);
-				trigger_error($user->lang[$msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+				trigger_error($user->lang[$msg] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
 			}
 		}
 
@@ -173,7 +173,7 @@
 			$redirect = $this->u_action;
 			meta_refresh(3, $redirect);
 
-			trigger_error($msg .  '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+			trigger_error($msg .  '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
 		}
 
 		// Generate the appropriate user information for the user we are looking at
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_queue.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_queue.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_queue.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_queue.php	2014-09-21 12:00:00.000000000 +0200
@@ -777,12 +777,12 @@
 					'visible'			=> true,
 				));
 			}
-			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 
 			// If approving one post, also give links back to post...
 			if (sizeof($post_info) == 1 && $post_url)
 			{
-				$message .= '<br /><br />' . $user->lang('RETURN_POST', '<a href="' . $post_url . '">', '</a>');
+				$message .= '<br><br>' . $user->lang('RETURN_POST', '<a href="' . $post_url . '">', '</a>');
 			}
 			trigger_error($message);
 		}
@@ -958,12 +958,12 @@
 					'visible'			=> true,
 				));
 			}
-			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 
 			// If approving one topic, also give links back to topic...
 			if (sizeof($topic_info) == 1 && $topic_url)
 			{
-				$message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $topic_url . '">', '</a>');
+				$message .= '<br><br>' . $user->lang('RETURN_TOPIC', '<a href="' . $topic_url . '">', '</a>');
 			}
 			trigger_error($message);
 		}
@@ -1288,7 +1288,7 @@
 					'visible'			=> false,
 				));
 			}
-			$message .= '<br /><br />' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 			trigger_error($message);
 		}
 		else
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_reports.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_reports.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_reports.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_reports.php	2014-09-21 12:00:00.000000000 +0200
@@ -727,15 +727,15 @@
 		{
 			if (sizeof($forum_ids) === 1)
 			{
-				$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
+				$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br><br>';
 			}
 
 			if (sizeof($topic_ids) === 1)
 			{
-				$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
+				$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br><br>';
 			}
 		}
 
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
+		trigger_error($user->lang[$success_msg] . '<br><br>' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
 	}
 }
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_topic.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_topic.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_topic.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_topic.php	2014-09-21 12:00:00.000000000 +0200
@@ -566,12 +566,12 @@
 		set_config_count('num_topics', 1, true);
 
 		// Link back to both topics
-		$return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']) . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
+		$return_link = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']) . '">', '</a>') . '<br><br>' . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
 		$redirect = reapply_sid($redirect);
 
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+		trigger_error($user->lang[$success_msg] . '<br><br>' . $return_link);
 	}
 	else
 	{
@@ -681,12 +681,12 @@
 		sync('forum', 'forum_id', $sync_forums, true, true);
 
 		// Link to the new topic
-		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
+		$return_link .= (($return_link) ? '<br><br>' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 		$redirect = request_var('redirect', "{$phpbb_root_path}viewtopic.$phpEx?f=$to_forum_id&amp;t=$to_topic_id");
 		$redirect = reapply_sid($redirect);
 
 		meta_refresh(3, $redirect);
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_link);
+		trigger_error($user->lang[$success_msg] . '<br><br>' . $return_link);
 	}
 	else
 	{
diff -Naur phpbb-3.1.0-RC4/includes/mcp/mcp_warn.php phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_warn.php
--- phpbb-3.1.0-RC4/includes/mcp/mcp_warn.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/mcp/mcp_warn.php	2014-09-21 12:00:00.000000000 +0200
@@ -324,7 +324,7 @@
 			{
 				$redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&amp;mode=user_notes&amp;u=$user_id");
 				meta_refresh(2, $redirect);
-				trigger_error($message . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+				trigger_error($message . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
 			}
 		}
 
@@ -481,7 +481,7 @@
 			{
 				$redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&amp;mode=user_notes&amp;u=$user_id");
 				meta_refresh(2, $redirect);
-				trigger_error($message . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+				trigger_error($message . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
 			}
 		}
 
diff -Naur phpbb-3.1.0-RC4/includes/message_parser.php phpbb-3.1.0-RC4-HTML5/includes/message_parser.php
--- phpbb-3.1.0-RC4/includes/message_parser.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/message_parser.php	2014-09-21 12:00:00.000000000 +0200
@@ -1144,7 +1144,7 @@
 		// Maximum message length check. 0 disables this check completely.
 		if ((int) $config['max_' . $mode . '_chars'] > 0 && $message_length > (int) $config['max_' . $mode . '_chars'])
 		{
-			$this->warn_msg[] = $user->lang('CHARS_' . strtoupper($mode) . '_CONTAINS', $message_length) . '<br />' . $user->lang('TOO_MANY_CHARS_LIMIT', (int) $config['max_' . $mode . '_chars']);
+			$this->warn_msg[] = $user->lang('CHARS_' . strtoupper($mode) . '_CONTAINS', $message_length) . '<br>' . $user->lang('TOO_MANY_CHARS_LIMIT', (int) $config['max_' . $mode . '_chars']);
 			return (!$update_this_message) ? $return_message : $this->warn_msg;
 		}
 
@@ -1153,7 +1153,7 @@
 		{
 			if (!$message_length || $message_length < (int) $config['min_post_chars'])
 			{
-				$this->warn_msg[] = (!$message_length) ? $user->lang['TOO_FEW_CHARS'] : ($user->lang('CHARS_POST_CONTAINS', $message_length) . '<br />' . $user->lang('TOO_FEW_CHARS_LIMIT', (int) $config['min_post_chars']));
+				$this->warn_msg[] = (!$message_length) ? $user->lang['TOO_FEW_CHARS'] : ($user->lang('CHARS_POST_CONTAINS', $message_length) . '<br>' . $user->lang('TOO_FEW_CHARS_LIMIT', (int) $config['min_post_chars']));
 				return (!$update_this_message) ? $return_message : $this->warn_msg;
 			}
 		}
@@ -1204,7 +1204,7 @@
 		// not supported by utf8_bin in MySQL
 		if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches))
 		{
-			$character_list = implode('<br />', $matches[0]);
+			$character_list = implode('<br>', $matches[0]);
 			$this->warn_msg[] = $user->lang('UNSUPPORTED_CHARACTERS_MESSAGE', $character_list);
 			return $update_this_message ? $this->warn_msg : $return_message;
 		}
@@ -1384,7 +1384,7 @@
 
 				// (assertion)
 				$match[] = preg_quote($row['code'], '#');
-				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->';
+				$replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '"><!-- s' . $row['code'] . ' -->';
 			}
 			$db->sql_freeresult($result);
 		}
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_attachments.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_attachments.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_attachments.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_attachments.php	2014-09-21 12:00:00.000000000 +0200
@@ -78,7 +78,7 @@
 				delete_attachments('attach', $delete_ids);
 
 				meta_refresh(3, $this->u_action);
-				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 				trigger_error($message);
 			}
 			else
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_auth_link.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_auth_link.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_auth_link.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_auth_link.php	2014-09-21 12:00:00.000000000 +0200
@@ -129,7 +129,7 @@
 
 		// Replace "error" strings with their real, localised form
 		$error = array_map(array($user, 'lang'), $error);
-		$error = implode('<br />', $error);
+		$error = implode('<br>', $error);
 
 		$template->assign_vars(array(
 			'ERROR'	=> $error,
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_groups.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_groups.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_groups.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_groups.php	2014-09-21 12:00:00.000000000 +0200
@@ -34,7 +34,7 @@
 
 		$user->add_lang('groups');
 
-		$return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
+		$return_page = '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
 
 		$mark_ary	= request_var('mark', array(0));
 		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);
@@ -420,8 +420,8 @@
 						'GROUP_DESC_DISP'		=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
 						'GROUP_TYPE'			=> $group_row['group_type'],
 
-						'AVATAR'				=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
-						'AVATAR_IMAGE'			=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
+						'AVATAR'				=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="">' : $avatar),
+						'AVATAR_IMAGE'			=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="">' : $avatar),
 						'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 						'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
 					));
@@ -689,7 +689,7 @@
 							'S_AVATARS_ENABLED'	=> ($config['allow_avatar'] && $avatars_enabled),
 							'S_GROUP_MANAGE'	=> true,
 
-							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 							'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
 							'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
 							'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
@@ -865,7 +865,7 @@
 						// Approve, demote or promote
 						group_user_attributes('approve', $group_id, $mark_ary, false, false);
 
-						trigger_error($user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+						trigger_error($user->lang['USERS_APPROVED'] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 
 					break;
 
@@ -931,7 +931,7 @@
 
 							$user->add_lang('acp/groups');
 
-							trigger_error($user->lang['GROUP_DEFS_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error($user->lang['GROUP_DEFS_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
@@ -979,10 +979,10 @@
 
 							if ($error)
 							{
-								trigger_error($user->lang[$error] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+								trigger_error($user->lang[$error] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 							}
 
-							trigger_error($user->lang['GROUP_USERS_REMOVE'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error($user->lang['GROUP_USERS_REMOVE'] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
@@ -1040,7 +1040,7 @@
 								trigger_error($user->lang[$error] . $return_page);
 							}
 
-							trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
@@ -1056,7 +1056,7 @@
 							confirm_box(false, $user->lang('GROUP_CONFIRM_ADD_USERS', sizeof($name_ary), implode($user->lang['COMMA_SEPARATOR'], $name_ary)), build_hidden_fields($s_hidden_fields));
 						}
 
-						trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+						trigger_error($user->lang['NO_USERS_ADDED'] . '<br><br>' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 
 					break;
 
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_main.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_main.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_main.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_main.php	2014-09-21 12:00:00.000000000 +0200
@@ -256,7 +256,7 @@
 					{
 						$msg = $user->lang['FORM_INVALID'];
 					}
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=subscribed") . '">', '</a>');
+					$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=subscribed") . '">', '</a>');
 					meta_refresh(3, append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=subscribed"));
 					trigger_error($message);
 				}
@@ -345,7 +345,7 @@
 							'FORUM_ID'				=> $forum_id,
 							'FORUM_IMG_STYLE'		=> $folder_image,
 							'FORUM_FOLDER_IMG'		=> $user->img($folder_image, $folder_alt),
-							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',
+							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '">' : '',
 							'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 							'FORUM_NAME'			=> $row['forum_name'],
 							'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
@@ -422,7 +422,7 @@
 						$db->sql_query($sql);
 
 						meta_refresh(3, $url);
-						$message = $user->lang['BOOKMARKS_REMOVED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $url . '">', '</a>');
+						$message = $user->lang['BOOKMARKS_REMOVED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $url . '">', '</a>');
 						trigger_error($message);
 					}
 					else
@@ -449,7 +449,7 @@
 				$draft_id	= $request->variable('edit', 0);
 				$delete		= (isset($_POST['delete'])) ? true : false;
 
-				$s_hidden_fields = ($edit) ? '<input type="hidden" name="edit" value="' . $draft_id . '" />' : '';
+				$s_hidden_fields = ($edit) ? '<input type="hidden" name="edit" value="' . $draft_id . '">' : '';
 				$draft_subject = $draft_message = '';
 				add_form_key('ucp_draft');
 
@@ -473,7 +473,7 @@
 					{
 						$msg = $user->lang['FORM_INVALID'];
 					}
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					meta_refresh(3, $this->u_action);
 					trigger_error($message);
 				}
@@ -497,7 +497,7 @@
 									AND user_id = " . $user->data['user_id'];
 							$db->sql_query($sql);
 
-							$message = $user->lang['DRAFT_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $user->lang['DRAFT_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 
 							meta_refresh(3, $this->u_action);
 							trigger_error($message);
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_notifications.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_notifications.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_notifications.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_notifications.php	2014-09-21 12:00:00.000000000 +0200
@@ -80,7 +80,7 @@
 					}
 
 					meta_refresh(3, $this->u_action);
-					$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					$message = $user->lang['PREFERENCES_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					trigger_error($message);
 				}
 
@@ -113,7 +113,7 @@
 								'success'		=> true,
 							));
 						}
-						$message .= '<br /><br />' . $user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
+						$message .= '<br><br>' . $user->lang('RETURN_UCP', '<a href="' . $this->u_action . '">', '</a>');
 
 						trigger_error($message);
 					}
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_pm_compose.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_compose.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_pm_compose.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_compose.php	2014-09-21 12:00:00.000000000 +0200
@@ -415,7 +415,7 @@
 			$message = $user->lang['MESSAGE_DELETED'];
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br><br>' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -572,7 +572,7 @@
 				$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&amp;mode=$mode");
 
 				meta_refresh(3, $redirect_url);
-				$message = $user->lang['DRAFT_SAVED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+				$message = $user->lang['DRAFT_SAVED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 
 				trigger_error($message);
 			}
@@ -671,7 +671,7 @@
 
 		if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc))
 		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
+			$error[] = implode('<br>', $message_parser->warn_msg);
 			$message_parser->warn_msg = array();
 		}
 
@@ -681,7 +681,7 @@
 		// On a refresh we do not care about message parsing errors
 		if (sizeof($message_parser->warn_msg) && !$refresh)
 		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
+			$error[] = implode('<br>', $message_parser->warn_msg);
 		}
 
 		if ($action != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('u_ignoreflood'))
@@ -752,15 +752,15 @@
 			$return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX';
 
 			$save_message = ($action === 'edit') ? $user->lang['MESSAGE_EDITED'] : $user->lang['MESSAGE_STORED'];
-			$message = $save_message . '<br /><br />' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>');
+			$message = $save_message . '<br><br>' . $user->lang('VIEW_PRIVATE_MESSAGE', '<a href="' . $return_message_url . '">', '</a>');
 
 			$last_click_type = 'CLICK_RETURN_FOLDER';
 			if ($folder_url)
 			{
-				$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+				$message .= '<br><br>' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
 				$last_click_type = 'CLICK_GOTO_FOLDER';
 			}
-			$message .= '<br /><br />' . sprintf($user->lang[$last_click_type], '<a href="' . $return_box_url . '">', '</a>', $user->lang[$return_box_lang]);
+			$message .= '<br><br>' . sprintf($user->lang[$last_click_type], '<a href="' . $return_box_url . '">', '</a>', $user->lang[$return_box_lang]);
 
 			meta_refresh(3, $return_message_url);
 			trigger_error($message);
@@ -1044,9 +1044,9 @@
 		break;
 	}
 
-	$s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '" />';
-	$s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : '';
-	$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . ((isset($_REQUEST['draft_loaded'])) ? $request->variable('draft_loaded', 0) : $draft_id) . '" />' : '';
+	$s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '">';
+	$s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '">' : '';
+	$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . ((isset($_REQUEST['draft_loaded'])) ? $request->variable('draft_loaded', 0) : $draft_id) . '">' : '';
 
 	$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"';
 
@@ -1065,7 +1065,7 @@
 		'URL_STATUS'			=> ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
 		'MAX_FONT_SIZE'			=> (int) $config['max_post_font_size'],
 		'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['PM']),
-		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
+		'ERROR'					=> (sizeof($error)) ? implode('<br>', $error) : '',
 		'MAX_RECIPIENTS'		=> ($config['allow_mass_pm'] && ($auth->acl_get('u_masspm') || $auth->acl_get('u_masspm_group'))) ? $max_recipients : 0,
 
 		'S_COMPOSE_PM'			=> true,
@@ -1318,7 +1318,7 @@
 	{
 		foreach ($adr_ary as $id => $field)
 		{
-			$s_hidden_address_field .= '<input type="hidden" name="address_list[' . (($type == 'u') ? 'u' : 'g') . '][' . (int) $id . ']" value="' . (($field == 'to') ? 'to' : 'bcc') . '" />';
+			$s_hidden_address_field .= '<input type="hidden" name="address_list[' . (($type == 'u') ? 'u' : 'g') . '][' . (int) $id . ']" value="' . (($field == 'to') ? 'to' : 'bcc') . '">';
 		}
 	}
 	return $s_hidden_address_field;
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_pm_options.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_options.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_pm_options.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_options.php	2014-09-21 12:00:00.000000000 +0200
@@ -68,7 +68,7 @@
 
 			$user->data['user_full_folder'] = $set_folder_id;
 
-			$message = $user->lang['FULL_FOLDER_OPTION_CHANGED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+			$message = $user->lang['FULL_FOLDER_OPTION_CHANGED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 			meta_refresh(3, $redirect_url);
 			trigger_error($message);
 		}
@@ -125,7 +125,7 @@
 		{
 			$msg = $user->lang['FORM_INVALID'];
 		}
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
 	}
@@ -169,7 +169,7 @@
 			$msg = $user->lang['FORM_INVALID'];
 		}
 
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
@@ -277,7 +277,7 @@
 			$message = $user->lang['FOLDER_REMOVED'];
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -363,7 +363,7 @@
 		{
 			$msg = $user->lang['FORM_INVALID'];
 		}
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
 	}
@@ -408,7 +408,7 @@
 			}
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_pm_viewfolder.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_viewfolder.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_pm_viewfolder.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_viewfolder.php	2014-09-21 12:00:00.000000000 +0200
@@ -165,7 +165,7 @@
 					'SUBJECT'			=> censor_text($row['message_subject']),
 					'FOLDER'			=> (isset($folder[$row['folder_id']])) ? $folder[$row['folder_id']]['folder_name'] : '',
 					'U_FOLDER'			=> (isset($folder[$row['folder_id']])) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'folder=' . $row['folder_id']) : '',
-					'PM_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
+					'PM_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="">' : '',
 					'PM_ICON_URL'		=> (!empty($icons[$row['icon_id']])) ? $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] : '',
 					'FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 					'FOLDER_IMG_STYLE'	=> $folder_img,
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_pm_viewmessage.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_viewmessage.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_pm_viewmessage.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_pm_viewmessage.php	2014-09-21 12:00:00.000000000 +0200
@@ -40,7 +40,7 @@
 		$meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&amp;folder=$folder_id");
 		$message = $user->lang['NO_AUTH_READ_REMOVED_MESSAGE'];
 
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
 		trigger_error($message);
 	}
 
@@ -94,7 +94,7 @@
 			$edit_user_info = get_user_information($message_row['message_edit_user'], false);
 			$display_username = get_username_string('full', $message_row['message_edit_user'], $edit_user_info['username'], $edit_user_info['user_colour']);
 		}
-		$l_edited_by = '<br /><br />' . $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], $display_username, $user->format_date($message_row['message_edit_time'], false, true));
+		$l_edited_by = '<br><br>' . $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], $display_username, $user->format_date($message_row['message_edit_time'], false, true));
 	}
 	else
 	{
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_prefs.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_prefs.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_prefs.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_prefs.php	2014-09-21 12:00:00.000000000 +0200
@@ -127,7 +127,7 @@
 						$db->sql_query($sql);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $user->lang['PREFERENCES_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
@@ -186,7 +186,7 @@
 				$db->sql_freeresult($result);
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
 					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
@@ -318,7 +318,7 @@
 						$db->sql_query($sql);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $user->lang['PREFERENCES_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
@@ -369,7 +369,7 @@
 				}
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'S_IMAGES'			=> $data['images'],
 					'S_FLASH'			=> $data['flash'],
@@ -450,7 +450,7 @@
 						$msg = $user->lang['FORM_INVALID'];
 					}
 					meta_refresh(3, $this->u_action);
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					$message = $msg . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					trigger_error($message);
 				}
 
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_profile.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_profile.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_profile.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_profile.php	2014-09-21 12:00:00.000000000 +0200
@@ -218,7 +218,7 @@
 						if (!empty($sql_ary['user_actkey']))
 						{
 							meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx));
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>');
+							$message = $user->lang[$message] . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid($phpbb_root_path . 'index.' . $phpEx) . '">', '</a>');
 
 							// Because the user gets deactivated we log him out too, killing his session
 							$user->session_kill();
@@ -226,7 +226,7 @@
 						else
 						{
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $user->lang[$message] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						}
 
 						trigger_error($message);
@@ -237,7 +237,7 @@
 				}
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 					'USERNAME'			=> $data['username'],
 					'EMAIL'				=> $data['email'],
@@ -350,7 +350,7 @@
 						$cp->update_profile_field_data($user->data['user_id'], $cp_data);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $user->lang['PROFILE_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
@@ -393,7 +393,7 @@
 				}
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 					'S_JABBER_ENABLED'	=> $config['jab_enable'],
 					'JABBER'			=> $data['jabber'],
 				));
@@ -440,7 +440,7 @@
 
 						if (sizeof($message_parser->warn_msg))
 						{
-							$error[] = implode('<br />', $message_parser->warn_msg);
+							$error[] = implode('<br>', $message_parser->warn_msg);
 						}
 
 						if (!check_form_key('ucp_sig'))
@@ -466,7 +466,7 @@
 								WHERE user_id = ' . $user->data['user_id'];
 							$db->sql_query($sql);
 
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $user->lang['PROFILE_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -486,7 +486,7 @@
 				decode_message($signature, $user->data['user_sig_bbcode_uid']);
 
 				$template->assign_vars(array(
-					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 					'SIGNATURE'			=> $signature,
 					'SIGNATURE_PREVIEW'	=> $signature_preview,
 
@@ -560,7 +560,7 @@
 									$db->sql_query($sql);
 
 									meta_refresh(3, $this->u_action);
-									$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+									$message = $user->lang['PROFILE_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 									trigger_error($message);
 								}
 							}
@@ -587,7 +587,7 @@
 							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');
 
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $user->lang['PROFILE_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -626,7 +626,7 @@
 				$avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
-					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'			=> (sizeof($error)) ? implode('<br>', $error) : '',
 					'AVATAR'		=> $avatar,
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
@@ -662,7 +662,7 @@
 							$db->sql_query($sql);
 
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['AUTOLOGIN_SESSION_KEYS_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = $user->lang['AUTOLOGIN_SESSION_KEYS_DELETED'] . '<br><br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -693,7 +693,7 @@
 		}
 
 		$template->assign_vars(array(
-			'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'ERROR'		=> (sizeof($error)) ? implode('<br>', $error) : '',
 
 			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_register.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_register.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_register.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_register.php	2014-09-21 12:00:00.000000000 +0200
@@ -405,11 +405,11 @@
 
 					if ($result)
 					{
-						$message = $message . '<br /><br />' . $user->lang[$result];
+						$message = $message . '<br><br>' . $user->lang[$result];
 					}
 				}
 
-				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+				$message = $message . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 				trigger_error($message);
 			}
 		}
@@ -454,7 +454,7 @@
 
 		$timezone_selects = phpbb_timezone_select($user, $data['tz'], true);
 		$template->assign_vars(array(
-			'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 			'USERNAME'			=> $data['username'],
 			'PASSWORD'			=> $data['new_password'],
 			'PASSWORD_CONFIRM'	=> $data['password_confirm'],
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_remind.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_remind.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_remind.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_remind.php	2014-09-21 12:00:00.000000000 +0200
@@ -119,7 +119,7 @@
 
 			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
 
-			$message = $user->lang['PASSWORD_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+			$message = $user->lang['PASSWORD_UPDATED'] . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 			trigger_error($message);
 		}
 
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_resend.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_resend.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_resend.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_resend.php	2014-09-21 12:00:00.000000000 +0200
@@ -147,7 +147,7 @@
 			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
 
 			$message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT'];
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+			$message .= '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 			trigger_error($message);
 		}
 
diff -Naur phpbb-3.1.0-RC4/includes/ucp/ucp_zebra.php phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_zebra.php
--- phpbb-3.1.0-RC4/includes/ucp/ucp_zebra.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/includes/ucp/ucp_zebra.php	2014-09-21 12:00:00.000000000 +0200
@@ -227,7 +227,7 @@
 
 					if ($request->is_ajax())
 					{
-						$message = ($updated) ? $user->lang[$l_mode . '_UPDATED'] : implode('<br />', $error);
+						$message = ($updated) ? $user->lang[$l_mode . '_UPDATED'] : implode('<br>', $error);
 
 						$json_response = new \phpbb\json_response;
 						$json_response->send(array(
@@ -244,12 +244,12 @@
 					else if ($updated)
 					{
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = $user->lang[$l_mode . '_UPDATED'] . '<br>' . implode('<br>', $error) . ((sizeof($error)) ? '<br>' : '') . '<br>' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 					else
 					{
-						$template->assign_var('ERROR', implode('<br />', $error));
+						$template->assign_var('ERROR', implode('<br>', $error));
 					}
 				}
 				else
diff -Naur phpbb-3.1.0-RC4/install/convertors/functions_phpbb20.php phpbb-3.1.0-RC4-HTML5/install/convertors/functions_phpbb20.php
--- phpbb-3.1.0-RC4/install/convertors/functions_phpbb20.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/install/convertors/functions_phpbb20.php	2014-09-21 12:00:00.000000000 +0200
@@ -1254,7 +1254,7 @@
 	// Already the new user id ;)
 	$user_id = $convert->row['poster_id'];
 
-	$message = str_replace('<br />', "\n", $message);
+	$message = str_replace('<br>', "\n", $message);
 	$message = str_replace('<', '&lt;', $message);
 	$message = str_replace('>', '&gt;', $message);
 
@@ -1278,7 +1278,7 @@
 	if (sizeof($message_parser->warn_msg))
 	{
 		$msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ': <br /><br />' . implode('<br />', $message_parser->warn_msg), __LINE__, __FILE__, true);
+		$convert->p_master->error('<span style="color:red">' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ': <br><br>' . implode('<br>', $message_parser->warn_msg), __LINE__, __FILE__, true);
 	}
 
 	$convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = $message_parser->bbcode_bitfield;
@@ -1908,15 +1908,15 @@
 		$list = '';
 		foreach ($colliding_users as $username_clean => $users)
 		{
-			$list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "<br />\n";
+			$list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "<br>\n";
 			foreach ($users as $i => $row)
 			{
-				$list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "<br />\n";
+				$list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "<br>\n";
 			}
 		}
 
 		$lang['INST_ERR_FATAL'] = $user->lang['CONV_ERR_FATAL'];
-		$convert->p_master->error('<span style="color:red">' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '</span></b><br /><br />' . $list . '<b>', __LINE__, __FILE__);
+		$convert->p_master->error('<span style="color:red">' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '</span></b><br><br>' . $list . '<b>', __LINE__, __FILE__);
 	}
 
 	$drop_sql = 'DROP TABLE ' . USERCONV_TABLE;
diff -Naur phpbb-3.1.0-RC4/install/database_update.php phpbb-3.1.0-RC4-HTML5/install/database_update.php
--- phpbb-3.1.0-RC4/install/database_update.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/install/database_update.php	2014-09-21 12:00:00.000000000 +0200
@@ -141,7 +141,7 @@
 
 <title><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></title>
 
-<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="<?php echo htmlspecialchars($phpbb_admin_path); ?>style/admin.css" rel="stylesheet" media="screen">
 
 </head>
 
@@ -158,10 +158,10 @@
 
 								<h1><?php echo $user->lang['UPDATING_TO_LATEST_STABLE']; ?></h1>
 
-								<br />
+								<br>
 
-								<p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->get_sql_layer(); ?></strong><br />
-								<?php echo $user->lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
+								<p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->get_sql_layer(); ?></strong><br>
+								<?php echo $user->lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br>
 
 <?php
 
@@ -239,12 +239,12 @@
 		}
 	}
 
-	echo "<br />\n";
+	echo "<br>\n";
 
 	// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 	if ((time() - $update_start_time) >= $safe_time_limit)
 	{
-		echo '<br />' . $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br /><br />';
+		echo '<br>' . $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br><br>';
 		echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=' . $request->variable('type', 0) . '&amp;language=' . $request->variable('language', 'en')) . '" class="button1">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
 		phpbb_end_update($cache, $config);
@@ -256,11 +256,11 @@
 	add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']);
 }
 
-echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '<br />';
+echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '<br>';
 
 if ($request->variable('type', 0))
 {
-	echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br /><br />';
+	echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br><br>';
 	echo '<a href="' . append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update&amp;sub=update_db&amp;language=' . $request->variable('language', 'en')) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
 }
 else
diff -Naur phpbb-3.1.0-RC4/install/index.php phpbb-3.1.0-RC4-HTML5/install/index.php
--- phpbb-3.1.0-RC4/install/index.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/install/index.php	2014-09-21 12:00:00.000000000 +0200
@@ -635,7 +635,7 @@
 		echo '<head>';
 		echo '<meta charset="utf-8">';
 		echo '<title>' . $lang['INST_ERR_FATAL'] . '</title>';
-		echo '<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
+		echo '<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" media="screen">';
 		echo '</head>';
 		echo '<body id="errorpage">';
 		echo '<div id="wrap">';
@@ -687,7 +687,7 @@
 
 			$template->assign_block_vars('checks', array(
 				'TITLE'		=> basename($file) . ' [ ' . $line . ' ]',
-				'RESULT'	=> '<b style="color:red">' . $error . '</b><br />&#187; SQL:' . $sql,
+				'RESULT'	=> '<b style="color:red">' . $error . '</b><br>&#187; SQL:' . $sql,
 			));
 
 			return;
@@ -745,7 +745,7 @@
 				$maxlength = (int) $tpl_type[2];
 				$autocomplete = (isset($options['autocomplete']) && $options['autocomplete'] == 'off') ? ' autocomplete="off"' : '';
 
-				$tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '"' . $autocomplete . ' value="' . $value . '" />';
+				$tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '"' . $autocomplete . ' value="' . $value . '">';
 			break;
 
 			case 'textarea':
@@ -762,8 +762,8 @@
 				$tpl_type_cond = explode('_', $tpl_type[1]);
 				$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
 
-				$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $lang['NO'] : $lang['DISABLED']) . '</label>';
-				$tpl_yes = '<label><input type="radio" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $lang['YES'] : $lang['ENABLED']) . '</label>';
+				$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio"> ' . (($type_no) ? $lang['NO'] : $lang['DISABLED']) . '</label>';
+				$tpl_yes = '<label><input type="radio" name="' . $name . '" value="1"' . $key_yes . ' class="radio"> ' . (($type_no) ? $lang['YES'] : $lang['ENABLED']) . '</label>';
 
 				$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '&nbsp;&nbsp;' . $tpl_no : $tpl_no . '&nbsp;&nbsp;' . $tpl_yes;
 			break;
diff -Naur phpbb-3.1.0-RC4/install/install_convert.php phpbb-3.1.0-RC4-HTML5/install/install_convert.php
--- phpbb-3.1.0-RC4/install/install_convert.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/install/install_convert.php	2014-09-21 12:00:00.000000000 +0200
@@ -519,7 +519,7 @@
 
 					if (!empty($possible_prefix))
 					{
-						$msg .= '<br />';
+						$msg .= '<br>';
 						$msg .= ($possible_prefix == '*') ? $lang['BLANK_PREFIX_FOUND'] : sprintf($lang['PREFIX_FOUND'], $possible_prefix);
 						$src_table_prefix = ($possible_prefix == '*') ? '' : $possible_prefix;
 					}
@@ -569,7 +569,7 @@
 			{
 				$template->assign_block_vars('checks', array(
 					'TITLE'		=> $lang['VERIFY_OPTIONS'],
-					'RESULT'	=> '<b style="color:red">' . implode('<br />', $error) . '</b>',
+					'RESULT'	=> '<b style="color:red">' . implode('<br>', $error) . '</b>',
 				));
 			}
 		} // end submit
@@ -877,7 +877,7 @@
 				{
 					$msg = (sizeof($bad_folders) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE'];
 					sort($bad_folders);
-					$this->p_master->error(sprintf($msg, implode('<br />', $bad_folders)), __LINE__, __FILE__, true);
+					$this->p_master->error(sprintf($msg, implode('<br>', $bad_folders)), __LINE__, __FILE__, true);
 
 					$template->assign_vars(array(
 						'L_SUBMIT'	=> $user->lang['INSTALL_TEST'],
@@ -979,7 +979,7 @@
 				}
 				else if (sizeof($missing_tables))
 				{
-					$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode($user->lang['COMMA_SEPARATOR'], $missing_tables)) . '<br /><br />' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
+					$this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode($user->lang['COMMA_SEPARATOR'], $missing_tables)) . '<br><br>' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
 				}
 
 				$url = $this->save_convert_progress('&amp;confirm=1');
@@ -1337,7 +1337,7 @@
 										{
 											if (!$db->sql_query($insert_query . $waiting_sql))
 											{
-												$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
+												$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br><br>' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
 											}
 										}
 
@@ -1356,7 +1356,7 @@
 
 								if (!$db->sql_query($insert_sql))
 								{
-									$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
+									$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_sql) . '<br><br>' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
 								}
 								$db->sql_return_on_error(false);
 
@@ -1391,7 +1391,7 @@
 						foreach ($waiting_rows as $waiting_sql)
 						{
 							$db->sql_query($insert_query . $waiting_sql);
-							$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br /><br />' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
+							$this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '<br><br>' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true);
 						}
 
 						$db->sql_return_on_error(false);
@@ -2126,7 +2126,7 @@
 			// Because we should not rely on correct settings, we simply use the relative path here directly.
 			$template->assign_vars(array(
 				'S_REFRESH'	=> true,
-				'META'		=> '<meta http-equiv="refresh" content="5; url=' . $url . '" />')
+				'META'		=> '<meta http-equiv="refresh" content="5; url=' . $url . '">')
 			);
 		}
 	}
diff -Naur phpbb-3.1.0-RC4/install/install_install.php phpbb-3.1.0-RC4-HTML5/install/install_install.php
--- phpbb-3.1.0-RC4/install/install_install.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/install/install_install.php	2014-09-21 12:00:00.000000000 +0200
@@ -534,7 +534,7 @@
 		}
 
 		// And finally where do we want to go next (well today is taken isn't it :P)
-		$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
+		$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '">' : '';
 
 		$url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&amp;sub=database&amp;language=$language" : $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language	";
 		$submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST'];
@@ -600,7 +600,7 @@
 			{
 				$template->assign_block_vars('checks', array(
 					'TITLE'		=> $lang['DB_TEST'],
-					'RESULT'	=> '<strong style="color:red">' . implode('<br />', $error) . '</strong>',
+					'RESULT'	=> '<strong style="color:red">' . implode('<br>', $error) . '</strong>',
 
 					'S_EXPLAIN'	=> false,
 					'S_LEGEND'	=> false,
@@ -659,8 +659,8 @@
 		}
 
 		// And finally where do we want to go next (well today is taken isn't it :P)
-		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '" />' : '';
-		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
+		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '">' : '';
+		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '">';
 		if ($connect_test)
 		{
 			foreach ($this->db_config_options as $config_key => $vars)
@@ -669,12 +669,12 @@
 				{
 					continue;
 				}
-				$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
+				$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '">';
 			}
 		}
 
 		$url = ($connect_test) ? $this->p_master->module_url . "?mode=$mode&amp;sub=administrator" : $this->p_master->module_url . "?mode=$mode&amp;sub=database";
-		$s_hidden_fields .= ($connect_test) ? '' : '<input type="hidden" name="testdb" value="true" />';
+		$s_hidden_fields .= ($connect_test) ? '' : '<input type="hidden" name="testdb" value="true">';
 
 		$submit = $lang['NEXT_STEP'];
 
@@ -704,7 +704,7 @@
 			$this->p_master->redirect("index.$phpEx?mode=install");
 		}
 
-		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '" />' : '';
+		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '">' : '';
 		$passed = false;
 
 		$data['default_lang'] = ($data['default_lang'] !== '') ? $data['default_lang'] : $data['language'];
@@ -772,7 +772,7 @@
 			{
 				$template->assign_block_vars('checks', array(
 					'TITLE'		=> $lang['ADMIN_TEST'],
-					'RESULT'	=> '<strong style="color:red">' . implode('<br />', $error) . '</strong>',
+					'RESULT'	=> '<strong style="color:red">' . implode('<br>', $error) . '</strong>',
 
 					'S_EXPLAIN'	=> false,
 					'S_LEGEND'	=> false,
@@ -820,12 +820,12 @@
 				{
 					continue;
 				}
-				$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
+				$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '">';
 			}
 		}
 
-		$s_hidden_fields .= ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '" />' : '';
-		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
+		$s_hidden_fields .= ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '">' : '';
+		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '">';
 
 		foreach ($this->db_config_options as $config_key => $vars)
 		{
@@ -833,13 +833,13 @@
 			{
 				continue;
 			}
-			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
+			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '">';
 		}
 
 		$submit = $lang['NEXT_STEP'];
 
 		$url = ($passed) ? $this->p_master->module_url . "?mode=$mode&amp;sub=config_file" : $this->p_master->module_url . "?mode=$mode&amp;sub=administrator";
-		$s_hidden_fields .= ($passed) ? '' : '<input type="hidden" name="check" value="true" />';
+		$s_hidden_fields .= ($passed) ? '' : '<input type="hidden" name="check" value="true">';
 
 		$template->assign_vars(array(
 			'L_SUBMIT'	=> $submit,
@@ -867,8 +867,8 @@
 			$this->p_master->redirect("index.$phpEx?mode=install");
 		}
 
-		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '" />' : '';
-		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
+		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '">' : '';
+		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '">';
 		$written = false;
 
 		// Create a list of any PHP modules we wish to have loaded
@@ -935,7 +935,7 @@
 			{
 				continue;
 			}
-			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
+			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '">';
 		}
 
 		if (!$written)
@@ -996,8 +996,8 @@
 			$this->p_master->redirect("index.$phpEx?mode=install");
 		}
 
-		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '" />' : '';
-		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '" />';
+		$s_hidden_fields = ($data['img_imagick']) ? '<input type="hidden" name="img_imagick" value="' . addslashes($data['img_imagick']) . '">' : '';
+		$s_hidden_fields .= '<input type="hidden" name="language" value="' . $data['language'] . '">';
 
 		// HTTP_HOST is having the correct browser url in most cases...
 		$server_name = strtolower(htmlspecialchars_decode($request->header('Host', $request->server('SERVER_NAME'))));
@@ -1064,7 +1064,7 @@
 			{
 				continue;
 			}
-			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '" />';
+			$s_hidden_fields .= '<input type="hidden" name="' . $config_key . '" value="' . $data[$config_key] . '">';
 		}
 
 		$submit = $lang['NEXT_STEP'];
diff -Naur phpbb-3.1.0-RC4/language/en/acp/attachments.php phpbb-3.1.0-RC4-HTML5/language/en/acp/attachments.php
--- phpbb-3.1.0-RC4/language/en/acp/attachments.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/attachments.php	2014-09-21 12:00:00.000000000 +0200
@@ -110,7 +110,7 @@
 	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
 
 	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
-	'FILES_STATS_WRONG'		=> 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.<br />Click %3$shere%4$s to resynchronise them.',
+	'FILES_STATS_WRONG'		=> 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.<br>Click %3$shere%4$s to resynchronise them.',
 
 	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
 	'GROUP_NAME'			=> 'Group name',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/board.php phpbb-3.1.0-RC4-HTML5/language/en/acp/board.php
--- phpbb-3.1.0-RC4/language/en/acp/board.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/board.php	2014-09-21 12:00:00.000000000 +0200
@@ -102,7 +102,7 @@
 	'ACP_AVATAR_SETTINGS_EXPLAIN'	=> 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
 
 	'ALLOW_AVATARS'					=> 'Enable avatars',
-	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
+	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br>If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
 	'ALLOW_GRAVATAR'				=> 'Enable gravatar avatars',
 	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
 	'ALLOW_REMOTE'					=> 'Enable remote avatars',
@@ -111,9 +111,9 @@
 	'ALLOW_REMOTE_UPLOAD_EXPLAIN'	=> 'Allow uploading of avatars from another website.',
 	'ALLOW_UPLOAD'					=> 'Enable avatar uploading',
 	'AVATAR_GALLERY_PATH'			=> 'Avatar gallery path',
-	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
+	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.<br>Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
 	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
-	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br />Avatar uploading <strong>will not be available</strong> if this path is not writable.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
+	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br>Avatar uploading <strong>will not be available</strong> if this path is not writable.<br>Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
 	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
 	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 	'MAX_FILESIZE'					=> 'Maximum avatar file size',
@@ -266,7 +266,7 @@
 	'ACP_FEED_SETTINGS_OTHER'			=> 'Other feeds and settings',
 
 	'ACP_FEED_ENABLE'					=> 'Enable feeds',
-	'ACP_FEED_ENABLE_EXPLAIN'			=> 'Turns on or off ATOM feeds for the entire board.<br />Disabling this switches off all feeds, no matter how the options below are set.',
+	'ACP_FEED_ENABLE_EXPLAIN'			=> 'Turns on or off ATOM feeds for the entire board.<br>Disabling this switches off all feeds, no matter how the options below are set.',
 	'ACP_FEED_LIMIT'					=> 'Number of items',
 	'ACP_FEED_LIMIT_EXPLAIN'			=> 'The maximum number of feed items to display.',
 
@@ -282,7 +282,7 @@
 	'ACP_FEED_TOPICS_ACTIVE'			=> 'Enable active topics feed',
 	'ACP_FEED_TOPICS_ACTIVE_EXPLAIN'	=> 'Enables the “Active Topics” feed, which displays the last active topics including the last post.',
 	'ACP_FEED_NEWS'						=> 'News feed',
-	'ACP_FEED_NEWS_EXPLAIN'				=> 'Pull the first post from these forums. Select no forums to disable news feed.<br />Select multiple forums by holding <samp>CTRL</samp> and clicking.',
+	'ACP_FEED_NEWS_EXPLAIN'				=> 'Pull the first post from these forums. Select no forums to disable news feed.<br>Select multiple forums by holding <samp>CTRL</samp> and clicking.',
 
 	'ACP_FEED_OVERALL_FORUMS'			=> 'Enable forums feed',
 	'ACP_FEED_OVERALL_FORUMS_EXPLAIN'	=> 'Enables the “All forums” feed, which displays a list of forums.',
@@ -290,9 +290,9 @@
 	'ACP_FEED_HTTP_AUTH'				=> 'Allow HTTP Authentication',
 	'ACP_FEED_HTTP_AUTH_EXPLAIN'		=> 'Enables HTTP authentication, which allows users to receive content that is hidden to guest users by adding the <samp>auth=http</samp> parameter to the feed URL. Please note that some PHP setups require additional changes to the .htaccess file. Instructions can be found in that file.',
 	'ACP_FEED_ITEM_STATISTICS'			=> 'Item statistics',
-	'ACP_FEED_ITEM_STATISTICS_EXPLAIN'	=> 'Display individual statistics underneath feed items<br />(e.g. posted by, date and time, replies, views)',
+	'ACP_FEED_ITEM_STATISTICS_EXPLAIN'	=> 'Display individual statistics underneath feed items<br>(e.g. posted by, date and time, replies, views)',
 	'ACP_FEED_EXCLUDE_ID'				=> 'Exclude these forums',
-	'ACP_FEED_EXCLUDE_ID_EXPLAIN'		=> 'Content from these will be <strong>not included in feeds</strong>. Select no forum to pull data from all forums.<br />Select/Deselect multiple forums by holding <samp>CTRL</samp> and clicking.',
+	'ACP_FEED_EXCLUDE_ID_EXPLAIN'		=> 'Content from these will be <strong>not included in feeds</strong>. Select no forum to pull data from all forums.<br>Select/Deselect multiple forums by holding <samp>CTRL</samp> and clicking.',
 ));
 
 // Visual Confirmation Settings
@@ -415,7 +415,7 @@
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
 	'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING'	=> 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.',
-	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server. These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users. Also note, that user can still register and login using the DB authentication plug-in.',
+	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server. These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br>Any service that does not have both a key and a secret entered here will not be available for use by the forum users. Also note, that user can still register and login using the DB authentication plug-in.',
 	'AUTH_PROVIDER_OAUTH_KEY'					=> 'Key',
 	'AUTH_PROVIDER_OAUTH_TITLE'					=> 'OAuth',
 	'AUTH_PROVIDER_OAUTH_SECRET'				=> 'Secret',
@@ -431,7 +431,7 @@
 	'LDAP_NO_EMAIL'					=> 'The specified email attribute does not exist.',
 	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
 	'LDAP_PASSWORD'					=> 'LDAP password',
-	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding, otherwise fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
+	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding, otherwise fill in the password for the above user. Required for Active Directory Servers.<br><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'LDAP_PORT'						=> 'LDAP server port',
 	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
 	'LDAP_SERVER'					=> 'LDAP server name',
@@ -512,7 +512,7 @@
 	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
 	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period.',
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
-	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
+	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
 	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts per username',
 	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered for distinct user accounts.',
 	'NO_IP_VALIDATION'				=> 'None',
@@ -559,7 +559,7 @@
 	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
 	'SMTP_LOGIN'					=> 'LOGIN',
 	'SMTP_PASSWORD'					=> 'SMTP password',
-	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
+	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.<br><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'SMTP_PLAIN'					=> 'PLAIN',
 	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
 	'SMTP_PORT'						=> 'SMTP server port',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/common.php phpbb-3.1.0-RC4-HTML5/language/en/acp/common.php
--- phpbb-3.1.0-RC4/language/en/acp/common.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/common.php	2014-09-21 12:00:00.000000000 +0200
@@ -365,7 +365,7 @@
 
 	'GZIP_COMPRESSION'	=> 'GZip compression',
 
-	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br />Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
+	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br>Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
 	'NOT_AVAILABLE'		=> 'Not available',
 	'NUMBER_FILES'		=> 'Number of attachments',
 	'NUMBER_POSTS'		=> 'Number of posts',
@@ -466,68 +466,68 @@
 
 // Log Entries
 $lang = array_merge($lang, array(
-	'LOG_ACL_ADD_USER_GLOBAL_U_'		=> '<strong>Added or edited users’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_U_'		=> '<strong>Added or edited groups’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_M_'		=> '<strong>Added or edited users’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_M_'		=> '<strong>Added or edited groups’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_A_'		=> '<strong>Added or edited users’ administrator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_A_'		=> '<strong>Added or edited groups’ administrator permissions</strong><br />» %s',
-
-	'LOG_ACL_ADD_ADMIN_GLOBAL_A_'		=> '<strong>Added or edited Administrators</strong><br />» %s',
-	'LOG_ACL_ADD_MOD_GLOBAL_M_'			=> '<strong>Added or edited Global Moderators</strong><br />» %s',
-
-	'LOG_ACL_ADD_USER_LOCAL_F_'			=> '<strong>Added or edited users’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_USER_LOCAL_M_'			=> '<strong>Added or edited users’ forum moderator access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_F_'		=> '<strong>Added or edited groups’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_M_'		=> '<strong>Added or edited groups’ forum moderator access</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_ADD_MOD_LOCAL_M_'			=> '<strong>Added or edited Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_FORUM_LOCAL_F_'		=> '<strong>Added or edited forum permissions</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_DEL_ADMIN_GLOBAL_A_'		=> '<strong>Removed Administrators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_GLOBAL_M_'			=> '<strong>Removed Global Moderators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_LOCAL_M_'			=> '<strong>Removed Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_DEL_FORUM_LOCAL_F_'		=> '<strong>Removed User/Group forum permissions</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_ADD_USER_GLOBAL_U_'		=> '<strong>Added or edited users’ user permissions</strong><br>» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_U_'		=> '<strong>Added or edited groups’ user permissions</strong><br>» %s',
+	'LOG_ACL_ADD_USER_GLOBAL_M_'		=> '<strong>Added or edited users’ global moderator permissions</strong><br>» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_M_'		=> '<strong>Added or edited groups’ global moderator permissions</strong><br>» %s',
+	'LOG_ACL_ADD_USER_GLOBAL_A_'		=> '<strong>Added or edited users’ administrator permissions</strong><br>» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_A_'		=> '<strong>Added or edited groups’ administrator permissions</strong><br>» %s',
+
+	'LOG_ACL_ADD_ADMIN_GLOBAL_A_'		=> '<strong>Added or edited Administrators</strong><br>» %s',
+	'LOG_ACL_ADD_MOD_GLOBAL_M_'			=> '<strong>Added or edited Global Moderators</strong><br>» %s',
+
+	'LOG_ACL_ADD_USER_LOCAL_F_'			=> '<strong>Added or edited users’ forum access</strong> from %1$s<br>» %2$s',
+	'LOG_ACL_ADD_USER_LOCAL_M_'			=> '<strong>Added or edited users’ forum moderator access</strong> from %1$s<br>» %2$s',
+	'LOG_ACL_ADD_GROUP_LOCAL_F_'		=> '<strong>Added or edited groups’ forum access</strong> from %1$s<br>» %2$s',
+	'LOG_ACL_ADD_GROUP_LOCAL_M_'		=> '<strong>Added or edited groups’ forum moderator access</strong> from %1$s<br>» %2$s',
+
+	'LOG_ACL_ADD_MOD_LOCAL_M_'			=> '<strong>Added or edited Moderators</strong> from %1$s<br>» %2$s',
+	'LOG_ACL_ADD_FORUM_LOCAL_F_'		=> '<strong>Added or edited forum permissions</strong> from %1$s<br>» %2$s',
+
+	'LOG_ACL_DEL_ADMIN_GLOBAL_A_'		=> '<strong>Removed Administrators</strong><br>» %s',
+	'LOG_ACL_DEL_MOD_GLOBAL_M_'			=> '<strong>Removed Global Moderators</strong><br>» %s',
+	'LOG_ACL_DEL_MOD_LOCAL_M_'			=> '<strong>Removed Moderators</strong> from %1$s<br>» %2$s',
+	'LOG_ACL_DEL_FORUM_LOCAL_F_'		=> '<strong>Removed User/Group forum permissions</strong> from %1$s<br>» %2$s',
 
-	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
-	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
+	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br>» %s',
+	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br>» %s',
 
 	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
 	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
 
-	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br />» %s',
+	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br>» %s',
 
-	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_ADD'	=> '<strong>Added extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_EDIT'	=> '<strong>Edited extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_DEL'	=> '<strong>Removed extension group</strong><br />» %s',
-	'LOG_ATTACH_FILEUPLOAD'		=> '<strong>Orphan File uploaded to Post</strong><br />» ID %1$d - %2$s',
-	'LOG_ATTACH_ORPHAN_DEL'		=> '<strong>Orphan Files deleted</strong><br />» %s',
-
-	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded email from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EMAIL'			=> '<strong>Banned email</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br />» %s',
-	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br />» %s',
-	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned email</strong><br />» %s',
-
-	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br />» %s',
-	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br />» %s',
-	'LOG_BBCODE_DELETE'		=> '<strong>Deleted BBCode</strong><br />» %s',
-
-	'LOG_BOT_ADDED'		=> '<strong>New bot added</strong><br />» %s',
-	'LOG_BOT_DELETE'	=> '<strong>Deleted bot</strong><br />» %s',
-	'LOG_BOT_UPDATED'	=> '<strong>Existing bot updated</strong><br />» %s',
+	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br>» %s',
+	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br>» %s',
+	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br>» %s',
+	'LOG_ATTACH_EXTGROUP_ADD'	=> '<strong>Added extension group</strong><br>» %s',
+	'LOG_ATTACH_EXTGROUP_EDIT'	=> '<strong>Edited extension group</strong><br>» %s',
+	'LOG_ATTACH_EXTGROUP_DEL'	=> '<strong>Removed extension group</strong><br>» %s',
+	'LOG_ATTACH_FILEUPLOAD'		=> '<strong>Orphan File uploaded to Post</strong><br>» ID %1$d - %2$s',
+	'LOG_ATTACH_ORPHAN_DEL'		=> '<strong>Orphan Files deleted</strong><br>» %s',
+
+	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded email from ban</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_BAN_EMAIL'			=> '<strong>Banned email</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br>» %s',
+	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br>» %s',
+	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned email</strong><br>» %s',
+
+	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br>» %s',
+	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br>» %s',
+	'LOG_BBCODE_DELETE'		=> '<strong>Deleted BBCode</strong><br>» %s',
+
+	'LOG_BOT_ADDED'		=> '<strong>New bot added</strong><br>» %s',
+	'LOG_BOT_DELETE'	=> '<strong>Deleted bot</strong><br>» %s',
+	'LOG_BOT_UPDATED'	=> '<strong>Existing bot updated</strong><br>» %s',
 
 	'LOG_CLEAR_ADMIN'		=> '<strong>Cleared admin log</strong>',
 	'LOG_CLEAR_CRITICAL'	=> '<strong>Cleared error log</strong>',
 	'LOG_CLEAR_MOD'			=> '<strong>Cleared moderator log</strong>',
-	'LOG_CLEAR_USER'		=> '<strong>Cleared user log</strong><br />» %s',
+	'LOG_CLEAR_USER'		=> '<strong>Cleared user log</strong><br>» %s',
 	'LOG_CLEAR_USERS'		=> '<strong>Cleared user logs</strong>',
 
 	'LOG_CONFIG_ATTACH'			=> '<strong>Altered attachment settings</strong>',
@@ -548,155 +548,155 @@
 	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
 	'LOG_CONFIG_VISUAL'			=> '<strong>Altered anti-spambot settings</strong>',
 
-	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
-	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
-	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
-	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
-	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
-	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
-	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
-	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
-	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
-	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
-	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
-	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” for the following reason</strong><br />» %2$s',
-	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
-	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
-	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
-	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
-	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
-	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
-	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
-	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
-	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
-
-	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_TOPIC_RESTORED'		=> '<strong>Restored topic</strong><br />» %s',
-	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” written by “%3$s” for the following reason</strong><br />» %2$s',
-	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
-	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
-	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
-	'LOG_UNLOCK_POST'			=> '<strong>Unlocked post</strong><br />» %s',
+	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br>» %s',
+	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br>» %s',
+	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by “%2$s” for the following reason</strong><br>» %3$s',
+	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br>» %s',
+	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by “%2$s” for the following reason</strong><br>» %3$s',
+	'LOG_FORK'					=> '<strong>Copied topic</strong><br>» from %s',
+	'LOG_LOCK'					=> '<strong>Locked topic</strong><br>» %s',
+	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br>» %s',
+	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br>» %s',
+	'LOG_MOVE'					=> '<strong>Moved topic</strong><br>» from %1$s to %2$s',
+	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br>» %s',
+	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br>» %s',
+	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br>» %s',
+	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” for the following reason</strong><br>» %2$s',
+	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by “%2$s” for the following reason</strong><br>» %3$s',
+	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br>» %s',
+	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br>» %s',
+	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br>» %s',
+	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br>» %2$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s” for the following reason</strong><br>» %3$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s” for the following reason</strong><br>» %3$s',
+	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br>» to %s',
+	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br>» from %s',
+
+	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br>» %s',
+	'LOG_TOPIC_RESTORED'		=> '<strong>Restored topic</strong><br>» %s',
+	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” written by “%3$s” for the following reason</strong><br>» %2$s',
+	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br>» %s',
+	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br>» %s',
+	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br>» %s',
+	'LOG_UNLOCK_POST'			=> '<strong>Unlocked post</strong><br>» %s',
 
-	'LOG_DISALLOW_ADD'		=> '<strong>Added disallowed username</strong><br />» %s',
+	'LOG_DISALLOW_ADD'		=> '<strong>Added disallowed username</strong><br>» %s',
 	'LOG_DISALLOW_DELETE'	=> '<strong>Deleted disallowed username</strong>',
 
 	'LOG_DB_BACKUP'			=> '<strong>Database backup</strong>',
 	'LOG_DB_DELETE'			=> '<strong>Deleted database backup</strong>',
 	'LOG_DB_RESTORE'		=> '<strong>Restored database backup</strong>',
 
-	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<strong>Excluded IP/hostname from download list</strong><br />» %s',
-	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br />» %s',
-	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
-
-	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
-	'LOG_ERROR_EMAIL'		=> '<strong>Email error</strong><br />» %s',
-
-	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
-	'LOG_FORUM_COPIED_PERMISSIONS'			=> '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
-	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
-	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br />» %s',
+	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<strong>Excluded IP/hostname from download list</strong><br>» %s',
+	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br>» %s',
+	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br>» %s',
+
+	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br>» %s',
+	'LOG_ERROR_EMAIL'		=> '<strong>Email error</strong><br>» %s',
+
+	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br>» %s',
+	'LOG_FORUM_COPIED_PERMISSIONS'			=> '<strong>Copied forum permissions</strong> from %1$s<br>» %2$s',
+	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br>» %s',
+	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br>» %s',
+	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br>» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br>» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br>» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br>» %3$s',
+	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br>» %s',
+	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br>» %s',
+	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br>» %2$s',
+	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br>» %s',
 	'LOG_FORUM_MOVE_DOWN'					=> '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
 	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
-	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
+	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br>» %s',
 
-	'LOG_GENERAL_ERROR'	=> '<strong>A general error occurred</strong>: %1$s <br />» %2$s',
+	'LOG_GENERAL_ERROR'	=> '<strong>A general error occurred</strong>: %1$s <br>» %2$s',
 
-	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
-	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
-	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br />» %s',
-	'LOG_GROUP_DEMOTED'		=> '<strong>Leaders demoted in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_PROMOTED'	=> '<strong>Members promoted to leader in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_REMOVE'		=> '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_UPDATED'		=> '<strong>Usergroup details updated</strong><br />» %s',
-	'LOG_MODS_ADDED'		=> '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_ADDED'		=> '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_APPROVED'	=> '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_PENDING'		=> '<strong>Users requested to join group “%1$s” and need to be approved</strong><br />» %2$s',
-
-	'LOG_IMAGE_GENERATION_ERROR'	=> '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s',
-
-	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
-	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
-	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder emails to inactive users</strong><br />» %s',
+	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br>» %s',
+	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br>» %2$s',
+	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br>» %s',
+	'LOG_GROUP_DEMOTED'		=> '<strong>Leaders demoted in usergroup</strong> %1$s<br>» %2$s',
+	'LOG_GROUP_PROMOTED'	=> '<strong>Members promoted to leader in usergroup</strong> %1$s<br>» %2$s',
+	'LOG_GROUP_REMOVE'		=> '<strong>Members removed from usergroup</strong> %1$s<br>» %2$s',
+	'LOG_GROUP_UPDATED'		=> '<strong>Usergroup details updated</strong><br>» %s',
+	'LOG_MODS_ADDED'		=> '<strong>Added new leaders to usergroup</strong> %1$s<br>» %2$s',
+	'LOG_USERS_ADDED'		=> '<strong>Added new members to usergroup</strong> %1$s<br>» %2$s',
+	'LOG_USERS_APPROVED'	=> '<strong>Users approved in usergroup</strong> %1$s<br>» %2$s',
+	'LOG_USERS_PENDING'		=> '<strong>Users requested to join group “%1$s” and need to be approved</strong><br>» %2$s',
+
+	'LOG_IMAGE_GENERATION_ERROR'	=> '<strong>Error while creating image</strong><br>» Error in %1$s on line %2$s: %3$s',
+
+	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br>» %s',
+	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br>» %s',
+	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder emails to inactive users</strong><br>» %s',
 	'LOG_INSTALL_CONVERTED'	=> '<strong>Converted from %1$s to phpBB %2$s</strong>',
 	'LOG_INSTALL_INSTALLED'	=> '<strong>Installed phpBB %s</strong>',
 
-	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
+	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br>»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
 
 	'LOG_JAB_CHANGED'			=> '<strong>Jabber account changed</strong>',
 	'LOG_JAB_PASSCHG'			=> '<strong>Jabber password changed</strong>',
 	'LOG_JAB_REGISTER'			=> '<strong>Jabber account registered</strong>',
 	'LOG_JAB_SETTINGS_CHANGED'	=> '<strong>Jabber settings changed</strong>',
 
-	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br />» %s',
-
-	'LOG_MASS_EMAIL'		=> '<strong>Sent mass email</strong><br />» %s',
-
-	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s',
-
-	'LOG_MODULE_DISABLE'	=> '<strong>Module disabled</strong><br />» %s',
-	'LOG_MODULE_ENABLE'		=> '<strong>Module enabled</strong><br />» %s',
-	'LOG_MODULE_MOVE_DOWN'	=> '<strong>Module moved down</strong><br />» %1$s below %2$s',
-	'LOG_MODULE_MOVE_UP'	=> '<strong>Module moved up</strong><br />» %1$s above %2$s',
-	'LOG_MODULE_REMOVED'	=> '<strong>Module removed</strong><br />» %s',
-	'LOG_MODULE_ADD'		=> '<strong>Module added</strong><br />» %s',
-	'LOG_MODULE_EDIT'		=> '<strong>Module edited</strong><br />» %s',
-
-	'LOG_A_ROLE_ADD'		=> '<strong>Admin role added</strong><br />» %s',
-	'LOG_A_ROLE_EDIT'		=> '<strong>Admin role edited</strong><br />» %s',
-	'LOG_A_ROLE_REMOVED'	=> '<strong>Admin role removed</strong><br />» %s',
-	'LOG_F_ROLE_ADD'		=> '<strong>Forum role added</strong><br />» %s',
-	'LOG_F_ROLE_EDIT'		=> '<strong>Forum role edited</strong><br />» %s',
-	'LOG_F_ROLE_REMOVED'	=> '<strong>Forum role removed</strong><br />» %s',
-	'LOG_M_ROLE_ADD'		=> '<strong>Moderator role added</strong><br />» %s',
-	'LOG_M_ROLE_EDIT'		=> '<strong>Moderator role edited</strong><br />» %s',
-	'LOG_M_ROLE_REMOVED'	=> '<strong>Moderator role removed</strong><br />» %s',
-	'LOG_U_ROLE_ADD'		=> '<strong>User role added</strong><br />» %s',
-	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br />» %s',
-	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br />» %s',
-
-	'LOG_PLUPLOAD_TIDY_FAILED'		=> '<strong>Unable to open %1$s for tidying, check permissions.</strong><br />Exception: %2$s<br />Trace: %3$s',
-
-	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br />» %s',
-	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_EDIT'		=> '<strong>Profile field changed</strong><br />» %s',
-	'LOG_PROFILE_FIELD_REMOVED'		=> '<strong>Profile field removed</strong><br />» %s',
-
-	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
-	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
-	'LOG_PRUNE_SHADOW'		=> '<strong>Auto-pruned shadow topics</strong><br />» %s',
-	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
+	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br>» %s',
+	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br>» %s',
+	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br>» %s',
+	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br>» %s',
+	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br>» %s',
+
+	'LOG_MASS_EMAIL'		=> '<strong>Sent mass email</strong><br>» %s',
+
+	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br>» from %2$s to %3$s',
+
+	'LOG_MODULE_DISABLE'	=> '<strong>Module disabled</strong><br>» %s',
+	'LOG_MODULE_ENABLE'		=> '<strong>Module enabled</strong><br>» %s',
+	'LOG_MODULE_MOVE_DOWN'	=> '<strong>Module moved down</strong><br>» %1$s below %2$s',
+	'LOG_MODULE_MOVE_UP'	=> '<strong>Module moved up</strong><br>» %1$s above %2$s',
+	'LOG_MODULE_REMOVED'	=> '<strong>Module removed</strong><br>» %s',
+	'LOG_MODULE_ADD'		=> '<strong>Module added</strong><br>» %s',
+	'LOG_MODULE_EDIT'		=> '<strong>Module edited</strong><br>» %s',
+
+	'LOG_A_ROLE_ADD'		=> '<strong>Admin role added</strong><br>» %s',
+	'LOG_A_ROLE_EDIT'		=> '<strong>Admin role edited</strong><br>» %s',
+	'LOG_A_ROLE_REMOVED'	=> '<strong>Admin role removed</strong><br>» %s',
+	'LOG_F_ROLE_ADD'		=> '<strong>Forum role added</strong><br>» %s',
+	'LOG_F_ROLE_EDIT'		=> '<strong>Forum role edited</strong><br>» %s',
+	'LOG_F_ROLE_REMOVED'	=> '<strong>Forum role removed</strong><br>» %s',
+	'LOG_M_ROLE_ADD'		=> '<strong>Moderator role added</strong><br>» %s',
+	'LOG_M_ROLE_EDIT'		=> '<strong>Moderator role edited</strong><br>» %s',
+	'LOG_M_ROLE_REMOVED'	=> '<strong>Moderator role removed</strong><br>» %s',
+	'LOG_U_ROLE_ADD'		=> '<strong>User role added</strong><br>» %s',
+	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br>» %s',
+	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br>» %s',
+
+	'LOG_PLUPLOAD_TIDY_FAILED'		=> '<strong>Unable to open %1$s for tidying, check permissions.</strong><br>Exception: %2$s<br>Trace: %3$s',
+
+	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br>» %s',
+	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br>» %s',
+	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br>» %s',
+	'LOG_PROFILE_FIELD_EDIT'		=> '<strong>Profile field changed</strong><br>» %s',
+	'LOG_PROFILE_FIELD_REMOVED'		=> '<strong>Profile field removed</strong><br>» %s',
+
+	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br>» %s',
+	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br>» %s',
+	'LOG_PRUNE_SHADOW'		=> '<strong>Auto-pruned shadow topics</strong><br>» %s',
+	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br>» %s',
+	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br>» %s',
+	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br>» %s',
 
 	'LOG_PURGE_CACHE'			=> '<strong>Purged cache</strong>',
 	'LOG_PURGE_SESSIONS'		=> '<strong>Purged sessions</strong>',
 
-	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br />» %s',
-	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br />» %s',
-	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br />» %s',
-
-	'LOG_REASON_ADDED'		=> '<strong>Added report/denial reason</strong><br />» %s',
-	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
-	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
+	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br>» %s',
+	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br>» %s',
+	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br>» %s',
+
+	'LOG_REASON_ADDED'		=> '<strong>Added report/denial reason</strong><br>» %s',
+	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br>» %s',
+	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br>» %s',
 
-	'LOG_REFERER_INVALID'		=> '<strong>Referrer validation failed</strong><br />»Referrer was “<em>%1$s</em>”. The request was rejected and the session killed.',
+	'LOG_REFERER_INVALID'		=> '<strong>Referrer validation failed</strong><br>»Referrer was “<em>%1$s</em>”. The request was rejected and the session killed.',
 	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
 	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
 	'LOG_RESYNC_FILES_STATS'	=> '<strong>File statistics resynchronised</strong>',
@@ -704,92 +704,92 @@
 	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
 	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
 
-	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br />» %s',
-	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br />» %s',
-	'LOG_SPHINX_ERROR'			=> '<strong>Sphinx Error</strong><br />» %s',
-	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br />» %s',
-	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br />» %s',
-	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
-	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
+	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br>» %s',
+	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br>» %s',
+	'LOG_SPHINX_ERROR'			=> '<strong>Sphinx Error</strong><br>» %s',
+	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br>» %s',
+	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br>» %s',
+	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br>» %s',
+	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br>» %s',
 
 	// @deprecated 3.1
-	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br />» %s',
+	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br>» %s',
 	// @deprecated 3.1
-	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br />» %s',
-	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br />» %s',
-	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br />» %s',
-	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br />» %s',
+	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br>» %s',
+	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br>» %2$s',
+	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br>» %s',
+	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br>» %2$s',
+	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br>» %s',
+	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br>» %s',
 	// @deprecated 3.1
-	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br />» %s',
+	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br>» %s',
 
 	// @deprecated 3.1
-	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br />» %s',
+	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br>» %s',
 	// @deprecated 3.1
-	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br />» %s',
-	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br />» %s',
-	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br />» %s',
+	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br>» %s',
+	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br>» %s',
+	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br>» %s',
 	'LOG_THEME_EDIT'			=> '<strong>Edited theme <em>%1$s</em></strong>',
-	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>',
-	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br />» %s',
+	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br>» Modified file <em>%2$s</em>',
+	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br>» %s',
 	// @deprecated 3.1
-	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br />» %s',
+	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br>» %s',
 
 	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
 	'LOG_UPDATE_PHPBB'		=> '<strong>Updated phpBB from version %1$s to version %2$s</strong>',
 
-	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br />» %s',
-	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned email via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br />» %s',
-	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br />» %s',
-	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br />» %s',
-	'LOG_USER_DEL_OUTBOX'	=> '<strong>Emptied user outbox</strong><br />» %s',
-	'LOG_USER_DEL_POSTS'	=> '<strong>Removed all posts made by the user</strong><br />» %s',
-	'LOG_USER_DEL_SIG'		=> '<strong>Removed user signature</strong><br />» %s',
-	'LOG_USER_INACTIVE'		=> '<strong>User deactivated</strong><br />» %s',
-	'LOG_USER_MOVE_POSTS'	=> '<strong>Moved user posts</strong><br />» posts by “%1$s” to forum “%2$s”',
-	'LOG_USER_NEW_PASSWORD'	=> '<strong>Changed user password</strong><br />» %s',
-	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br />» %s',
-	'LOG_USER_REMOVED_NR'	=> '<strong>Removed newly registered flag from user</strong><br />» %s',
-
-	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed email</strong><br />» from “%2$s” to “%3$s”',
-	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br />» from “%1$s” to “%2$s”',
-	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br />» %s',
+	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br>» %s',
+	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned email via user management</strong> for reason “<em>%1$s</em>”<br>» %2$s',
+	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br>» %s',
+	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br>» %s',
+	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br>» %s',
+	'LOG_USER_DEL_OUTBOX'	=> '<strong>Emptied user outbox</strong><br>» %s',
+	'LOG_USER_DEL_POSTS'	=> '<strong>Removed all posts made by the user</strong><br>» %s',
+	'LOG_USER_DEL_SIG'		=> '<strong>Removed user signature</strong><br>» %s',
+	'LOG_USER_INACTIVE'		=> '<strong>User deactivated</strong><br>» %s',
+	'LOG_USER_MOVE_POSTS'	=> '<strong>Moved user posts</strong><br>» posts by “%1$s” to forum “%2$s”',
+	'LOG_USER_NEW_PASSWORD'	=> '<strong>Changed user password</strong><br>» %s',
+	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br>» %s',
+	'LOG_USER_REMOVED_NR'	=> '<strong>Removed newly registered flag from user</strong><br>» %s',
+
+	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed email</strong><br>» from “%2$s” to “%3$s”',
+	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br>» from “%1$s” to “%2$s”',
+	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br>» %s',
 
 	'LOG_USER_ACTIVE_USER'		=> '<strong>User account activated</strong>',
 	'LOG_USER_DEL_AVATAR_USER'	=> '<strong>User avatar removed</strong>',
 	'LOG_USER_DEL_SIG_USER'		=> '<strong>User signature removed</strong>',
-	'LOG_USER_FEEDBACK'			=> '<strong>Added user feedback</strong><br />» %s',
-	'LOG_USER_GENERAL'			=> '<strong>Entry added:</strong><br />» %s',
+	'LOG_USER_FEEDBACK'			=> '<strong>Added user feedback</strong><br>» %s',
+	'LOG_USER_GENERAL'			=> '<strong>Entry added:</strong><br>» %s',
 	'LOG_USER_INACTIVE_USER'	=> '<strong>User account de-activated</strong>',
-	'LOG_USER_LOCK'				=> '<strong>User locked own topic</strong><br />» %s',
+	'LOG_USER_LOCK'				=> '<strong>User locked own topic</strong><br>» %s',
 	'LOG_USER_MOVE_POSTS_USER'	=> '<strong>Moved all posts to forum</strong>» %s',
 	'LOG_USER_REACTIVATE_USER'	=> '<strong>Forced user account reactivation</strong>',
-	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br />» %s',
-	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br />» %s',
-	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br />» %s',
-
-	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br />» %s',
-	'LOG_USER_GROUP_DEMOTE'			=> '<strong>User demoted as leaders from usergroup</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN'			=> '<strong>User joined group</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br />» %s',
-	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
+	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br>» %s',
+	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br>» %s',
+	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br>» %s',
+
+	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br>» %s',
+	'LOG_USER_GROUP_DEMOTE'			=> '<strong>User demoted as leaders from usergroup</strong><br>» %s',
+	'LOG_USER_GROUP_JOIN'			=> '<strong>User joined group</strong><br>» %s',
+	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br>» %s',
+	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br>» %s',
 
-	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br />» %s',
+	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br>» %s',
 	'LOG_WARNINGS_DELETED'		=> array(
-		1 => '<strong>Deleted user warning</strong><br />» %1$s',
-		2 => '<strong>Deleted %2$d user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+		1 => '<strong>Deleted user warning</strong><br>» %1$s',
+		2 => '<strong>Deleted %2$d user warnings</strong><br>» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br>» username'
 	),
-	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br />» %s',
+	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br>» %s',
 
-	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
-	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
-	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
-
-	'LOG_EXT_ENABLE'	=> '<strong>Extension enabled</strong><br />» %s',
-	'LOG_EXT_DISABLE'	=> '<strong>Extension disabled</strong><br />» %s',
-	'LOG_EXT_PURGE'		=> '<strong>Extension’s data deleted</strong><br />» %s',
+	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br>» %s',
+	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br>» %s',
+	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br>» %s',
+
+	'LOG_EXT_ENABLE'	=> '<strong>Extension enabled</strong><br>» %s',
+	'LOG_EXT_DISABLE'	=> '<strong>Extension disabled</strong><br>» %s',
+	'LOG_EXT_PURGE'		=> '<strong>Extension’s data deleted</strong><br>» %s',
 ));
diff -Naur phpbb-3.1.0-RC4/language/en/acp/database.php phpbb-3.1.0-RC4-HTML5/language/en/acp/database.php
--- phpbb-3.1.0-RC4/language/en/acp/database.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/database.php	2014-09-21 12:00:00.000000000 +0200
@@ -61,7 +61,7 @@
 	'RESTORE_FAILURE'		=> 'The backup file may be corrupt.',
 	'RESTORE_OPTIONS'		=> 'Restore options',
 	'RESTORE_SELECTED_BACKUP'	=> 'Are you sure you want to restore the selected backup?',
-	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
+	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br><br>Your board should be back to the state it was when the backup was made.',
 
 	'SELECT_ALL'			=> 'Select all',
 	'SELECT_FILE'			=> 'Select a file',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/extensions.php phpbb-3.1.0-RC4-HTML5/language/en/acp/extensions.php
--- phpbb-3.1.0-RC4/language/en/acp/extensions.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/extensions.php	2014-09-21 12:00:00.000000000 +0200
@@ -39,7 +39,7 @@
 	'EXTENSIONS'				=> 'Extensions',
 	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID_LIST'	=> 'The “%s” extension is not valid.<br />%s<br /><br />',
+	'EXTENSION_INVALID_LIST'	=> 'The “%s” extension is not valid.<br>%s<br><br>',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 	'EXTENSION_DIR_INVALID'		=> 'The selected extension has an invalid directory structure and cannot be enabled.',
 	'EXTENSION_NOT_ENABLEABLE'	=> 'The selected extension cannot be enabled, please verify the extension’s requirements.',
@@ -82,7 +82,7 @@
 			<li>Delete the extension’s files from the filesystem</li>
 		</ol>',
 
-	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
+	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br><br>This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
 	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
 	'EXTENSION_FORCE_UNSTABLE_CONFIRM'	=> 'Are you sure that you wish to force the use of unstable version?',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/language.php phpbb-3.1.0-RC4-HTML5/language/en/acp/language.php
--- phpbb-3.1.0-RC4/language/en/acp/language.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/language.php	2014-09-21 12:00:00.000000000 +0200
@@ -66,7 +66,7 @@
 
 	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
 	'NO_LANG_ID'					=> 'You haven’t specified a language pack.',
-	'NO_REMOVE_DEFAULT_LANG'		=> 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your board’s default language first.',
+	'NO_REMOVE_DEFAULT_LANG'		=> 'You are not able to remove the default language pack.<br>If you want to remove this language pack, change your board’s default language first.',
 	'NO_UNINSTALLED_LANGUAGE_PACKS'	=> 'No uninstalled language packs',
 
 	'THOSE_MISSING_LANG_FILES'			=> 'The following language files are missing from the “%s” language folder',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/permissions.php phpbb-3.1.0-RC4-HTML5/language/en/acp/permissions.php
--- phpbb-3.1.0-RC4/language/en/acp/permissions.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/permissions.php	2014-09-21 12:00:00.000000000 +0200
@@ -52,7 +52,7 @@
 		<h2>Permission Masks</h2>
 		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
 
-		<br />
+		<br>
 
 		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="https://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
 	',
@@ -185,11 +185,11 @@
 	'ROLE_USER_NEW_MEMBER'		=> 'Newly Registered User Features',
 
 	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',
-	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br />Not recommended.',
+	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br>Not recommended.',
 	'ROLE_DESCRIPTION_ADMIN_STANDARD'		=> 'Has access to most administrative features but is not allowed to use server or system related tools.',
 	'ROLE_DESCRIPTION_ADMIN_USERGROUP'		=> 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.',
 	'ROLE_DESCRIPTION_FORUM_BOT'			=> 'This role is recommended for bots and search spiders.',
-	'ROLE_DESCRIPTION_FORUM_FULL'			=> 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
+	'ROLE_DESCRIPTION_FORUM_FULL'			=> 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br>Not recommended for normal users.',
 	'ROLE_DESCRIPTION_FORUM_LIMITED'		=> 'Can use some forum features, but cannot attach files or use post icons.',
 	'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS'	=> 'As per Limited Access but can also create polls.',
 	'ROLE_DESCRIPTION_FORUM_NOACCESS'		=> 'Can neither see nor access the forum.',
@@ -202,7 +202,7 @@
 	'ROLE_DESCRIPTION_MOD_QUEUE'			=> 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
 	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
 	'ROLE_DESCRIPTION_MOD_STANDARD'			=> 'Can use most moderating tools, but cannot ban users or change the post author.',
-	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
+	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br>Not recommended.',
 	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, emails, or instant messages are not allowed.',
 	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
 	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/permissions_phpbb.php phpbb-3.1.0-RC4-HTML5/language/en/acp/permissions_phpbb.php
--- phpbb-3.1.0-RC4/language/en/acp/permissions_phpbb.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/permissions_phpbb.php	2014-09-21 12:00:00.000000000 +0200
@@ -123,9 +123,9 @@
 	'ACL_F_REPLY'		=> 'Can reply to topics',
 	'ACL_F_EDIT'		=> 'Can edit own posts',
 	'ACL_F_DELETE'		=> 'Can permanently delete own posts',
-	'ACL_F_SOFTDELETE'	=> 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_F_SOFTDELETE'	=> 'Can soft delete own posts<br><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
 	'ACL_F_IGNOREFLOOD' => 'Can ignore flood limit',
-	'ACL_F_POSTCOUNT'	=> 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>',
+	'ACL_F_POSTCOUNT'	=> 'Increment post counter<br><em>Please note that this setting only affects new posts.</em>',
 	'ACL_F_NOAPPROVE'	=> 'Can post without approval',
 
 	'ACL_F_ATTACH'		=> 'Can attach files',
@@ -145,7 +145,7 @@
 $lang = array_merge($lang, array(
 	'ACL_M_EDIT'		=> 'Can edit posts',
 	'ACL_M_DELETE'		=> 'Can permanently delete posts',
-	'ACL_M_SOFTDELETE'	=> 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_M_SOFTDELETE'	=> 'Can soft delete posts<br><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
 	'ACL_M_APPROVE'		=> 'Can approve and restore posts',
 	'ACL_M_REPORT'		=> 'Can close and delete reports',
 	'ACL_M_CHGPOSTER'	=> 'Can change post author',
@@ -156,8 +156,8 @@
 	'ACL_M_MERGE'	=> 'Can merge topics',
 
 	'ACL_M_INFO'	=> 'Can view post details',
-	'ACL_M_WARN'	=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
-	'ACL_M_BAN'		=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_WARN'	=> 'Can issue warnings<br><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_BAN'		=> 'Can manage bans<br><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
 ));
 
 // Admin Permissions
@@ -177,7 +177,7 @@
 	'ACL_A_BBCODE'		=> 'Can define BBCode tags',
 	'ACL_A_ATTACH'		=> 'Can alter attachment related settings',
 
-	'ACL_A_USER'		=> 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>',
+	'ACL_A_USER'		=> 'Can manage users<br><em>This also includes seeing the users browser agent within the viewonline list.</em>',
 	'ACL_A_USERDEL'		=> 'Can delete/prune users',
 	'ACL_A_GROUP'		=> 'Can manage groups',
 	'ACL_A_GROUPADD'	=> 'Can add new groups',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/posting.php phpbb-3.1.0-RC4-HTML5/language/en/acp/posting.php
--- phpbb-3.1.0-RC4/language/en/acp/posting.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/posting.php	2014-09-21 12:00:00.000000000 +0200
@@ -61,19 +61,19 @@
 	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
 	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
 	'BBCODE_USAGE'				=> 'BBCode usage',
-	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
+	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br><br>[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
 	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
 
 	'EXAMPLE'						=> 'Example:',
 	'EXAMPLES'						=> 'Examples:',
 
 	'HTML_REPLACEMENT'				=> 'HTML replacement',
-	'HTML_REPLACEMENT_EXAMPLE'		=> '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family: {SIMPLETEXT1};"&gt;{SIMPLETEXT2}&lt;/span&gt;',
+	'HTML_REPLACEMENT_EXAMPLE'		=> '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br><br>&lt;span style="font-family: {SIMPLETEXT1};"&gt;{SIMPLETEXT2}&lt;/span&gt;',
 	'HTML_REPLACEMENT_EXPLAIN'		=> 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!',
 
 	'TOKEN'					=> 'Token',
 	'TOKENS'				=> 'Tokens',
-	'TOKENS_EXPLAIN'		=> 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as “wrote” or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
+	'TOKENS_EXPLAIN'		=> 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br><br>Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as “wrote” or its translation according to user’s locale.<br><br><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
 	'TOKEN_DEFINITION'		=> 'What can it be?',
 	'TOO_MANY_BBCODES'		=> 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
 
diff -Naur phpbb-3.1.0-RC4/language/en/acp/profile.php phpbb-3.1.0-RC4-HTML5/language/en/acp/profile.php
--- phpbb-3.1.0-RC4/language/en/acp/profile.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/profile.php	2014-09-21 12:00:00.000000000 +0200
@@ -152,7 +152,7 @@
 	'STEP_1_TITLE_CREATE'			=> 'Add profile field',
 	'STEP_1_TITLE_EDIT'				=> 'Edit profile field',
 	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options you may want to adjust.',
-	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
+	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options.<br><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
 	'STEP_2_TITLE_CREATE'			=> 'Profile type specific options',
 	'STEP_2_TITLE_EDIT'				=> 'Profile type specific options',
 	'STEP_3_EXPLAIN_CREATE'			=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/search.php phpbb-3.1.0-RC4-HTML5/language/en/acp/search.php
--- phpbb-3.1.0-RC4/language/en/acp/search.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/search.php	2014-09-21 12:00:00.000000000 +0200
@@ -110,13 +110,13 @@
 	'SEARCH_GUEST_INTERVAL'					=> 'Guest search flood interval',
 	'SEARCH_GUEST_INTERVAL_EXPLAIN'			=> 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
 	'SEARCH_INDEX_CREATE_REDIRECT'			=> array(
-		2	=> 'All posts up to post id %2$d have now been indexed, of which %1$d posts were within this step.<br />',
+		2	=> 'All posts up to post id %2$d have now been indexed, of which %1$d posts were within this step.<br>',
 	),
 	'SEARCH_INDEX_CREATE_REDIRECT_RATE'		=> array(
-		2	=> 'The current rate of indexing is approximately %1$.1f posts per second.<br />Indexing in progress…',
+		2	=> 'The current rate of indexing is approximately %1$.1f posts per second.<br>Indexing in progress…',
 	),
 	'SEARCH_INDEX_DELETE_REDIRECT'			=> array(
-		2	=> 'All posts up to post id %2$d have been removed from the search index.<br />Deleting in progress…',
+		2	=> 'All posts up to post id %2$d have been removed from the search index.<br>Deleting in progress…',
 	),
 	'SEARCH_INDEX_CREATED'					=> 'Successfully indexed all posts in the board database.',
 	'SEARCH_INDEX_REMOVED'					=> 'Successfully deleted the search index for this backend.',
diff -Naur phpbb-3.1.0-RC4/language/en/acp/styles.php phpbb-3.1.0-RC4-HTML5/language/en/acp/styles.php
--- phpbb-3.1.0-RC4/language/en/acp/styles.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/acp/styles.php	2014-09-21 12:00:00.000000000 +0200
@@ -52,7 +52,7 @@
 	'INHERITING_FROM'			=> 'Inherits from',
 	'INSTALL_STYLE'				=> 'Install style',
 	'INSTALL_STYLES'			=> 'Install styles',
-	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br />If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.',
+	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br>If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.',
 	'INVALID_STYLE_ID'			=> 'Invalid style ID.',
 
 	'NO_MATCHING_STYLES_FOUND'	=> 'No styles match your query.',
diff -Naur phpbb-3.1.0-RC4/language/en/common.php phpbb-3.1.0-RC4-HTML5/language/en/common.php
--- phpbb-3.1.0-RC4/language/en/common.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/common.php	2014-09-21 12:00:00.000000000 +0200
@@ -107,8 +107,8 @@
 	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
 	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
 	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
-	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
-	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
+	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br>The maximum allowed filesize set in php.ini could not be determined.',
+	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br>Please note this is set in php.ini and cannot be overridden.',
 	'AVATAR_REMOTE_UPLOAD_TIMEOUT'		=> 'The specified avatar could not be uploaded because the request timed out.',
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
 	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
@@ -123,9 +123,9 @@
 	'BBCODE_GUIDE'			=> 'BBCode guide',
 	'BCC'					=> 'BCC',
 	'BIRTHDAYS'				=> 'Birthdays',
-	'BOARD_BAN_PERM'		=> 'You have been <strong>permanently</strong> banned from this board.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
+	'BOARD_BAN_PERM'		=> 'You have been <strong>permanently</strong> banned from this board.<br><br>Please contact the %2$sBoard Administrator%3$s for more information.',
 	'BOARD_BAN_REASON'		=> 'Reason given for ban: <strong>%s</strong>',
-	'BOARD_BAN_TIME'		=> 'You have been banned from this board until <strong>%1$s</strong>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
+	'BOARD_BAN_TIME'		=> 'You have been banned from this board until <strong>%1$s</strong>.<br><br>Please contact the %2$sBoard Administrator%3$s for more information.',
 	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
 	'BOARD_DISABLED'		=> 'This board is currently disabled.',
 	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
diff -Naur phpbb-3.1.0-RC4/language/en/help_bbcode.php phpbb-3.1.0-RC4-HTML5/language/en/help_bbcode.php
--- phpbb-3.1.0-RC4/language/en/help_bbcode.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/help_bbcode.php	2014-09-21 12:00:00.000000000 +0200
@@ -45,15 +45,15 @@
 	),
 	array(
 		0 => 'How to create bold, italic and underlined text',
-		1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <strong>[b][/b]</strong>, e.g. <br /><br /><strong>[b]</strong>Hello<strong>[/b]</strong><br /><br />will become <strong>Hello</strong></li><li>For underlining use <strong>[u][/u]</strong>, for example:<br /><br /><strong>[u]</strong>Good Morning<strong>[/u]</strong><br /><br />becomes <span style="text-decoration: underline">Good Morning</span></li><li>To italicise text use <strong>[i][/i]</strong>, e.g.<br /><br />This is <strong>[i]</strong>Great!<strong>[/i]</strong><br /><br />would give This is <i>Great!</i></li></ul>'
+		1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <strong>[b][/b]</strong>, e.g. <br><br><strong>[b]</strong>Hello<strong>[/b]</strong><br><br>will become <strong>Hello</strong></li><li>For underlining use <strong>[u][/u]</strong>, for example:<br><br><strong>[u]</strong>Good Morning<strong>[/u]</strong><br><br>becomes <span style="text-decoration: underline">Good Morning</span></li><li>To italicise text use <strong>[i][/i]</strong>, e.g.<br><br>This is <strong>[i]</strong>Great!<strong>[/i]</strong><br><br>would give This is <i>Great!</i></li></ul>'
 	),
 	array(
 		0 => 'How to change the text colour or size',
-		1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />Both will output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:<br /><br /><strong>[size=30]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:30%;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=200]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:200%;">HUGE!</span></li></ul>'
+		1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:<br><br><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br><br>or<br><br><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br><br>Both will output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:<br><br><strong>[size=30]</strong>SMALL<strong>[/size]</strong><br><br>will generally be <span style="font-size:30%;">SMALL</span><br><br>whereas:<br><br><strong>[size=200]</strong>HUGE!<strong>[/size]</strong><br><br>will be <span style="font-size:200%;">HUGE!</span></li></ul>'
 	),
 	array(
 		0 => 'Can I combine formatting tags?',
-		1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
+		1 => 'Yes, of course you can, for example to get someones attention you may write:<br><br><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br><br>this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br><br>We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br><br><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
 	),
 	array(
 		0 => '--',
@@ -61,11 +61,11 @@
 	),
 	array(
 		0 => 'Quoting text in replies',
-		1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>'
+		1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br><br><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br><br>The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>'
 	),
 	array(
 		0 => 'Outputting code or fixed width data',
-		1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.'
+		1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br><br><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br><br>All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.'
 	),
 	array(
 		0 => '--',
@@ -73,11 +73,11 @@
 	),
 	array(
 		0 => 'Creating an Unordered list',
-		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
+		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br><br><strong>[list]</strong><br><strong>[*]</strong>Red<br><strong>[*]</strong>Blue<br><strong>[*]</strong>Yellow<br><strong>[/list]</strong><br><br>This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
 	),
 	array(
 		0 => 'Creating an Ordered list',
-		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
+		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br><br><strong>[list=1]</strong><br><strong>[*]</strong>Go to the shops<br><strong>[*]</strong>Buy a new computer<br><strong>[*]</strong>Swear at computer when it crashes<br><strong>[/list]</strong><br><br>will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br><br><strong>[list=a]</strong><br><strong>[*]</strong>The first possible answer<br><strong>[*]</strong>The second possible answer<br><strong>[*]</strong>The third possible answer<br><strong>[/list]</strong><br><br>giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
 	),
 	// This block will switch the FAQ-Questions to the second template column
 	array(
@@ -90,7 +90,7 @@
 	),
 	array(
 		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br><br><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br><br>This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br><br><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br><br>This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br><br><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br><br>which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br><br><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br><br>is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
 	),
 	array(
 		0 => '--',
@@ -98,7 +98,7 @@
 	),
 	array(
 		0 => 'Adding an image to a post',
-		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>'
+		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br><br><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br><br>As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br><br><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br><br>would generate:<br><br><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt=""></a>'
 	),
 	array(
 		0 => 'Adding attachments into a post',
diff -Naur phpbb-3.1.0-RC4/language/en/install.php phpbb-3.1.0-RC4-HTML5/language/en/install.php
--- phpbb-3.1.0-RC4/language/en/install.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/install.php	2014-09-21 12:00:00.000000000 +0200
@@ -45,7 +45,7 @@
 	'ADMIN_USERNAME'			=> 'Administrator username',
 	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
 	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
-	'AUTHOR_NOTES'				=> 'Author notes<br />» %s',
+	'AUTHOR_NOTES'				=> 'Author notes<br>» %s',
 	'AVAILABLE'					=> 'Available',
 	'AVAILABLE_CONVERTORS'		=> 'Available convertors',
 
@@ -117,8 +117,8 @@
 	'CONV_OPTIONS_BODY'					=> 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
 	'CONV_SAVED_MESSAGES'				=> 'Saved messages',
 
-	'COULD_NOT_COPY'			=> 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br /><br />Please check that the target directory exists and is writable by the webserver.',
-	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br />» %s was specified as the source path.',
+	'COULD_NOT_COPY'			=> 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br><br>Please check that the target directory exists and is writable by the webserver.',
+	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br>» %s was specified as the source path.',
 
 	'DBMS'						=> 'Database type',
 	'DB_CONFIG'					=> 'Database configuration',
@@ -271,12 +271,12 @@
 	'MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion',
 	'MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.',
 
-	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
-	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
+	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br>»<strong>%s</strong>.',
+	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br>»<strong>%s</strong>.',
 
-	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
+	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br><strong>Before you proceed the update, you need to upgrade the schema.</strong><br><br>Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
 
-	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
+	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br><br>%s',
 	'NEXT_STEP'					=> 'Proceed to next step',
 	'NOT_FOUND'					=> 'Cannot find',
 	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s (“%s”)',
@@ -285,7 +285,7 @@
 	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
 	'NO_TABLES_FOUND'			=> 'No tables found.',
 
-	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
+	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br><br>phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br><br>This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br><br>To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
 
 	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
 	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
@@ -345,17 +345,17 @@
 	'SUB_LICENSE'				=> 'License',
 	'SUB_SUPPORT'				=> 'Support',
 	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/documentation/3.1/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
+	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br>For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br><br>If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br><a href="https://www.phpbb.com/support/">Support Section</a><br><a href="https://www.phpbb.com/support/documentation/3.1/quickstart/">Quick Start Guide</a><br><br>To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br><br>',
 	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
 	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
 	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
 	'SYNC_TOPICS'				=> 'Starting to synchronise topics',
 	'SYNC_TOPIC_ID'				=> 'Synchronising topics from <var>topic_id</var> %1$s to %2$s.',
 
-	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
+	'TABLES_MISSING'			=> 'Could not find these tables<br>» <strong>%s</strong>.',
 	'TABLE_PREFIX'				=> 'Prefix for tables in database',
 	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with a letter and must only contain letters, numbers and underscores.',
-	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
+	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br>» Specified table prefix was %s.',
 	'TESTS_PASSED'				=> 'Tests passed',
 	'TESTS_FAILED'				=> 'Tests failed',
 
@@ -466,7 +466,7 @@
 	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (removes modified code within conflicting block)',
 	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
 	'MERGING_FILES'				=> 'Merging differences',
-	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
+	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br><br>Please wait until phpBB has completed all operations on changed files.',
 
 	'NEW_FILE'						=> 'End of Conflict',
 	'NEW_USERNAME'					=> 'New username',
@@ -474,14 +474,14 @@
 	'NO_ERRORS'						=> 'No errors',
 	'NO_UPDATE_FILES'				=> 'Not updating the following files',
 	'NO_UPDATE_FILES_EXPLAIN'		=> 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.',
-	'NO_UPDATE_FILES_OUTDATED'		=> 'No valid update directory was found, please make sure you uploaded the relevant files.<br /><br />Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="https://www.phpbb.com/downloads/" rel="external">https://www.phpbb.com/downloads/</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
+	'NO_UPDATE_FILES_OUTDATED'		=> 'No valid update directory was found, please make sure you uploaded the relevant files.<br><br>Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="https://www.phpbb.com/downloads/" rel="external">https://www.phpbb.com/downloads/</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
 	'NO_UPDATE_FILES_UP_TO_DATE'	=> 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.',
 	'NO_UPDATE_INFO'				=> 'Update file information could not be found.',
 	'NO_UPDATES_REQUIRED'			=> 'No updates required',
 	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
 	'NOTICE'						=> 'Notice',
 	'NUM_CONFLICTS'					=> 'Number of conflicts',
-	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences from %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
+	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences from %1$d of %2$d files have been checked.<br>Please wait until all files are checked.',
 
 	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
 
@@ -521,7 +521,7 @@
 	'STATUS_UP_TO_DATE'			=> 'Already updated file',
 
 	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
-	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
+	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br>This method always works and is also the recommended update path.',
 	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
 
 	'UPDATE_COMPLETED'				=> 'Update completed',
@@ -531,28 +531,28 @@
 	'UPDATE_FILES'					=> 'Update files',
 	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
-	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
+	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br>During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br><br>The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br><br>',
 	'UPDATE_INSTRUCTIONS'			=> '
 
 		<h1>Release announcement</h1>
 
 		<p>Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
 
-		<br />
+		<br>
 
 		<h1>How to update your installation with the Automatic Update Package</h1>
 
 		<p>The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:</p>
 
 		<ul style="margin-left: 20px; font-size: 1.1em;">
-			<li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
-			<li>Unpack the archive.<br /><br /></li>
-			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
+			<li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br><br></li>
+			<li>Unpack the archive.<br><br></li>
+			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br><br></li>
 		</ul>
 
-		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
-		<strong><a href="%1$s" title="%1$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
-		<br />
+		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br><br>
+		<strong><a href="%1$s" title="%1$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br>
+		<br>
 		You will then be guided through the update process. You will be notified once the update is complete.
 		</p>
 	',
@@ -575,7 +575,7 @@
 	'VERSION_CHECK'					=> 'Version check',
 	'VERSION_CHECK_EXPLAIN'			=> 'Checks to see if your phpBB installation is up to date.',
 	'VERSION_NOT_UP_TO_DATE'		=> 'Your phpBB installation is not up to date. Please continue the update process.',
-	'VERSION_NOT_UP_TO_DATE_ACP'	=> 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.',
+	'VERSION_NOT_UP_TO_DATE_ACP'	=> 'Your phpBB installation is not up to date.<br>Below is a link to the release announcement, which contains more information as well as instructions on updating.',
 	'VERSION_NOT_UP_TO_DATE_TITLE'	=> 'Your phpBB installation is not up to date.',
 	'VERSION_UP_TO_DATE'			=> 'Your phpBB installation is up to date. Although there are no updates available at this time, you may continue in order to perform a file validity check.',
 	'VERSION_UP_TO_DATE_ACP'		=> 'Your phpBB installation is up to date. There are no updates available at this time.',
diff -Naur phpbb-3.1.0-RC4/language/en/mcp.php phpbb-3.1.0-RC4-HTML5/language/en/mcp.php
--- phpbb-3.1.0-RC4/language/en/mcp.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/mcp.php	2014-09-21 12:00:00.000000000 +0200
@@ -217,7 +217,7 @@
 	'MCP_WARN_USER'			=> 'Warn user',
 
 	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to move the selected posts?',
-	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can move selected posts into another topic. The posts will be split from this topic and merged into the other topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
+	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can move selected posts into another topic. The posts will be split from this topic and merged into the other topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br>Please enter the destination topic id or click on “Select topic” to search for one.',
 	'MERGE_TOPIC_ID'		=> 'Destination topic identification number',
 	'MERGE_TOPICS'			=> 'Merge topics',
 	'MERGE_TOPICS_CONFIRM'	=> 'Are you sure you want to merge the selected topics?',
diff -Naur phpbb-3.1.0-RC4/language/en/memberlist.php phpbb-3.1.0-RC4-HTML5/language/en/memberlist.php
--- phpbb-3.1.0-RC4/language/en/memberlist.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/memberlist.php	2014-09-21 12:00:00.000000000 +0200
@@ -135,8 +135,8 @@
 	'USER_FORUM'			=> 'User statistics',
 	'USER_LAST_REMINDED'	=> array(
 		0		=> 'No reminder sent at this time',
-		1		=> '%1$d reminder sent<br />» %2$s',
-		2		=> '%1$d reminder sent<br />» %2$s',
+		1		=> '%1$d reminder sent<br>» %2$s',
+		2		=> '%1$d reminder sent<br>» %2$s',
 	),
 	'USER_ONLINE'			=> 'Online',
 	'USER_PRESENCE'			=> 'Board presence',
diff -Naur phpbb-3.1.0-RC4/language/en/posting.php phpbb-3.1.0-RC4-HTML5/language/en/posting.php
--- phpbb-3.1.0-RC4/language/en/posting.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/posting.php	2014-09-21 12:00:00.000000000 +0200
@@ -106,8 +106,8 @@
 	'DISABLE_SMILIES'			=> 'Disable smilies',
 	'DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'DISALLOWED_EXTENSION'		=> 'The extension %s is not allowed.',
-	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
-	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.',
+	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br>Your draft will be deleted after submitting this post.',
+	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br>Your draft will be deleted after submitting this private message.',
 	'DRAFT_SAVED'				=> 'Draft successfully saved.',
 	'DRAFT_TITLE'				=> 'Draft title',
 
@@ -178,8 +178,8 @@
 	'NO_POST_MODE'				=> 'No post mode specified.',
 
 	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
-	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
-	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
+	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br>Could not determine the maximum size defined by PHP in php.ini.',
+	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br>Please note this is set in php.ini and cannot be overridden.',
 	'PLACE_INLINE'				=> 'Place inline',
 	'POLL_DELETE'				=> 'Delete poll',
 	'POLL_FOR'					=> 'Run poll for',
@@ -257,8 +257,8 @@
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-	'UNSUPPORTED_CHARACTERS_MESSAGE'	=> 'Your message contains the following unsupported characters:<br />%s',
-	'UNSUPPORTED_CHARACTERS_SUBJECT'	=> 'Your subject contains the following unsupported characters:<br />%s',
+	'UNSUPPORTED_CHARACTERS_MESSAGE'	=> 'Your message contains the following unsupported characters:<br>%s',
+	'UNSUPPORTED_CHARACTERS_SUBJECT'	=> 'Your subject contains the following unsupported characters:<br>%s',
 	'UPDATE_COMMENT'			=> 'Update comment',
 	'URL_INVALID'				=> 'The URL you specified is invalid.',
 	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
diff -Naur phpbb-3.1.0-RC4/language/en/ucp.php phpbb-3.1.0-RC4-HTML5/language/en/ucp.php
--- phpbb-3.1.0-RC4/language/en/ucp.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/language/en/ucp.php	2014-09-21 12:00:00.000000000 +0200
@@ -38,22 +38,22 @@
 
 // Privacy policy and T&C
 $lang = array_merge($lang, array(
-	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
-	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br />
-	<br />
+	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br>
+	<br>
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br>
+	<br>
 	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
 	',
 
-	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
-	<br />
-	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
-	<br />
-	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
-	<br />
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br />
-	<br />
-	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br />
+	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br>
+	<br>
+	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br>
+	<br>
+	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br>
+	<br>
+	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br>
+	<br>
+	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br>
 	',
 ));
 
@@ -406,7 +406,7 @@
 	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
-	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
+	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br>Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
 	'PM_FROM'					=> 'From',
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
diff -Naur phpbb-3.1.0-RC4/memberlist.php phpbb-3.1.0-RC4-HTML5/memberlist.php
--- phpbb-3.1.0-RC4/memberlist.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/memberlist.php	2014-09-21 12:00:00.000000000 +0200
@@ -1087,7 +1087,7 @@
 
 				if ($rank_img)
 				{
-					$rank_img .= '<br />';
+					$rank_img .= '<br>';
 				}
 			}
 
diff -Naur phpbb-3.1.0-RC4/phpbb/avatar/driver/gravatar.php phpbb-3.1.0-RC4-HTML5/phpbb/avatar/driver/gravatar.php
--- phpbb-3.1.0-RC4/phpbb/avatar/driver/gravatar.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/avatar/driver/gravatar.php	2014-09-21 12:00:00.000000000 +0200
@@ -43,7 +43,7 @@
 		return '<img src="' . $this->get_gravatar_url($row) . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
 			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '">';
 	}
 
 	/**
diff -Naur phpbb-3.1.0-RC4/phpbb/captcha/gd_wave.php phpbb-3.1.0-RC4-HTML5/phpbb/captcha/gd_wave.php
--- phpbb-3.1.0-RC4/phpbb/captcha/gd_wave.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/captcha/gd_wave.php	2014-09-21 12:00:00.000000000 +0200
@@ -253,7 +253,7 @@
 		//$mtime = explode(' ', microtime());
 		//$totaltime = $mtime[0] + $mtime[1] - $starttime;
 
-		//echo $totaltime . "<br />\n";
+		//echo $totaltime . "<br>\n";
 		//echo memory_get_usage() - $tmp;
 		imagepng($img);
 		imagedestroy($img);
diff -Naur phpbb-3.1.0-RC4/phpbb/captcha/plugins/captcha_abstract.php phpbb-3.1.0-RC4-HTML5/phpbb/captcha/plugins/captcha_abstract.php
--- phpbb-3.1.0-RC4/phpbb/captcha/plugins/captcha_abstract.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/captcha/plugins/captcha_abstract.php	2014-09-21 12:00:00.000000000 +0200
@@ -102,8 +102,8 @@
 
 			$template->assign_vars(array(
 				'CONFIRM_IMAGE_LINK'		=> $link,
-				'CONFIRM_IMAGE'				=> '<img src="' . $link . '" />',
-				'CONFIRM_IMG'				=> '<img src="' . $link . '" />',
+				'CONFIRM_IMAGE'				=> '<img src="' . $link . '">',
+				'CONFIRM_IMG'				=> '<img src="' . $link . '">',
 				'CONFIRM_ID'				=> $this->confirm_id,
 				'S_CONFIRM_CODE'			=> true,
 				'S_TYPE'					=> $this->type,
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/driver.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/driver.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/driver.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/driver.php	2014-09-21 12:00:00.000000000 +0200
@@ -808,14 +808,14 @@
 
 		if (!$this->return_on_error)
 		{
-			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
+			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br><br>' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
 
 			// Show complete SQL error and path to administrators only
 			// Additionally show complete error on installation or if extended debug mode is enabled
 			// The DEBUG constant is for development only!
 			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
 			{
-				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
+				$message .= ($sql) ? '<br><br>SQL<br><br>' . htmlspecialchars($sql) : '';
 			}
 			else
 			{
@@ -823,17 +823,17 @@
 				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
 				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
 				{
-					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
+					$message .= '<br><br>An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
 				}
 				else
 				{
 					if (!empty($config['board_contact']))
 					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+						$message .= '<br><br>' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
 					}
 					else
 					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
+						$message .= '<br><br>' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
 					}
 				}
 			}
@@ -898,7 +898,7 @@
 					<head>
 						<meta charset="utf-8">
 						<title>SQL Report</title>
-						<link href="' . htmlspecialchars($phpbb_path_helper->update_web_root_path($phpbb_root_path) . $phpbb_path_helper->get_adm_relative_path()) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+						<link href="' . htmlspecialchars($phpbb_path_helper->update_web_root_path($phpbb_root_path) . $phpbb_path_helper->get_adm_relative_path()) . 'style/admin.css" rel="stylesheet" media="screen">
 					</head>
 					<body id="errorpage">
 					<div id="wrap">
@@ -911,12 +911,12 @@
 								<span class="corners-top"><span></span></span>
 								<div id="content">
 									<h1>SQL Report</h1>
-									<br />
+									<br>
 									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
 
 									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
 
-									<br /><br />
+									<br><br>
 									' . $this->sql_report . '
 								</div>
 								<span class="corners-bottom"><span></span></span>
@@ -972,7 +972,7 @@
 					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
 				}
 
-				$this->sql_report .= '</p><br /><br />';
+				$this->sql_report .= '</p><br><br>';
 
 				$this->sql_time += $endtime - $this->curtime;
 			break;
@@ -1036,7 +1036,7 @@
 				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
 				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
 				$this->sql_report .= '<p style="text-align: center;">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
+				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br><br>';
 
 				// Pad the start time to not interfere with page timing
 				$starttime += $time_db;
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/mssql.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssql.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/mssql.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssql.php	2014-09-21 12:00:00.000000000 +0200
@@ -88,7 +88,7 @@
 			return $this->sql_server_version;
 		}
 
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
+		return ($this->sql_server_version) ? 'MSSQL<br>' . $this->sql_server_version : 'MSSQL';
 	}
 
 	/**
@@ -392,7 +392,7 @@
 				$row = @mssql_fetch_assoc($result_id);
 				if (!empty($row['message']))
 				{
-					$error['message'] .= '<br />' . $row['message'];
+					$error['message'] .= '<br>' . $row['message'];
 				}
 				@mssql_free_result($result_id);
 			}
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/mssql_odbc.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssql_odbc.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/mssql_odbc.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssql_odbc.php	2014-09-21 12:00:00.000000000 +0200
@@ -115,7 +115,7 @@
 			return $this->sql_server_version;
 		}
 
-		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
+		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br>' . $this->sql_server_version : 'MSSQL (ODBC)';
 	}
 
 	/**
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/mssqlnative.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssqlnative.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/mssqlnative.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mssqlnative.php	2014-09-21 12:00:00.000000000 +0200
@@ -79,7 +79,7 @@
 			return $this->sql_server_version;
 		}
 
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
+		return ($this->sql_server_version) ? 'MSSQL<br>' . $this->sql_server_version : 'MSSQL';
 	}
 
 	/**
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/mysql.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mysql.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/mysql.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mysql.php	2014-09-21 12:00:00.000000000 +0200
@@ -430,7 +430,7 @@
 						// get the last profile
 						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
 						{
-							$this->html_hold .= '<br />';
+							$this->html_hold .= '<br>';
 							while ($row = @mysql_fetch_assoc($result))
 							{
 								// make <unknown> HTML safe
diff -Naur phpbb-3.1.0-RC4/phpbb/db/driver/mysqli.php phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mysqli.php
--- phpbb-3.1.0-RC4/phpbb/db/driver/mysqli.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/db/driver/mysqli.php	2014-09-21 12:00:00.000000000 +0200
@@ -418,7 +418,7 @@
 						// get the last profile
 						if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;'))
 						{
-							$this->html_hold .= '<br />';
+							$this->html_hold .= '<br>';
 							while ($row = @mysqli_fetch_assoc($result))
 							{
 								// make <unknown> HTML safe
diff -Naur phpbb-3.1.0-RC4/phpbb/error_collector.php phpbb-3.1.0-RC4-HTML5/phpbb/error_collector.php
--- phpbb-3.1.0-RC4/phpbb/error_collector.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/error_collector.php	2014-09-21 12:00:00.000000000 +0200
@@ -44,7 +44,7 @@
 		{
 			if (!empty($text))
 			{
-				$text .= "<br />\n";
+				$text .= "<br>\n";
 			}
 
 			list($errno, $msg_text, $errfile, $errline) = $error;
diff -Naur phpbb-3.1.0-RC4/phpbb/feed/helper.php phpbb-3.1.0-RC4-HTML5/phpbb/feed/helper.php
--- phpbb-3.1.0-RC4/phpbb/feed/helper.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/feed/helper.php	2014-09-21 12:00:00.000000000 +0200
@@ -110,7 +110,7 @@
 		$content = generate_text_for_display($content, $uid, $bitfield, $options);
 
 		// Add newlines
-		$content = str_replace('<br />', '<br />' . "\n", $content);
+		$content = preg_replace('<br\s?/?>', '<br />' . "\n", $content);
 
 		// Convert smiley Relative paths to Absolute path, Windows style
 		$content = str_replace($this->phpbb_root_path . $this->config['smilies_path'], $this->get_board_url() . '/' . $this->config['smilies_path'], $content);
diff -Naur phpbb-3.1.0-RC4/phpbb/log/log.php phpbb-3.1.0-RC4-HTML5/phpbb/log/log.php
--- phpbb-3.1.0-RC4/phpbb/log/log.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/log/log.php	2014-09-21 12:00:00.000000000 +0200
@@ -650,7 +650,7 @@
 				}
 				else if (!empty($log_data_ary))
 				{
-					$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
+					$log[$i]['action'] .= '<br>' . implode('', $log_data_ary);
 				}
 
 				/* Apply make_clickable... has to be seen if it is for good. :/
diff -Naur phpbb-3.1.0-RC4/phpbb/message/form.php phpbb-3.1.0-RC4-HTML5/phpbb/message/form.php
--- phpbb-3.1.0-RC4/phpbb/message/form.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/message/form.php	2014-09-21 12:00:00.000000000 +0200
@@ -154,7 +154,7 @@
 			$this->message->send($messenger, phpbb_get_board_contact($this->config, $this->phpEx));
 
 			meta_refresh(3, append_sid($this->phpbb_root_path . 'index.' . $this->phpEx));
-			trigger_error($this->user->lang['EMAIL_SENT'] . '<br /><br />' . $this->get_return_message());
+			trigger_error($this->user->lang['EMAIL_SENT'] . '<br><br>' . $this->get_return_message());
 		}
 	}
 
@@ -169,7 +169,7 @@
 		add_form_key('memberlist_email');
 
 		$template->assign_vars(array(
-			'ERROR_MESSAGE'		=> (sizeof($this->errors)) ? implode('<br />', $this->errors) : '',
+			'ERROR_MESSAGE'		=> (sizeof($this->errors)) ? implode('<br>', $this->errors) : '',
 		));
 	}
 }
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_bool.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_bool.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_bool.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_bool.php	2014-09-21 12:00:00.000000000 +0200
@@ -82,7 +82,7 @@
 		);
 
 		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_TYPE'], 'EXPLAIN' => $this->user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($field_data['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($field_data['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['CHECKBOX'] . '</label>'),
+			0 => array('TITLE' => $this->user->lang['FIELD_TYPE'], 'EXPLAIN' => $this->user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($field_data['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();"> ' . $this->user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($field_data['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();"> ' . $this->user->lang['CHECKBOX'] . '</label>'),
 			1 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)),
 		);
 
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_date.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_date.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_date.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_date.php	2014-09-21 12:00:00.000000000 +0200
@@ -84,7 +84,7 @@
 
 		$options = array(
 			0 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],	'FIELD' => $this->process_field_row('preview', $profile_row)),
-			1 => array('TITLE' => $this->user->lang['ALWAYS_TODAY'],	'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['NO'] . '</label>'),
+			1 => array('TITLE' => $this->user->lang['ALWAYS_TODAY'],	'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();"> ' . $this->user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();"> ' . $this->user->lang['NO'] . '</label>'),
 		);
 
 		return $options;
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_int.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_int.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_int.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_int.php	2014-09-21 12:00:00.000000000 +0200
@@ -61,10 +61,10 @@
 	public function get_options($default_lang_id, $field_data)
 	{
 		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $field_data['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '" />'),
-			3 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="number" name="field_default_value" value="' . $field_data['field_default_value'] . '" />'),
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $field_data['field_length'] . '">'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '">'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '">'),
+			3 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="number" name="field_default_value" value="' . $field_data['field_default_value'] . '">'),
 		);
 
 		return $options;
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_string.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_string.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_string.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_string.php	2014-09-21 12:00:00.000000000 +0200
@@ -61,9 +61,9 @@
 	public function get_options($default_lang_id, $field_data)
 	{
 		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $field_data['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $field_data['field_length'] . '">'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '">'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '">'),
 			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options($field_data) . '</select>'),
 		);
 
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_text.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_text.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_text.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_text.php	2014-09-21 12:00:00.000000000 +0200
@@ -61,9 +61,9 @@
 	public function get_options($default_lang_id, $field_data)
 	{
 		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $field_data['rows'] . '" /> ' . $this->user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" name="columns" size="5" value="' . $field_data['columns'] . '" /> ' . $this->user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $field_data['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $field_data['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $field_data['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $field_data['rows'] . '"> ' . $this->user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" name="columns" size="5" value="' . $field_data['columns'] . '"> ' . $this->user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $field_data['field_length'] . '">'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $field_data['field_minlen'] . '">'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $field_data['field_maxlen'] . '">'),
 			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options($field_data) . '</select>'),
 		);
 
diff -Naur phpbb-3.1.0-RC4/phpbb/profilefields/type/type_url.php phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_url.php
--- phpbb-3.1.0-RC4/phpbb/profilefields/type/type_url.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/profilefields/type/type_url.php	2014-09-21 12:00:00.000000000 +0200
@@ -29,9 +29,9 @@
 	public function get_options($default_lang_id, $field_data)
 	{
 		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $field_data['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $field_data['field_length'] . '">'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '">'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '">'),
 		);
 
 		return $options;
diff -Naur phpbb-3.1.0-RC4/phpbb/search/fulltext_mysql.php phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_mysql.php
--- phpbb-3.1.0-RC4/phpbb/search/fulltext_mysql.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_mysql.php	2014-09-21 12:00:00.000000000 +0200
@@ -919,11 +919,11 @@
 	{
 		$tpl = '
 		<dl>
-			<dt><label>' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
+			<dt><label>' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
 			<dd>' . $this->config['fulltext_mysql_min_word_len'] . '</dd>
 		</dl>
 		<dl>
-			<dt><label>' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
+			<dt><label>' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
 			<dd>' . $this->config['fulltext_mysql_max_word_len'] . '</dd>
 		</dl>
 		';
diff -Naur phpbb-3.1.0-RC4/phpbb/search/fulltext_native.php phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_native.php
--- phpbb-3.1.0-RC4/phpbb/search/fulltext_native.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_native.php	2014-09-21 12:00:00.000000000 +0200
@@ -1784,20 +1784,20 @@
 
 		$tpl = '
 		<dl>
-			<dt><label for="fulltext_native_load_upd">' . $this->user->lang['YES_SEARCH_UPDATE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>
-			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . (($this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!$this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['NO'] . '</label></dd>
+			<dt><label for="fulltext_native_load_upd">' . $this->user->lang['YES_SEARCH_UPDATE'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>
+			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . (($this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio"> ' . $this->user->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!$this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio"> ' . $this->user->lang['NO'] . '</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_min_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '" /></dd>
+			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_native_min_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '"></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_max_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '" /></dd>
+			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_native_max_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '"></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (double) $this->config['fulltext_native_common_thres'] . '" /> %</dd>
+			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (double) $this->config['fulltext_native_common_thres'] . '"> %</dd>
 		</dl>
 		';
 
diff -Naur phpbb-3.1.0-RC4/phpbb/search/fulltext_postgres.php phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_postgres.php
--- phpbb-3.1.0-RC4/phpbb/search/fulltext_postgres.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_postgres.php	2014-09-21 12:00:00.000000000 +0200
@@ -891,11 +891,11 @@
 	{
 		$tpl = '
 		<dl>
-			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'] . '</span></dt>
+			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK'] . '</label><br><span>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'] . '</span></dt>
 			<dd>' . (($this->db->get_sql_layer() == 'postgres') ? $this->user->lang['YES'] : $this->user->lang['NO']) . '</dd>
 		</dl>
 		<dl>
-			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>
+			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br><span>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>
 			<dd><select name="config[fulltext_postgres_ts_name]">';
 
 		if ($this->db->get_sql_layer() == 'postgres')
@@ -918,12 +918,12 @@
 		$tpl .= '</select></dd>
 		</dl>
                 <dl>
-                        <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_min_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '" /></dd>
+                        <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt>
+                        <dd><input id="fulltext_postgres_min_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '"></dd>
                 </dl>
                 <dl>
-                        <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_max_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '" /></dd>
+                        <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt>
+                        <dd><input id="fulltext_postgres_max_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '"></dd>
                 </dl>
 		';
 
diff -Naur phpbb-3.1.0-RC4/phpbb/search/fulltext_sphinx.php phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_sphinx.php
--- phpbb-3.1.0-RC4/phpbb/search/fulltext_sphinx.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/search/fulltext_sphinx.php	2014-09-21 12:00:00.000000000 +0200
@@ -882,23 +882,23 @@
 		$tpl = '
 		<span class="error">' . $this->user->lang['FULLTEXT_SPHINX_CONFIGURE']. '</span>
 		<dl>
-			<dt><label for="fulltext_sphinx_data_path">' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_data_path" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_data_path]" value="' . $this->config['fulltext_sphinx_data_path'] . '" /></dd>
+			<dt><label for="fulltext_sphinx_data_path">' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_sphinx_data_path" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_data_path]" value="' . $this->config['fulltext_sphinx_data_path'] . '"></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_host">' . $this->user->lang['FULLTEXT_SPHINX_HOST'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_HOST_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_host" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_host]" value="' . $this->config['fulltext_sphinx_host'] . '" /></dd>
+			<dt><label for="fulltext_sphinx_host">' . $this->user->lang['FULLTEXT_SPHINX_HOST'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_SPHINX_HOST_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_sphinx_host" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_host]" value="' . $this->config['fulltext_sphinx_host'] . '"></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_port" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '" /></dd>
+			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_sphinx_port" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '"></dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
+			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
+			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '"> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
+			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
 			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . htmlspecialchars($this->config_file_data) . '</textarea>' : $this->config_file_data) . '</dd>
 		<dl>
 		';
diff -Naur phpbb-3.1.0-RC4/phpbb/session.php phpbb-3.1.0-RC4-HTML5/phpbb/session.php
--- phpbb-3.1.0-RC4/phpbb/session.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/session.php	2014-09-21 12:00:00.000000000 +0200
@@ -1230,8 +1230,8 @@
 
 			$contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx);
 			$message = sprintf($this->lang[$message], $till_date, '<a href="' . $contact_link . '">', '</a>');
-			$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
-			$message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';
+			$message .= ($ban_row['ban_give_reason']) ? '<br><br>' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
+			$message .= '<br><br><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';
 
 			// To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again
 			$this->session_kill(false);
diff -Naur phpbb-3.1.0-RC4/phpbb/template/twig/node/includecss.php phpbb-3.1.0-RC4-HTML5/phpbb/template/twig/node/includecss.php
--- phpbb-3.1.0-RC4/phpbb/template/twig/node/includecss.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/template/twig/node/includecss.php	2014-09-21 12:00:00.000000000 +0200
@@ -31,7 +31,7 @@
 		$compiler
 			->raw("<link href=\"' . ")
 			->raw("\$asset_file . '\"")
-			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
+			->raw(' rel="stylesheet" media="screen, projection">')
 		;
 	}
 }
diff -Naur phpbb-3.1.0-RC4/phpbb/template/twig/node/includejs.php phpbb-3.1.0-RC4-HTML5/phpbb/template/twig/node/includejs.php
--- phpbb-3.1.0-RC4/phpbb/template/twig/node/includejs.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/phpbb/template/twig/node/includejs.php	2014-09-21 12:00:00.000000000 +0200
@@ -31,7 +31,7 @@
 		$config = $this->environment->get_phpbb_config();
 
 		$compiler
-			->raw("<script type=\"text/javascript\" src=\"' . ")
+			->raw("<script src=\"' . ")
 			->raw("\$asset_file")
 			->raw(". '\"></script>\n")
 		;
diff -Naur phpbb-3.1.0-RC4/posting.php phpbb-3.1.0-RC4-HTML5/posting.php
--- phpbb-3.1.0-RC4/posting.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/posting.php	2014-09-21 12:00:00.000000000 +0200
@@ -453,8 +453,8 @@
 
 		if (!$request->is_ajax())
 		{
-			$message .= '<br /><br />' . $user->lang('VIEW_MESSAGE', '<a href="' . $meta_url . '">', '</a>');
-			$message .= '<br /><br />' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('VIEW_MESSAGE', '<a href="' . $meta_url . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_FORUM', '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
 		}
 
 		trigger_error($message);
@@ -653,8 +653,8 @@
 
 			meta_refresh(3, $meta_info);
 
-			$message = $user->lang['DRAFT_SAVED'] . '<br /><br />';
-			$message .= ($mode != 'post') ? sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>') . '<br /><br />' : '';
+			$message = $user->lang['DRAFT_SAVED'] . '<br><br>';
+			$message .= ($mode != 'post') ? sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>') . '<br><br>' : '';
 			$message .= sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
 
 			trigger_error($message);
@@ -921,7 +921,7 @@
 	{
 		if (sizeof($message_parser->warn_msg))
 		{
-			$error[] = implode('<br />', $message_parser->warn_msg);
+			$error[] = implode('<br>', $message_parser->warn_msg);
 			$message_parser->warn_msg = array();
 		}
 
@@ -1032,7 +1032,7 @@
 	// not supported by utf8_bin in MySQL
 	if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $post_data['post_subject'], $matches))
 	{
-		$character_list = implode('<br />', $matches[0]);
+		$character_list = implode('<br>', $matches[0]);
 		$error[] = $user->lang('UNSUPPORTED_CHARACTERS_SUBJECT', $character_list);
 	}
 
@@ -1143,7 +1143,7 @@
 
 	if (sizeof($message_parser->warn_msg))
 	{
-		$error[] = implode('<br />', $message_parser->warn_msg);
+		$error[] = implode('<br>', $message_parser->warn_msg);
 	}
 
 	// DNSBL check
@@ -1269,7 +1269,7 @@
 				meta_refresh(10, $redirect_url);
 				$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
 				$message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']);
-				$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
+				$message .= '<br><br>' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
 				trigger_error($message);
 			}
 
@@ -1335,7 +1335,7 @@
 
 		$parse_poll->message = implode("\n", $post_data['poll_options']);
 		$parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']);
-		$preview_poll_options = explode('<br />', $parse_poll->message);
+		$preview_poll_options = explode('<br>', $parse_poll->message);
 		unset($parse_poll);
 
 		foreach ($preview_poll_options as $key => $option)
@@ -1507,9 +1507,9 @@
 	));
 }
 
-$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : '';
-$s_hidden_fields .= '<input type="hidden" name="lastclick" value="' . $current_time . '" />';
-$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', $draft_id) . '" />' : '';
+$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '">' : '';
+$s_hidden_fields .= '<input type="hidden" name="lastclick" value="' . $current_time . '">';
+$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', $draft_id) . '">' : '';
 
 if ($mode == 'edit')
 {
@@ -1550,7 +1550,7 @@
 	'MAX_FONT_SIZE'			=> (int) $config['max_post_font_size'],
 	'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['POST']),
 	'POST_DATE'				=> ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '',
-	'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
+	'ERROR'					=> (sizeof($error)) ? implode('<br>', $error) : '',
 	'TOPIC_TIME_LIMIT'		=> (int) $post_data['topic_time_limit'],
 	'EDIT_REASON'			=> $request->variable('edit_reason', ''),
 	'SHOW_PANEL'			=> $request->variable('show_panel', ''),
diff -Naur phpbb-3.1.0-RC4/report.php phpbb-3.1.0-RC4-HTML5/report.php
--- phpbb-3.1.0-RC4/report.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/report.php	2014-09-21 12:00:00.000000000 +0200
@@ -111,8 +111,8 @@
 	if ($report_data['post_reported'])
 	{
 		$message = $user->lang['ALREADY_REPORTED'];
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
 		trigger_error($message);
 	}
 }
@@ -137,7 +137,7 @@
 	if ($report_data['message_reported'])
 	{
 		$message = $user->lang['ALREADY_REPORTED_PM'];
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_PM'], '<a href="' . $redirect_url . '">', '</a>');
+		$message .= '<br><br>' . sprintf($user->lang['RETURN_PM'], '<a href="' . $redirect_url . '">', '</a>');
 		trigger_error($message);
 	}
 
@@ -270,10 +270,10 @@
 
 		meta_refresh(3, $redirect_url);
 
-		$message = $lang_success . '<br /><br />' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>');
+		$message = $lang_success . '<br><br>' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>');
 		if ($return_forum_url)
 		{
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
+			$message .= '<br><br>' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
 		}
 		trigger_error($message);
 	}
@@ -297,7 +297,7 @@
 }
 
 $template->assign_vars(array(
-	'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+	'ERROR'				=> (sizeof($error)) ? implode('<br>', $error) : '',
 	'S_REPORT_POST'		=> ($pm_id) ? false : true,
 	'REPORT_TEXT'		=> $report_text,
 	'S_REPORT_ACTION'	=> append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&amp;p=' . $post_id . '&amp;pm=' . $pm_id),
diff -Naur phpbb-3.1.0-RC4/search.php phpbb-3.1.0-RC4-HTML5/search.php
--- phpbb-3.1.0-RC4/search.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/search.php	2014-09-21 12:00:00.000000000 +0200
@@ -288,7 +288,7 @@
 		$common_words = $search->get_common_words();
 		if (!$correct_query || (!$search->get_search_query() && !sizeof($author_id_ary) && !$search_id))
 		{
-			$ignored = (sizeof($common_words)) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $common_words)) . '<br />' : '';
+			$ignored = (sizeof($common_words)) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $common_words)) . '<br>' : '';
 			$word_length = $search->get_word_length();
 			if ($word_length)
 			{
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/attachment.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/attachment.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/attachment.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/attachment.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,7 +6,7 @@
 
 		<!-- IF _file.S_THUMBNAIL -->
 		<dl class="thumbnail">
-			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt>
+			<dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}"></a></dt>
 			<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF -->
 		</dl>
 		<!-- ENDIF -->
@@ -14,7 +14,7 @@
 
 		<!-- IF _file.S_IMAGE -->
 		<dl class="file">
-			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
+			<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);"></dt>
 			<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF -->
 			<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd>
 		</dl>
@@ -33,68 +33,67 @@
 		<!-- 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}" />
+				<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" />
+						<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" />
+				<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" />
+				<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" />
+				<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 />
+			<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}" />
+				<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[
+			<script>
 				if (document.rmstream_{_file.ATTACH_ID}.GetClipWidth)
 				{
 					while (!document.rmstream_{_file.ATTACH_ID}.GetClipWidth())
@@ -108,7 +107,6 @@
 					document.rmstream_{_file.ATTACH_ID}.height = height;
 					document.ctrls_{_file.ATTACH_ID}.width = width;
 				}
-			// ]]>
 			</script>
 		<!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/bbcode.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/bbcode.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/bbcode.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/bbcode.html	2014-09-21 12:00:00.000000000 +0200
@@ -31,10 +31,10 @@
 
 <!-- BEGIN size --><span style="font-size: {SIZE}%; line-height: 116%;">{TEXT}</span><!-- END size -->
 
-<!-- BEGIN img --><img src="{URL}" class="postimage" alt="{L_IMAGE}" /><!-- END img -->
+<!-- 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 -->
+<!-- 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 -Naur phpbb-3.1.0-RC4/styles/prosilver/template/captcha_default.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_default.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/captcha_default.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_default.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,10 +10,10 @@
 
 	<dl>
 		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>
-		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
-		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
-		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
+		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}"></dd>
+		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}">
+		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}"><!-- ENDIF -->
+		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}"></dd>
 		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
 	</dl>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/captcha_qa.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_qa.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/captcha_qa.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_qa.html	2014-09-21 12:00:00.000000000 +0200
@@ -7,10 +7,10 @@
 <!-- ENDIF -->
 
 	<dl>
-	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
 	<dd>
-		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
-		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
+		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}">
+		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}">
 	</dd>
 	</dl>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/captcha_recaptcha.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_recaptcha.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/captcha_recaptcha.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/captcha_recaptcha.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,30 +10,26 @@
 
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
-	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
+	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
 	<dd>
-		<script type="text/javascript">
-		// <![CDATA[
+		<script>
 		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[
+		<script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
+		<script>
 		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
 			document.getElementById('recaptcha_table').style.direction = 'ltr';
 		<!-- ENDIF -->
-		// ]]>
 		</script>
 		<noscript>
 		<div>
-			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
+			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br>
 			<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-			<input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+			<input type="hidden" name="recaptcha_response_field" value="manual_challenge">
 		</div>
 		</noscript>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/confirm_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/confirm_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/confirm_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/confirm_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,8 +4,8 @@
 		<p>{MESSAGE_TEXT}</p>
 
 		<fieldset class="submit-buttons">
-			<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+			<input type="button" name="confirm" value="{L_YES}" class="button2">&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2">
 		</fieldset>
 	</form>
 
@@ -22,8 +22,8 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button2">&nbsp;
+		<input type="submit" name="cancel" value="{L_NO}" class="button2">
 	</fieldset>
 
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/confirm_delete_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/confirm_delete_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/confirm_delete_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/confirm_delete_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,19 +5,19 @@
 		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 			<label>
 				<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
-				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+				<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 -->
 			</label>
 		<!-- ENDIF -->
 
 		<label for="delete_reason">
-			<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
-			<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+			<strong>{L_DELETE_REASON}{L_COLON}</strong><br><span>{L_DELETE_REASON_EXPLAIN}</span><br>
+			<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45">
 		</label>
 
 		<fieldset class="submit-buttons">
-			<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
-			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+			<input type="button" name="confirm" value="{L_YES}" class="button1">&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2">
 		</fieldset>
 	</form>
 
@@ -39,7 +39,7 @@
 				<dt><label for="delete_permanent">{L_DELETE_PERMANENTLY}{L_COLON}</label></dt>
 				<dd>
 					<label for="delete_permanent">
-						<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+						<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 -->
 					</label>
 				</dd>
@@ -47,15 +47,15 @@
 		<!-- ENDIF -->
 
 		<dl>
-			<dt><label for="delete_reason">{L_DELETE_REASON}{L_COLON}</label><br /><span>{L_DELETE_REASON_EXPLAIN}</span></dt>
-			<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
+			<dt><label for="delete_reason">{L_DELETE_REASON}{L_COLON}</label><br><span>{L_DELETE_REASON_EXPLAIN}</span></dt>
+			<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45"></dd>
 		</dl>
 	</fieldset>
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button1" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button1">&nbsp; 
+		<input type="submit" name="cancel" value="{L_NO}" class="button2">
 	</fieldset>
 
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/drafts.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/drafts.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/drafts.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/drafts.html	2014-09-21 12:00:00.000000000 +0200
@@ -28,7 +28,7 @@
 		<dl>
 			<dt>
 				<div class="list-inner">
-					<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
+					<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br>
 					<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 					<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 					<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/faq_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/faq_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/faq_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/faq_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -36,7 +36,7 @@
 					<dd>{faq_block.faq_row.FAQ_ANSWER}</dd>
 					<dd><a href="#faqlinks" class="top2">{L_BACK_TO_TOP}</a></dd>
 				</dl>
-				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
+				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed"><!-- ENDIF -->
 			<!-- END faq_row -->
 		</div>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/forum_fn.js phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/forum_fn.js
--- phpbb-3.1.0-RC4/styles/prosilver/template/forum_fn.js	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/forum_fn.js	2014-09-21 12:00:00.000000000 +0200
@@ -467,7 +467,7 @@
 			persist = $this.attr('id') == 'nav-main',
 			$allLinks = $this.children(),
 			$links = $allLinks.not(filterSkip),
-			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
+			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner"></div><ul class="dropdown-contents"></div></li>',
 			$filterLastList = $links.filter(filterLast),
 			slack = 1; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. 
 
@@ -638,7 +638,7 @@
 
 		// Create block that is visible only on mobile devices
 		if (!$block.length) {
-			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;">');
 			$block = $this.find('dt .responsive-show:last-child');
 		} else {
 			first = ($.trim($block.text()).length === 0);
@@ -654,7 +654,7 @@
 				html = $children.html();
 			}
 
-			$block.append((first ? '' : '<br />') + html);
+			$block.append((first ? '' : '<br>') + html);
 
 			first = false;
 		});
@@ -690,7 +690,7 @@
 
 			// Create block that is visible only on mobile devices
 			if (!$block.length) {
-				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;">');
 				$block = $this.find('dt .responsive-show:last-child');
 			}
 			else {
@@ -712,7 +712,7 @@
 					html = headers[i] + ': <strong>' + html + '</strong>';
 				}
 
-				$block.append((first ? '' : '<br />') + html);
+				$block.append((first ? '' : '<br>') + html);
 
 				first = false;
 			});
@@ -808,7 +808,7 @@
 			$ul = $this.children(),
 			$tabs = $ul.children().not('[data-skip-responsive]'),
 			$links = $tabs.children('a'),
-			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div><ul class="dropdown-contents"></div></li>').find('li.responsive-tab'),
 			$menu = $item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/forumlist_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/forumlist_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/forumlist_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/forumlist_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -31,17 +31,17 @@
 				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
 					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
 					<div class="list-inner">
-						<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
+						<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}"></a> --><!-- ENDIF -->
 
 						<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
 						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a>
-						<!-- IF forumrow.FORUM_DESC --><br />{forumrow.FORUM_DESC}<!-- ENDIF -->
+						<!-- IF forumrow.FORUM_DESC --><br>{forumrow.FORUM_DESC}<!-- ENDIF -->
 						<!-- IF forumrow.MODERATORS -->
-							<br /><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}
+							<br><strong>{forumrow.L_MODERATOR_STR}{L_COLON}</strong> {forumrow.MODERATORS}
 						<!-- ENDIF -->
 						<!-- IF .forumrow.subforum and forumrow.S_LIST_SUBFORUMS -->
 							<!-- EVENT forumlist_body_subforums_before -->
-							<br /><strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
+							<br><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 -->
@@ -73,10 +73,10 @@
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<!-- EVENT forumlist_body_last_post_title_prepend -->
-							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
+							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br>
 						<!-- ENDIF --> 
 						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
-						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
+						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br>{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br>&nbsp;<!-- ENDIF --></span>
 					</dd>
 				<!-- ENDIF -->
 			</dl>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/index_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/index_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/index_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/index_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -17,15 +17,15 @@
 	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
 	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
 		<fieldset class="quick-login">
-			<label for="username"><span>{L_USERNAME}{L_COLON}</span> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /></label>
-			<label for="password"><span>{L_PASSWORD}{L_COLON}</span> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /></label>
+			<label for="username"><span>{L_USERNAME}{L_COLON}</span> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}"></label>
+			<label for="password"><span>{L_PASSWORD}{L_COLON}</span> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}"></label>
 			<!-- IF U_SEND_PASSWORD -->
 				<a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a>
 			<!-- ENDIF -->
 			<!-- IF S_AUTOLOGIN_ENABLED -->
-				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
+				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin"></label>
 			<!-- ENDIF -->
-			<input type="submit" name="login" value="{L_LOGIN}" class="button2" />
+			<input type="submit" name="login" value="{L_LOGIN}" class="button2">
 			{S_LOGIN_REDIRECT}
 		</fieldset>
 	</form>
@@ -38,8 +38,8 @@
 		<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
 		<p>
 			<!-- EVENT index_body_block_online_prepend -->
-			{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
-			<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
+			{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br>{RECORD_USERS}<br> <br>{LOGGED_IN_USER_LIST}
+			<!-- IF LEGEND --><br><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
 			<!-- EVENT index_body_block_online_append -->
 		</p>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/jumpbox.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/jumpbox.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/jumpbox.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/jumpbox.html	2014-09-21 12:00:00.000000000 +0200
@@ -28,5 +28,5 @@
 	</div>
 
 <!-- ELSE -->
-	<br /><br />
+	<br><br>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/login_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/login_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/login_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/login_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,11 +11,11 @@
 		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
 		<dl>
 			<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
-			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
+			<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{USERNAME}" class="inputbox autowidth"></dd>
 		</dl>
 		<dl>
 			<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
-			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
+			<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth"></dd>
 			<!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) -->
 				<!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF -->
 				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
@@ -27,15 +27,15 @@
 		<!-- ENDIF -->
 		<!-- IF S_DISPLAY_FULL_LOGIN -->
 		<dl>
-			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
+			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4"> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
+			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5"> {L_HIDE_ME}</label></dd>
 		</dl>
 		<!-- ENDIF -->
 
 		{S_LOGIN_REDIRECT}
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
+			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1"></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -55,7 +55,7 @@
 			<h3>{L_REGISTER}</h3>
 			<p>{L_LOGIN_INFO}</p>
 			<p><strong><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></strong></p>
-			<hr class="dashed" />
+			<hr class="dashed">
 			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>
 		</div>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/login_forum.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/login_forum.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/login_forum.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/login_forum.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,12 +22,12 @@
 
 			<dl>
 				<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
-				<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" /></dd>
+				<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow"></dd>
 			</dl>
 			{S_LOGIN_REDIRECT}
 			<dl>
 				<dt>&nbsp;</dt>
-				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
+				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2"></dd>
 			</dl>
 		</fieldset>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_approve.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_approve.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_approve.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_approve.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,7 +4,7 @@
 	<p>{MESSAGE_TEXT}</p>
 
 	<!-- IF S_NOTIFY_POSTER -->
-		<label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label>
+		<label><input type="checkbox" name="notify_poster" checked="checked"> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label>
 	<!-- ENDIF -->
 
 	<!-- IF not S_APPROVE and not S_RESTORE and .reason -->
@@ -13,14 +13,14 @@
 			<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
 		</select></label>
 
-		<label><strong>{L_MORE_INFO}{L_COLON}</strong><br /><span>{L_CAN_LEAVE_BLANK}</span>
+		<label><strong>{L_MORE_INFO}{L_COLON}</strong><br><span>{L_CAN_LEAVE_BLANK}</span>
 			<textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea>
 		</label>
 	<!-- ENDIF -->
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1">&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2">
 	</fieldset>
 
 <!-- ELSE -->
@@ -41,7 +41,7 @@
 		<!-- IF S_NOTIFY_POSTER -->
 			<dl class="panel">
 				<dt>&nbsp;</dt>
-				<dd><label><input type="checkbox" name="notify_poster" checked="checked" /> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
+				<dd><label><input type="checkbox" name="notify_poster" checked="checked"> <!-- IF S_APPROVE -->{L_NOTIFY_POSTER_APPROVAL}<!-- ELSE -->{L_NOTIFY_POSTER_DISAPPROVAL}<!-- ENDIF --></label></dd>
 			</dl>
 		<!-- ENDIF -->
 
@@ -54,7 +54,7 @@
 				</dd>
 			</dl>
 			<dl class="fields2 nobg">
-				<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
+				<dt><label for="reason">{L_MORE_INFO}{L_COLON}</label><br><span>{L_CAN_LEAVE_BLANK}</span></dt>
 				<dd><textarea class="inputbox" name="reason" id="reason" rows="4" cols="40">{REASON}</textarea></dd>
 			</dl>
 		<!-- ENDIF -->
@@ -66,8 +66,8 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1">&nbsp; 
+			<input type="submit" name="cancel" value="{L_NO}" class="button2">
 		</fieldset>
 
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_ban.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_ban.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_ban.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_ban.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,8 +1,6 @@
 <!-- INCLUDE mcp_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
-
+<script>
 	var ban_length = new Array();
 		ban_length[-1] = '';
 	var ban_reason = new Array();
@@ -34,8 +32,6 @@
 			document.getElementById('unbangivereason').innerHTML = '';
 		}
 	}
-
-// ]]>
 </script>
 
 <form id="mcp_ban" method="post" action="{U_ACTION}">
@@ -58,24 +54,24 @@
 	<dl>
 		<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
 		<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
-		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
+		<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox"><br><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 	</dl>
 	<dl>
 		<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>
-		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255" /></dd>
+		<dd><input name="banreason" id="banreason" type="text" class="inputbox" maxlength="255"></dd>
 	</dl>
 	<dl>
 		<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
-		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255" /></dd>
+		<dd><input name="bangivereason" id="bangivereason" type="text" class="inputbox" maxlength="255"></dd>
 	</dl>
 
-	<hr />
+	<hr>
 
 	<dl>
-		<dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+		<dt><label for="banexclude0">{L_BAN_EXCLUDE}{L_COLON}</label><br><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
 		<dd>
-			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1" /> {L_YES}</label> 
-			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked" /> {L_NO}</label>
+			<label for="banexclude1"><input type="radio" name="banexclude" id="banexclude1" value="1"> {L_YES}</label> 
+			<label for="banexclude0"><input type="radio" name="banexclude" id="banexclude0" value="0" checked="checked"> {L_NO}</label>
 		</dd>
 	</dl>
 	<!-- EVENT mcp_ban_fields_after -->
@@ -85,8 +81,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -122,8 +118,8 @@
 	</div>
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1" />
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1">
 	</fieldset>
 
 	<!-- ELSE -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_forum.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_forum.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_forum.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_forum.html	2014-09-21 12:00:00.000000000 +0200
@@ -47,11 +47,11 @@
 					<!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.DELETED_IMG}</a> <!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
 					<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
-					<br />
+					<br>
 
 					<div class="responsive-show" style="display: none;">
 						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-						{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
+						{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br>
 					</div>
 					<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
 
@@ -78,11 +78,11 @@
 					</div>
 				</dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span>
+				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br>{topicrow.LAST_POST_TIME}</span>
 				</dd>
 				<!-- IF not S_MERGE_SELECT -->
 				<dd class="mark">
-					<!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE -->&nbsp;<!-- ENDIF -->
+					<!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF -->><!-- ELSE -->&nbsp;<!-- ENDIF -->
 				</dd>
 				<!-- ENDIF -->
 			</dl>
@@ -99,10 +99,10 @@
 		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
 		<label>{S_SELECT_SORT_DIR}</label>
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
+		<input type="submit" name="sort" value="{L_GO}" class="button2">
 	</fieldset>
 
-	<hr />
+	<hr>
 
 	<div class="action-bar bottom">
 		<div class="pagination">
@@ -136,7 +136,7 @@
 			<option value="make_global">{L_MAKE_GLOBAL}</option>
 		<!-- ENDIF -->
 	</select>
-	<input class="button2" type="submit" value="{L_SUBMIT}" />
+	<input class="button2" type="submit" value="{L_SUBMIT}">
 	<div><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></div>
 	<!-- ENDIF -->
 	{S_FORM_TOKEN}
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_front.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_front.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_front.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_front.html	2014-09-21 12:00:00.000000000 +0200
@@ -28,16 +28,16 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br />
+							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br>
 							{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
 						</div>
 					</dt>
 					<dd class="moderation"><span>
-						{L_TOPIC}{L_COLON} <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br />
+						{L_TOPIC}{L_COLON} <a href="{unapproved.U_TOPIC}">{unapproved.TOPIC_TITLE}</a> [<a href="{unapproved.U_MCP_TOPIC}">{L_MODERATE}</a>]<br>
 						{L_FORUM}{L_COLON} <!-- IF unapproved.U_FORUM --><a href="{unapproved.U_FORUM}">{unapproved.FORUM_NAME}</a><!-- ELSE -->{unapproved.FORUM_NAME}<!-- ENDIF --><!-- IF unapproved.U_MCP_FORUM --> [<a href="{unapproved.U_MCP_FORUM}">{L_MODERATE}</a>]<!-- ENDIF --></span>
 					</dd>
 
-			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}" /></dd>
+			 		<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{unapproved.POST_ID}"></dd>
 				</dl>
 			</li>
 			<!-- END unapproved -->
@@ -51,8 +51,8 @@
 	<!-- IF .unapproved -->
 	<fieldset class="display-actions">
 		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
+		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}">&nbsp;
+		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}">
 		<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
 	<!-- ENDIF -->
@@ -82,12 +82,12 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br />
+							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> {report.ATTACH_ICON_IMG}<br>
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} &raquo; {report.POST_TIME}</span>
 						</div>
 					</dt>
 					<dd class="moderation">
-						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br />
+						<span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}<br>
 						{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span>
 					</dd>
 				</dl>
@@ -123,8 +123,8 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br />
-							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} &raquo; {pm_report.PM_TIME}</span><br />
+							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> {pm_report.ATTACH_ICON_IMG}<br>
+							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} &raquo; {pm_report.PM_TIME}</span><br>
 							<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span>
 						</div>
 					</dt>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_header.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_header.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -44,6 +44,6 @@
 		<div class="content">
 			<h2 class="message-title">{L_MESSAGE}</h2>
 			<p class="error">{MESSAGE}</p>
-			<p><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br /><br /><!-- END return_links --></p>
+			<p><!-- BEGIN return_links -->{return_links.MESSAGE_LINK}<br><br><!-- END return_links --></p>
 		</div>
 		<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_logs.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_logs.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_logs.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_logs.html	2014-09-21 12:00:00.000000000 +0200
@@ -8,7 +8,7 @@
 	<div class="inner">
 
 	<div class="action-bar top">
-		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}">&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}">
 		<div class="pagination">
 			{TOTAL}
 			<!-- IF .pagination --> 
@@ -36,10 +36,10 @@
 			<td>{log.USERNAME}</td>
 			<td style="text-align: center">{log.IP}</td>
 			<td style="text-align: center">{log.DATE}</td>
-			<td>{log.ACTION}<br />
+			<td>{log.ACTION}<br>
 			{log.DATA}
 		</td>
-			<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%" align="center"><input type="checkbox" name="mark[]" value="{log.ID}" /></td><!-- ENDIF -->
+			<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%" align="center"><input type="checkbox" name="mark[]" value="{log.ID}"></td><!-- ENDIF -->
 		</tr>
 		<!-- END log -->
 	<!-- ELSE -->
@@ -55,10 +55,10 @@
 			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
 			<label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 		</fieldset>
 
-		<hr />
+		<hr>
 
 		<div class="action-bar bottom">
 			<div class="pagination">
@@ -77,8 +77,8 @@
 
 		<!-- IF S_CLEAR_ALLOWED -->
 			<fieldset class="display-actions">
-				<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-				&nbsp;<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
+				<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}">
+				&nbsp;<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]">
 
 				<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
 			</fieldset>
@@ -90,6 +90,6 @@
 	<!-- ENDIF -->
 </form>
 
-<br />
+<br>
 
 <!-- INCLUDE mcp_footer.html -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_move.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_move.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_move.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_move.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,19 +12,19 @@
 
 	<!-- IF S_CAN_LEAVE_SHADOW -->
 		<label for="move_leave_shadow">
-			<input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}
+			<input type="checkbox" name="move_leave_shadow" id="move_leave_shadow">{L_LEAVE_SHADOW}
 		</label>
 	<!-- ENDIF -->
 
 	<!-- IF S_CAN_LOCK_TOPIC -->
 		<label for="move_lock_topics">
-			<input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}
+			<input type="checkbox" name="move_lock_topics" id="move_lock_topics">{L_LOCK_TOPIC}
 		</label>
 	<!-- ENDIF -->
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1">&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button2">
 	</fieldset>
 
 <!-- ELSE -->
@@ -44,8 +44,8 @@
 		<dl class="fields2">
 			<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt>
 			<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd>
-			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
-			<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->
+			<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow">{L_LEAVE_SHADOW}</label></dd><!-- ENDIF -->
+			<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics">{L_LOCK_TOPIC}</label></dd><!-- ENDIF -->
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
@@ -54,8 +54,8 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp; 
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1">&nbsp; 
+			<input type="submit" name="cancel" value="{L_NO}" class="button2">
 			{S_FORM_TOKEN}
 		</fieldset>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_notes_front.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_notes_front.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_notes_front.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_notes_front.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,7 +10,7 @@
 	<fieldset>
 	<dl>
 		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>
-		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
+		<dd><input name="username" id="username" type="text" class="inputbox"></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
@@ -19,8 +19,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_notes_user.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_notes_user.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_notes_user.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_notes_user.html	2014-09-21 12:00:00.000000000 +0200
@@ -42,8 +42,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -51,7 +51,7 @@
 	<div class="inner">
 
 	<div class="action-bar top">
-		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}">&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}">
 		<div class="pagination">
 			{TOTAL_REPORTS}
 			<!-- IF .pagination --> 
@@ -80,7 +80,7 @@
 		<td style="text-align: center">{usernotes.REPORT_AT}</td>
 		<td>{usernotes.ACTION}</td>
 
-		<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%; text-align: center;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
+		<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%; text-align: center;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}"></td><!-- ENDIF -->
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
@@ -90,15 +90,15 @@
 	</tbody>
 	</table>
 
-	<hr />
+	<hr>
 
 	<fieldset class="display-options">
 		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
+		<input type="submit" name="sort" value="{L_GO}" class="button2">
 	</fieldset>
 
-	<hr />
+	<hr>
 
 	<div class="action-bar bottom">
 		<div class="pagination">
@@ -116,8 +116,8 @@
 
 <!-- IF S_CLEAR_ALLOWED -->
 <fieldset class="display-actions">
-	<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-	&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
+	<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}">
+	&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}">
 </fieldset>
 
 <fieldset class="display-actions">
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_post.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_post.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_post.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_post.html	2014-09-21 12:00:00.000000000 +0200
@@ -32,10 +32,10 @@
 
 	<fieldset class="submit-buttons">
 		<!-- IF not S_REPORT_CLOSED -->
-			<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> &nbsp;
+			<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]"> &nbsp;
 		<!-- ENDIF -->
-		<input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" />
-		<input type="hidden" name="report_id_list[]" value="{REPORT_ID}" />
+		<input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]">
+		<input type="hidden" name="report_id_list[]" value="{REPORT_ID}">
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -68,9 +68,9 @@
 		<!-- IF S_PM -->
 		<p class="author">
 			<strong>{L_SENT_AT}{L_COLON}</strong> {POST_DATE}
-			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL}
-			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
-			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
+			<br><strong>{L_PM_FROM}{L_COLON}</strong> {POST_AUTHOR_FULL}
+			<!-- IF S_TO_RECIPIENT --><br><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
+			<!-- IF S_BCC_RECIPIENT --><br><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 		</p>
 		<!-- ELSE -->
 		<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
@@ -80,10 +80,10 @@
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
 			<p class="post-notice unapproved">
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
-				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
-				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
-				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
+				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]"> &nbsp;
+				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]">
+				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts"><!-- ENDIF -->
+				<input type="hidden" name="post_id_list[]" value="{POST_ID}">
 				{S_FORM_TOKEN}
 			</p>
 			</form>
@@ -91,10 +91,10 @@
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
 			<p class="post-notice deleted">
-				<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> &nbsp;
-				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
-				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
-				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
+				<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]"> &nbsp;
+				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]">
+				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts"><!-- ENDIF -->
+				<input type="hidden" name="post_id_list[]" value="{POST_ID}">
 				{S_FORM_TOKEN}
 			</p>
 			</form>
@@ -122,7 +122,7 @@
 		<!-- IF DELETED_MESSAGE or DELETE_REASON -->
 			<div class="notice">
 				{DELETED_MESSAGE}
-				<!-- IF DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{DELETE_REASON}</em><!-- ENDIF -->
+				<!-- IF DELETE_REASON --><br><strong>{L_REASON}{L_COLON}</strong> <em>{DELETE_REASON}</em><!-- ENDIF -->
 			</div>
 		<!-- ENDIF -->
 
@@ -131,7 +131,7 @@
 		<!-- ENDIF -->
 
 		<!-- IF S_MCP_REPORT and S_CAN_VIEWIP -->
-			<hr />
+			<hr>
 			<div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->{L_COLON} <!-- 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 -->
@@ -155,11 +155,11 @@
 			<fieldset>
 			<dl>
 				<dt><label>{L_CHANGE_POSTER}{L_COLON}</label></dt>
-				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->
+				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}"></dd><!-- ENDIF -->
 				<dd style="margin-top:3px;">
-					<input class="inputbox autowidth" type="text" name="username" value="" />
-					<input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}" />
-					<br />
+					<input class="inputbox autowidth" type="text" name="username" value="">
+					<input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}">
+					<br>
 					<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
 				</dd>
 			</dl>
@@ -177,7 +177,7 @@
 				<dd><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="button2" type="submit" value="{L_SUBMIT}" />
+					</select> <input class="button2" type="submit" value="{L_SUBMIT}">
 				</dd>
 			</dl>
 			{S_FORM_TOKEN}
@@ -214,16 +214,16 @@
 
 				<!-- BEGIN usernotes -->
 					<span class="small"><strong>{L_REPORTED_BY}{L_COLON} {usernotes.REPORT_BY} &laquo; {usernotes.REPORT_AT}</strong></span>
-					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
+					<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}"></div><!-- ENDIF -->
 					<div class="postbody">{usernotes.ACTION}</div>
 
-					<hr class="dashed" />
+					<hr class="dashed">
 				<!-- END usernotes -->
 
 				<!-- IF S_CLEAR_ALLOWED -->
 					<fieldset class="submit-buttons">
-						<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp;
-						<input class="button2" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
+						<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}">&nbsp;
+						<input class="button2" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}">
 					</fieldset>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
@@ -236,8 +236,8 @@
 			</fieldset>
 
 			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" value="{L_RESET}" />
+				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}">&nbsp;
+				<input class="button2" type="reset" value="{L_RESET}">
 				{S_FORM_TOKEN}
 			</fieldset>
 			</form>
@@ -254,7 +254,7 @@
 
 			<!-- BEGIN reports -->
 				<span class="small"><strong>{L_REPORTED_BY}{L_COLON} <!-- IF reports.U_REPORTER --><a href="{reports.U_REPORTER}">{reports.REPORTER}</a><!-- ELSE -->{reports.REPORTER}<!-- ENDIF --> &laquo; {reports.REPORT_TIME}</strong></span>
-				<p><em>{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p>
+				<p><em>{reports.REASON_TITLE}{L_COLON} {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br>{reports.REPORT_TEXT}<!-- ENDIF --></p>
 			<!-- END reports -->
 
 			</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_queue.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_queue.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_queue.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_queue.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,7 +4,7 @@
 
 <fieldset class="forum-selection">
 	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
+	<input type="submit" name="sort" value="{L_GO}" class="button2">
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -48,13 +48,13 @@
 			<dl>
 				<dt>
 					<div class="list-inner">
-						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
+						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br>
 						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
 					</div>
 				</dt>
 				<dd class="moderation">
 					<span>
-						<!-- IF S_TOPICS --><br /><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br /><!-- ENDIF -->
+						<!-- IF S_TOPICS --><br><!-- ELSE -->{L_TOPIC}{L_COLON} <a href="{postrow.U_TOPIC}">{postrow.TOPIC_TITLE}</a> <br><!-- ENDIF -->
 						{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a>
 					</span>
 				</dd>
@@ -62,9 +62,9 @@
 
 		 		<dd class="mark">
 					<!-- IF S_TOPICS -->
-						<input type="checkbox" name="topic_id_list[]" value="{postrow.TOPIC_ID}" />
+						<input type="checkbox" name="topic_id_list[]" value="{postrow.TOPIC_ID}">
 					<!-- ELSE -->
-						<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" />
+						<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}">
 					<!-- ENDIF -->
 				</dd>
 			</dl>
@@ -76,11 +76,11 @@
 		<fieldset class="display-options">
 			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked">&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 		</fieldset>
 
-		<hr />
+		<hr>
 
 		<div class="action-bar bottom">
 			<div class="pagination">
@@ -109,11 +109,11 @@
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
 		<!-- IF S_RESTORE -->
-		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
-		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" />
+		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}">&nbsp;
+		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}">
 		<!-- ELSE -->
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
+		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}">&nbsp;
+		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}">
 		<!-- ENDIF -->
 		<div>
 			<!-- IF S_TOPICS -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_reports.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_reports.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_reports.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_reports.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,7 +5,7 @@
 <!-- IF not S_PM -->
 <fieldset class="forum-selection">
 	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
+	<input type="submit" name="sort" value="{L_GO}" class="button2">
 	{S_FORM_TOKEN}
 </fieldset>
 <!-- ENDIF -->
@@ -46,8 +46,8 @@
 					<!-- IF S_PM -->
 					<dt>
 						<div class="list-inner">
-							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
-							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} &raquo; {postrow.PM_TIME}</span><br />
+							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br>
+							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} &raquo; {postrow.PM_TIME}</span><br>
 							<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
 							<div class="responsive-show" style="display: none;">
 								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}
@@ -60,20 +60,20 @@
 					<!-- ELSE -->
 					<dt>
 						<div class="list-inner">
-							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
+							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br>
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
 							<div class="responsive-show" style="display: none;">
-								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br />
+								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br>
 								<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF -->
 							</div>
 						</div>
 					</dt>
 					<dd class="moderation">
-						<span>{postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br />
+						<span>{postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br>
 						<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span>
 					</dd>
 					<!-- ENDIF -->
-					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd>
+					<dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}"></dd>
 				</dl>
 			</li>
 		<!-- END postrow -->
@@ -82,11 +82,11 @@
 		<fieldset class="display-options">
 			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked">&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 		</fieldset>
 
-		<hr />
+		<hr>
 
 		<div class="action-bar bottom">
 			<div class="pagination">
@@ -108,8 +108,8 @@
 
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
-		<input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
-		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
+		<input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]">
+		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}"><!-- ENDIF -->
 		<div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_topic.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_topic.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_topic.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_topic.html	2014-09-21 12:00:00.000000000 +0200
@@ -33,12 +33,12 @@
 
 	<fieldset id="display-panel" class="fields2" role="tabpanel">
 	<dl>
-		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
-		<dd><input class="inputbox autowidth" type="number" min="0" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>
+		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
+		<dd><input class="inputbox autowidth" type="number" min="0" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}"></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt>
-		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>
+		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2"></dd>
 	</dl>
 	</fieldset>
 
@@ -49,14 +49,14 @@
 	<!-- IF S_SHOW_TOPIC_ICONS -->
 		<dl>
 			<dt><label for="icon">{L_TOPIC_ICON}{L_COLON}</label></dt>
-			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> {L_NO_TOPIC_ICON}</label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon --></dd>
+			<dd><label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked"> {L_NO_TOPIC_ICON}</label>
+			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED}><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title=""></label> <!-- END topic_icon --></dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<dl>
 		<dt><label for="subject">{L_SPLIT_SUBJECT}{L_COLON}</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox" /></dd>
+		<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SPLIT_SUBJECT}" title="{L_SPLIT_SUBJECT}" class="inputbox"></dd>
 	</dl>
 	<dl>
 		<dt><label>{L_SPLIT_FORUM}{L_COLON}</label></dt>
@@ -71,7 +71,7 @@
 	<dl>
 		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt>
 		<dd>
-			<input class="inputbox autowidth" type="number" min="0" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" />
+			<input class="inputbox autowidth" type="number" min="0" size="6" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}">
 			<a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a>
 		</dd>
 		<!-- IF TO_TOPIC_INFO --><dd>{TO_TOPIC_INFO}</dd><!-- ENDIF -->
@@ -104,7 +104,7 @@
 					</li>
 					<li>
 						<label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON}
-							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> />
+							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF -->>
 						</label>
 					</li>
 				</ul>
@@ -148,7 +148,7 @@
 		<!-- END postrow -->
 	</div>
 
-	<hr />
+	<hr>
 
 	<div class="action-bar bottom">
 		<div class="pagination">
@@ -175,7 +175,7 @@
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> 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="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
+	<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}">
 	<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>
 {S_HIDDEN_FIELDS}
 {S_FORM_TOKEN}
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_front.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_front.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_front.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_front.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,7 +12,7 @@
 	<fieldset>
 	<dl>
 		<dt><label for="username">{L_SELECT_USER}{L_COLON}</label></dt>
-		<dd><input name="username" id="username" type="text" class="inputbox" /></dd>
+		<dd><input name="username" id="username" type="text" class="inputbox"></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
 	</fieldset>
@@ -21,8 +21,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_list.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_list.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_list.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_list.html	2014-09-21 12:00:00.000000000 +0200
@@ -46,10 +46,10 @@
 		<fieldset class="display-options">
 			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 		</fieldset>
 
-		<hr />
+		<hr>
 
 		<div class="action-bar bottom">
 			<div class="pagination">
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_post.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_post.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_post.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_post.html	2014-09-21 12:00:00.000000000 +0200
@@ -55,10 +55,10 @@
 	<fieldset>
 		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
 		<!-- IF S_CAN_NOTIFY -->
-		<br /><br />
+		<br><br>
 		<dl class="panel">
 			<dt>&nbsp;</dt>
-			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
+			<dd><label><input type="checkbox" name="notify_user" checked="checked"> {L_NOTIFY_USER_WARN}</label></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
@@ -69,8 +69,8 @@
 <!-- EVENT mcp_warn_post_add_warning_field_after -->
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_user.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_user.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/mcp_warn_user.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/mcp_warn_user.html	2014-09-21 12:00:00.000000000 +0200
@@ -39,10 +39,10 @@
 	<fieldset>
 		<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3"></textarea>
 		<!-- IF S_CAN_NOTIFY -->
-		<br /><br />
+		<br><br>
 		<dl class="panel">
 			<dt>&nbsp;</dt>
-			<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
+			<dd><label><input type="checkbox" name="notify_user" checked="checked"> {L_NOTIFY_USER_WARN}</label></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
@@ -53,8 +53,8 @@
 <!-- EVENT mcp_warn_user_add_warning_field_after -->
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -102,7 +102,7 @@
 			<!-- ENDIF -->
 
 	<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
+		<td><!-- IF memberrow.RANK_IMG --><span class="rank-img">{memberrow.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{memberrow.RANK_TITLE}</span><!-- ENDIF --><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}"> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br>[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
 		<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
 		<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
 		<td>{memberrow.JOINED}</td>
@@ -121,7 +121,7 @@
 
 <!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE -->
 <fieldset class="display-actions">
-	<input type="submit" name="submit" value="{L_SELECT_MARKED}" class="button2" />
+	<input type="submit" name="submit" value="{L_SELECT_MARKED}" class="button2">
 	<div><a href="#" onclick="marklist('results', 'user', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('results', 'user', false); return false;">{L_UNMARK_ALL}</a></div>
 </fieldset>
 <!-- ENDIF -->
@@ -135,7 +135,7 @@
 <fieldset class="display-options">
 	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>
 	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
-	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />
+	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2">
 </fieldset>
 <!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_email.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_email.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_email.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_email.html	2014-09-21 12:00:00.000000000 +0200
@@ -20,7 +20,7 @@
 			</div>
 		</div>
 	</div>
-		<br class="clear" />
+		<br class="clear">
 	<!-- ENDIF -->
 
 	<div class="panel">
@@ -36,7 +36,7 @@
 			</dl>
 			<dl>
 				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>
+				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}"></dd>
 			</dl>
 		<!-- ELSEIF S_CONTACT_ADMIN-->
 			<dl>
@@ -46,40 +46,40 @@
 			<!-- IF not S_IS_REGISTERED -->
 			<dl>
 				<dt><label for="email">{L_SENDER_EMAIL_ADDRESS}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}" /></dd>
+				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}"></dd>
 			</dl>
 			<dl>
 				<dt><label for="name">{L_SENDER_NAME}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}" /></dd>
+				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}"></dd>
 			</dl>
 			<!-- ENDIF -->
 			<dl>
 				<dt><label for="subject">{L_SUBJECT}:</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}" /></dd>
+				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}"></dd>
 			</dl>
 		<!-- ELSE -->
 			<dl>
 				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
-				<dd><input class="inputbox autowidth" type="email" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}" /></dd>
+				<dd><input class="inputbox autowidth" type="email" name="email" id="email" size="50" maxlength="100" tabindex="2" value="{EMAIL}"></dd>
 			</dl>
 			<dl>
 				<dt><label for="name">{L_REAL_NAME}{L_COLON}</label></dt>
-				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd>
+				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}"></dd>
 			</dl>
 			<dl>
-				<dt><label for="lang">{L_DEST_LANG}{L_COLON}</label><br />
+				<dt><label for="lang">{L_DEST_LANG}{L_COLON}</label><br>
 					<span>{L_DEST_LANG_EXPLAIN}</span></dt>
 				<dd><select name="lang">{S_LANG_OPTIONS}</select></dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="message">{L_MESSAGE_BODY}{L_COLON}</label><br />
+			<dt><label for="message">{L_MESSAGE_BODY}{L_COLON}</label><br>
 			<span>{L_EMAIL_BODY_EXPLAIN}</span></dt>
 			<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>
+			<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5"> {L_CC_EMAIL}</label></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -91,7 +91,7 @@
 	<div class="inner">
 	<div class="content">
 		<fieldset class="submit-buttons">
-			<input type="submit" tabindex="6" name="submit" class="button1" value="{L_SEND_EMAIL}" />
+			<input type="submit" tabindex="6" name="submit" class="button1" value="{L_SEND_EMAIL}">
 		</fieldset>
 	</div>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_im.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_im.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_im.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_im.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,7 +22,7 @@
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
+			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}"></dd>
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_search.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_search.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_search.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_search.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,7 +11,7 @@
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 		<dd>
 			<!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF -->
-			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> />
+			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF -->>
 			<!-- IF U_LIVE_SEARCH -->
 				<div class="dropdown live-search hidden" id="user-search">
 					<div class="pointer"><div class="pointer-inner"></div></div>
@@ -26,13 +26,13 @@
 <!-- IF S_EMAIL_SEARCH_ALLOWED -->
 	<dl>
 		<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
-		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
+		<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox"></dd>
 	</dl>
 <!-- ENDIF -->
 <!-- IF S_JABBER_ENABLED -->
 	<dl>
 		<dt><label for="jabber">{L_JABBER}:</label></dt>
-		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
+		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox"></dd>
 	</dl>
 <!-- ENDIF -->
 	<dl>
@@ -48,33 +48,33 @@
 	<fieldset class="fields1 column2">
 	<dl>
 		<dt><label for="joined">{L_JOINED}{L_COLON}</label></dt>
-		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}" /></dd>
+		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="joined" id="joined" value="{JOINED}"></dd>
 	</dl>
 <!-- IF S_VIEWONLINE -->
 	<dl>
 		<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label></dt>
-		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}" /></dd>
+		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="inputbox medium" type="text" name="active" id="active" value="{ACTIVE}"></dd>
 	</dl>
 <!-- ENDIF -->
 	<dl>
 		<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
-		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="number" min="0" name="count" id="count" value="{COUNT}" /></dd>
+		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="inputbox medium" type="number" min="0" name="count" id="count" value="{COUNT}"></dd>
 	</dl>
 <!-- IF S_IP_SEARCH_ALLOWED -->
 	<dl>
 		<dt><label for="ip">{L_POST_IP}{L_COLON}</label></dt>
-		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd>
+		<dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}"></dd>
 	</dl>
 <!-- ENDIF -->
 	</fieldset>
 
 	<div class="clear"></div>
 
-	<hr />
+	<hr>
 
 	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+		<input type="submit" name="submit" value="{L_SEARCH}" class="button1">
 		{S_FORM_TOKEN}
 	</fieldset>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_view.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_view.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/memberlist_view.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/memberlist_view.html	2014-09-21 12:00:00.000000000 +0200
@@ -30,7 +30,7 @@
 		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
-		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
+		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2"></dd><!-- ENDIF -->
 		<!-- BEGIN custom_fields -->
 			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
 				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
@@ -95,12 +95,12 @@
 			<!-- ENDIF -->
 			<dt>{L_TOTAL_POSTS}{L_COLON}</dt>
 				<dd>{POSTS} <!-- IF S_DISPLAY_SEARCH -->| <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- ENDIF -->
-					<!-- 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 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 -->
 				</dd>
 			<!-- IF S_SHOW_ACTIVITY and POSTS -->
-				<dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-				<dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br>({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br>({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
 			<!-- ENDIF -->
 			<!-- EVENT memberlist_view_user_statistics_after -->
 		</dl>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/notification_dropdown.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/notification_dropdown.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/notification_dropdown.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/notification_dropdown.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,7 +22,7 @@
 					<!-- IF notifications.URL -->
 						<a class="notification-block" href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->">
 					<!-- ENDIF -->
-						<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+						<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt=""><!-- ENDIF -->
 						<div class="notification_text">
 							<p class="notification-title">{notifications.FORMATTED_TITLE}</p>
 							<!-- IF notifications.REFERENCE --><p class="notification-reference">{notifications.REFERENCE}</p><!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/overall_footer.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/overall_footer.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/overall_footer.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/overall_footer.html	2014-09-21 12:00:00.000000000 +0200
@@ -9,10 +9,10 @@
 	<div class="copyright">
 		<!-- EVENT overall_footer_copyright_prepend -->
 		{CREDIT_LINE}
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- IF TRANSLATION_INFO --><br>{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- EVENT overall_footer_copyright_append -->
-		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
-		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
+		<!-- IF DEBUG_OUTPUT --><br>{DEBUG_OUTPUT}<!-- ENDIF -->
+		<!-- IF U_ACP --><br><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
 
 	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
@@ -37,9 +37,9 @@
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </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>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/overall_header.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/overall_header.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/overall_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/overall_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,22 +2,22 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width">
 {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 -->
+	<!-- 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}" />
+	<link rel="canonical" href="{U_CANONICAL}">
 <!-- ENDIF -->
 
 <!--
@@ -27,22 +27,22 @@
 	Modified by:
 -->
 
-<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
+<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="print" title="printonly">
+<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" media="screen, projection"><!-- ENDIF -->
+<link href="{T_STYLESHEET_LINK}" rel="stylesheet" media="screen, projection">
+<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" media="screen, projection">
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)">
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen, projection">
 <!-- ENDIF -->
 
 <!-- IF S_PLUPLOAD -->
-	<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen, projection">
 <!-- ENDIF -->
 
 <!--[if lte IE 9]>
-	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen, projection">
 <![endif]-->
 
 <!-- EVENT overall_header_head_append -->
@@ -73,7 +73,7 @@
 			<div id="search-box" class="search-box search-header">
 				<form action="{U_SEARCH}" method="get" id="search">
 				<fieldset>
-					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" />
+					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}">
 					<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
 					<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
 					{S_SEARCH_HIDDEN_FIELDS}
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/pagination.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/pagination.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/pagination.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/pagination.html	2014-09-21 12:00:00.000000000 +0200
@@ -7,8 +7,8 @@
 			<ul class="dropdown-contents">
 				<li>{L_JUMP_TO_PAGE}{L_COLON}</li>
 				<li class="page-jump-form">
-					<input type="number" name="page-number" min="1" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" />
-					<input class="button2" value="{L_GO}" type="button" />
+					<input type="number" name="page-number" min="1" maxlength="6" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}">
+					<input class="button2" value="{L_GO}" type="button">
 				</li>
 			</ul>
 		</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/plupload.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/plupload.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/plupload.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/plupload.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,5 +1,4 @@
-<script type="text/javascript">
-//<![CDATA[
+<script>
 phpbb.plupload = {
 	i18n: {
 		'b': '{LA_BYTES_SHORT}',
@@ -63,7 +62,6 @@
 	maxFiles: {MAX_ATTACHMENTS},
 	data: {S_ATTACH_DATA},
 }
-//]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_attach_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_attach_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_attach_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_attach_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -7,8 +7,8 @@
 	<dl>
 		<dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt>
 		<dd>
-			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth" /> 
-			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />
+			<input type="file" name="fileupload" id="fileupload" maxlength="{FILESIZE}" value="" class="inputbox autowidth"> 
+			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;">
 		</dd>
 	</dl>
 	<dl>
@@ -18,7 +18,7 @@
 	</fieldset>
 
 	<div id="attach-panel-multi">
-		<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" />
+		<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files">
 	</div>
 
 	<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container">
@@ -37,8 +37,8 @@
 							<td class="attach-name">
 								<span class="file-name ellipsis-text"></span>
 								<span class="attach-controls">
-									<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp;
-									<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
+									<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode">&nbsp;
+									<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete">
 								</span>
 								<span class="clear"></span>
 							</td>
@@ -60,8 +60,8 @@
 							<td class="attach-name">
 								<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
 								<span class="attach-controls">
-									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
-									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />
+									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode">&nbsp; <!-- ENDIF -->
+									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete">
 								</span>
 								<span class="clear"></span>
 							</td>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_buttons.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_buttons.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_buttons.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_buttons.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,6 +1,5 @@
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var form_name = 'postform';
 	var text_name = <!-- IF $SIG_EDIT -->'signature'<!-- ELSE -->'message'<!-- ENDIF -->;
 	var load_draft = false;
@@ -46,8 +45,6 @@
 			document.getElementById('bbpalette').value = '{LA_FONT_COLOR}';
 		}
 	}
-
-// ]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
@@ -61,24 +58,24 @@
 
 <!-- EVENT posting_editor_buttons_before -->
 <div id="format-buttons">
-	<input type="button" class="button2 bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-	<input type="button" class="button2 bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-	<input type="button" class="button2 bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+	<input type="button" class="button2 bbcode-b" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
+	<input type="button" class="button2 bbcode-i" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}">
+	<input type="button" class="button2 bbcode-u" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}">
 	<!-- IF S_BBCODE_QUOTE -->
-		<input type="button" class="button2 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+		<input type="button" class="button2 bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}">
 	<!-- ENDIF -->
-	<input type="button" class="button2 bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-	<input type="button" class="button2 bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-	<input type="button" class="button2 bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2 bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<input type="button" class="button2 bbcode-code" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}">
+	<input type="button" class="button2 bbcode-list" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}">
+	<input type="button" class="button2 bbcode-list-" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}">
+	<input type="button" class="button2 bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}">
 	<!-- IF S_BBCODE_IMG -->
-		<input type="button" class="button2 bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+		<input type="button" class="button2 bbcode-img" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}">
 	<!-- ENDIF -->
 	<!-- IF S_LINKS_ALLOWED -->
-		<input type="button" class="button2 bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+		<input type="button" class="button2 bbcode-url" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}">
 	<!-- ENDIF -->
 	<!-- IF S_BBCODE_FLASH -->
-		<input type="button" class="button2 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+		<input type="button" class="button2 bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}">
 	<!-- ENDIF -->
 	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
@@ -91,9 +88,9 @@
 			<!-- ENDIF -->
 		<!-- ENDIF -->
 	</select>
-	<input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
+	<input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}">
 	<!-- BEGIN custom_tags -->
-		<input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+		<input type="button" class="button2 bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}">
 	<!-- END custom_tags -->
 </div>
 <!-- EVENT posting_editor_buttons_after -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_editor.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_editor.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_editor.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_editor.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,8 +5,8 @@
 	<dl>
 		<dt><label for="icon">{L_ICON}{L_COLON}</label></dt>
 		<dd>
-			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" 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="" /></label> <!-- END topic_icon -->
+			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1"> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
+			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" 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=""></label> <!-- END topic_icon -->
 		</dd>
 	</dl>
 	<!-- ENDIF -->
@@ -14,7 +14,7 @@
 	<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
 	<dl style="clear: left;">
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
+		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth"></dd>
 	</dl>
 	<!-- ENDIF -->
 
@@ -23,7 +23,7 @@
 	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
 	<dl style="clear: left;">
 		<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
-		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
+		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth"></dd>
 	</dl>
 	<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
 		<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->
@@ -37,29 +37,29 @@
 
 	<div id="smiley-box">
 		<!-- IF S_SMILIES_ALLOWED and .smiley -->
-			<strong>{L_SMILIES}</strong><br />
+			<strong>{L_SMILIES}</strong><br>
 			<!-- BEGIN smiley -->
-				<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
+				<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}"></a>
 			<!-- END smiley -->
 		<!-- ENDIF -->
 		<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
-			<br /><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
+			<br><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a>
 		<!-- ENDIF -->
 
 		<!-- IF BBCODE_STATUS -->
 		<div class="bbcode-status">
-			<!-- IF .smiley --><hr /><!-- ENDIF -->
-			{BBCODE_STATUS}<br />
+			<!-- IF .smiley --><hr><!-- ENDIF -->
+			{BBCODE_STATUS}<br>
 			<!-- IF S_BBCODE_ALLOWED -->
-				{IMG_STATUS}<br />
-				{FLASH_STATUS}<br />
-				{URL_STATUS}<br />
+				{IMG_STATUS}<br>
+				{FLASH_STATUS}<br>
+				{URL_STATUS}<br>
 			<!-- ENDIF -->
 			{SMILIES_STATUS}
 		</div>
 		<!-- ENDIF -->
 		<!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->
-			<!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF -->
+			<!-- IF S_DISPLAY_REVIEW --><hr><!-- ENDIF -->
 			<!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
 			<!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF -->
 		<!-- ENDIF -->
@@ -87,10 +87,10 @@
 		<fieldset class="submit-buttons">
 			{S_HIDDEN_ADDRESS_FIELD}
 			{S_HIDDEN_FIELDS}
-			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
-			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" class="button2" />&nbsp; <!-- ENDIF -->
-			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
-			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 default-submit-action" />&nbsp;
+			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" class="button2" onclick="load_draft = true;">&nbsp; <!-- ENDIF -->
+			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" class="button2">&nbsp; <!-- ENDIF -->
+			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF -->>&nbsp;
+			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 default-submit-action">&nbsp;
 
 		</fieldset>
 
@@ -125,53 +125,53 @@
 		<fieldset class="fields1">
 			<!-- EVENT posting_editor_options_prepend -->
 			<!-- IF S_BBCODE_ALLOWED -->
-				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
+				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED}> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_SMILIES_ALLOWED -->
-				<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label></div>
+				<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED}> {L_DISABLE_SMILIES}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_LINKS_ALLOWED -->
-				<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
+				<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED}> {L_DISABLE_MAGIC_URL}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_SIG_ALLOWED -->
-				<div><label for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label></div>
+				<div><label for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED}> {L_ATTACH_SIG}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_NOTIFY_ALLOWED -->
-				<div><label for="notify"><input type="checkbox" name="notify" id="notify"{S_NOTIFY_CHECKED} /> {L_NOTIFY_REPLY}</label></div>
+				<div><label for="notify"><input type="checkbox" name="notify" id="notify"{S_NOTIFY_CHECKED}> {L_NOTIFY_REPLY}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_LOCK_TOPIC_ALLOWED -->
-				<div><label for="lock_topic"><input type="checkbox" name="lock_topic" id="lock_topic"{S_LOCK_TOPIC_CHECKED} /> {L_LOCK_TOPIC}</label></div>
+				<div><label for="lock_topic"><input type="checkbox" name="lock_topic" id="lock_topic"{S_LOCK_TOPIC_CHECKED}> {L_LOCK_TOPIC}</label></div>
 			<!-- ENDIF -->
 			<!-- IF S_LOCK_POST_ALLOWED -->
-				<div><label for="lock_post"><input type="checkbox" name="lock_post" id="lock_post"{S_LOCK_POST_CHECKED} /> {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</label></div>
+				<div><label for="lock_post"><input type="checkbox" name="lock_post" id="lock_post"{S_LOCK_POST_CHECKED}> {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</label></div>
 			<!-- ENDIF -->
 
 			<!-- IF S_TYPE_TOGGLE or S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
-			<hr class="dashed" />
+			<hr class="dashed">
 			<!-- ENDIF -->
 
 			<!-- IF S_TYPE_TOGGLE -->
 			<dl>
 				<dt><label for="topic_type-0"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON}</label></dt>
-				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>
+				<dd><!-- BEGIN topic_type --><label for="topic_type-{topic_type.VALUE}"><input type="radio" name="topic_type" id="topic_type-{topic_type.VALUE}" value="{topic_type.VALUE}"{topic_type.S_CHECKED}>{topic_type.L_TOPIC_TYPE}</label> <!-- END topic_type --></dd>
 			</dl>
 			<!-- ENDIF -->
 
 			<!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
 			<dl>
 				<dt><label for="topic_time_limit">{L_STICK_TOPIC_FOR}{L_COLON}</label></dt>
-				<dd><label for="topic_time_limit"><input type="number" min="0" max="999" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
+				<dd><label for="topic_time_limit"><input type="number" min="0" max="999" name="topic_time_limit" id="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" class="inputbox autowidth"> {L_DAYS}</label></dd>
 				<dd>{L_STICK_TOPIC_FOR_EXPLAIN}</dd>
 			</dl>
 			<!-- ENDIF -->
 
 			<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED -->
-				<hr class="dashed" />
+				<hr class="dashed">
 				<dl>
 					<dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt>
-					<dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED} /> {L_DELETE_POST_WARN}</label></dd>
+					<dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED}> {L_DELETE_POST_WARN}</label></dd>
 					<!-- IF S_DELETE_ALLOWED and S_SOFTDELETE_ALLOWED -->
-						<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent" /> {L_DELETE_POST_PERMANENTLY}</label></dd>
+						<dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent"> {L_DELETE_POST_PERMANENTLY}</label></dd>
 					<!-- ENDIF -->
 				</dl>
 			<!-- ENDIF -->
@@ -179,7 +179,7 @@
 			<!-- IF S_EDIT_REASON -->
 			<dl>
 				<dt><label for="edit_reason">{L_EDIT_REASON}{L_COLON}</label></dt>
-				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd>
+				<dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox"></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_layout.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_layout.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_layout.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_layout.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,7 +13,7 @@
 		<!-- IF U_FORUM_RULES -->
 			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
 		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
+			<strong>{L_FORUM_RULES}</strong><br>
 			{FORUM_RULES}
 		<!-- ENDIF -->
 		
@@ -51,7 +51,7 @@
 			
 			<dl>
 				<dt>&nbsp;</dt>
-				<dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
+				<dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}"> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}"></dd>
 			</dl>
 		</fieldset>
 
@@ -68,7 +68,7 @@
 
 	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->
 	<!-- INCLUDE posting_editor.html -->
-	<input type="hidden" name="show_panel" value="options-panel" />
+	<input type="hidden" name="show_panel" value="options-panel">
 	{S_FORM_TOKEN}
 	</div>
 </div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_pm_header.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_pm_header.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_pm_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_pm_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -3,8 +3,8 @@
 
 		<!-- IF S_GROUP_OPTIONS -->
 			<div class="column2">
-				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br />
-				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br />
+				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br>
+				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br>
 			</div>
 		<!-- ENDIF -->
 		<!-- IF S_ALLOW_MASS_PM -->
@@ -13,8 +13,8 @@
 			<dl class="pmlist">
 				<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
 				<dd class="recipients">
-				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
-				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1">
+				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1">
 				<!-- EVENT posting_pm_header_find_username_before -->
 				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
 				<!-- EVENT posting_pm_header_find_username_after -->
@@ -22,7 +22,7 @@
 			</dl>
 			<!-- ENDIF -->
 		</div>
-		<!-- IF .to_recipient or .bcc_recipient --><hr /><!-- ENDIF -->
+		<!-- IF .to_recipient or .bcc_recipient --><hr><!-- ENDIF -->
 		<div class="column1">
 			<!-- IF .to_recipient -->
 				<dl>
@@ -31,7 +31,7 @@
 					<ul class="recipients">
 						<!-- BEGIN to_recipient -->
 						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2"><!-- ENDIF -->
 							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
 						</li>
 						<!-- END to_recipient -->
@@ -48,7 +48,7 @@
 					<ul class="recipients">
 						<!-- BEGIN bcc_recipient -->
 						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2"><!-- ENDIF -->
 							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
 						</li>
 						<!-- END bcc_recipient -->
@@ -60,9 +60,9 @@
 		<!-- ELSE -->
 		<div class="column1">
 			<dl>
-				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
+				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
 				<!-- IF not S_EDIT_POST -->
-				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
+				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value=""> <input type="submit" name="add_to" value="{L_ADD}" class="button2"></dd>
 				<!-- ENDIF -->
 				<!-- IF .to_recipient -->
 					<dd class="recipients">
@@ -70,7 +70,7 @@
 						<!-- BEGIN to_recipient -->
 						<li>
 							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2"><!-- ENDIF -->
 						</li>
 						<!-- END to_recipient -->
 					</dd>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_poll_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_poll_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_poll_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_poll_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,44 +10,44 @@
 		<!-- IF S_POLL_DELETE -->
 			<dl>
 				<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
-				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
+				<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF -->> </label></dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>
-			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>
+			<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox"></dd>
 		</dl>
 		<dl>
-			<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>
+			<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt>
 			<dd><textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="inputbox">{POLL_OPTIONS}</textarea></dd>
 		</dl>
 
-		<hr class="dashed" />
+		<hr class="dashed">
 
 		<dl>
 			<dt><label for="poll_max_options">{L_POLL_MAX_OPTIONS}{L_COLON}</label></dt>
-			<dd><input type="number" min="0" max="999" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth" /></dd>
+			<dd><input type="number" min="0" max="999" name="poll_max_options" id="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" class="inputbox autowidth"></dd>
 			<dd>{L_POLL_MAX_OPTIONS_EXPLAIN}</dd>
 		</dl>
 		<dl>
 			<dt><label for="poll_length">{L_POLL_FOR}{L_COLON}</label></dt>
-			<dd><label for="poll_length"><input type="number" min="0" max="999" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth" /> {L_DAYS}</label></dd>
+			<dd><label for="poll_length"><input type="number" min="0" max="999" name="poll_length" id="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" class="inputbox autowidth"> {L_DAYS}</label></dd>
 			<dd>{L_POLL_FOR_EXPLAIN}</dd>
 		</dl>
 
 		<!-- IF S_POLL_VOTE_CHANGE -->
-			<hr class="dashed" />
+			<hr class="dashed">
 
 			<dl>
 				<dt><label for="poll_vote_change">{L_POLL_VOTE_CHANGE}{L_COLON}</label></dt>
-				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>
+				<dd><label for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change"{VOTE_CHANGE_CHECKED}> {L_POLL_VOTE_CHANGE_EXPLAIN}</label></dd>
 			</dl>
 		<!-- ENDIF -->
 
 	<!-- ELSEIF S_POLL_DELETE -->
 		<dl class="fields1">
 			<dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
-			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
+			<dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF -->> </label></dd>
 		</dl>
 	<!-- ENDIF -->
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_preview.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_preview.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_preview.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_preview.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,13 +4,13 @@
 <!-- IF S_HAS_POLL_OPTIONS -->
 	<div class="content">
 		<h2>{L_PREVIEW}{L_COLON} {POLL_QUESTION}</h2>
-		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br /><!-- ENDIF -->{L_MAX_VOTES}</p>
+		<p class="author"><!-- IF L_POLL_LENGTH -->{L_POLL_LENGTH}<br><!-- ENDIF -->{L_MAX_VOTES}</p>
 
 		<fieldset class="polls">
 		<!-- BEGIN poll_option -->
 			<dl>
 				<dt><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label></dt>
-				<dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd>
+				<dd style="width: auto;"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF -->><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF -->><!-- ENDIF --></dd>
 			</dl>
 		<!-- END poll_option -->
 		</fieldset>
@@ -44,4 +44,4 @@
 	</div>
 </div>
 
-<hr />
+<hr>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_review.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_review.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_review.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_review.html	2014-09-21 12:00:00.000000000 +0200
@@ -32,4 +32,4 @@
 </div>
 <!-- END post_review_row -->
 
-<hr />
+<hr>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_smilies.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_smilies.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_smilies.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_smilies.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,10 +1,8 @@
 <!-- INCLUDE simple_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var form_name = opener.form_name;
 	var text_name = opener.text_name;
-// ]]>
 </script>
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
@@ -12,7 +10,7 @@
 <div class="panel">
 	<div class="inner">
 		<!-- 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}" /></a> 
+			<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}"></a> 
 		<!-- END smiley -->
 	
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/posting_topic_review.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_topic_review.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/posting_topic_review.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/posting_topic_review.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,10 +5,8 @@
 </h3>
 
 <div id="topicreview">
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	bbcodeEnabled = {S_BBCODE_ALLOWED};
-// ]]>
 </script>
 	<!-- BEGIN topic_review_row -->
 
@@ -64,7 +62,7 @@
 	<!-- END topic_review_row -->
 </div>
 
-<hr />
+<hr>
 
 <!-- IF S_MCP_REPORT -->
 	<p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/bool.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/bool.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/bool.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/bool.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,7 @@
 <!-- BEGIN bool -->
 <!-- IF bool.FIELD_LENGTH eq 1 -->
-	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED} /> {bool.options.VALUE}</label> <!-- END options -->
+	<!-- BEGIN options --><label for="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}"><input type="radio" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}_{bool.options.OPTION_ID}" value="{bool.options.OPTION_ID}"{bool.options.CHECKED}> {bool.options.VALUE}</label> <!-- END options -->
 <!-- ELSE -->
-	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF --> />
+	<input type="checkbox" class="radio" name="{bool.FIELD_IDENT}" id="{bool.FIELD_IDENT}"<!-- IF bool.FIELD_VALUE --> checked="checked"<!-- ENDIF -->>
 <!-- ENDIF -->
 <!-- END bool -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/int.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/int.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/int.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/int.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN int -->
-<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" />
+<input type="number" min="{int.FIELD_MINLEN}" max="{int.FIELD_MAXLEN}" class="inputbox autowidth" name="{int.FIELD_IDENT}" id="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}">
 <!-- END int -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/string.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/string.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/string.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/string.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN string -->
-<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" />
+<input type="text" class="inputbox autowidth" name="{string.FIELD_IDENT}" id="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}">
 <!-- END string -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/url.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/url.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/profilefields/url.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/profilefields/url.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,3 +1,3 @@
 <!-- BEGIN url -->
-<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}" />
+<input type="url" class="inputbox autowidth" name="{url.FIELD_IDENT}" id="{url.FIELD_IDENT}" size="{url.FIELD_LENGTH}" maxlength="{url.FIELD_MAXLEN}" value="{url.FIELD_VALUE}">
 <!-- END url -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/quickreply_editor.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/quickreply_editor.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/quickreply_editor.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/quickreply_editor.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,7 +6,7 @@
 				<fieldset class="fields1">
 					<dl style="clear: left;">
 						<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
-						<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd>
+						<dd><input type="text" name="subject" id="subject" size="45" maxlength="124" tabindex="2" value="{SUBJECT}" class="inputbox autowidth"></dd>
 					</dl>
 				<!-- EVENT quickreply_editor_message_before -->
 				<div id="message-box">
@@ -17,8 +17,8 @@
 				<fieldset class="submit-buttons">
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
-					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" id="qr_full_editor" />&nbsp;
-					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
+					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" id="qr_full_editor">&nbsp;
+					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1">&nbsp;
 				</fieldset>
 		</div>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/report_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/report_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/report_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/report_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -17,15 +17,15 @@
 		</dl>
 		<!-- IF S_CAN_NOTIFY -->
 			<dl class="fields2">
-				<dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br /><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>
+				<dt><label for="notify1">{L_REPORT_NOTIFY}{L_COLON}</label><br><span>{L_REPORT_NOTIFY_EXPLAIN}</span></dt>
 				<dd>
-					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+					<label for="notify1"><input type="radio" name="notify" id="notify1" value="1" <!-- IF not S_NOTIFY -->checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+					<label for="notify0"><input type="radio" name="notify" id="notify0" value="0" <!-- IF S_NOTIFY -->checked="checked"<!-- ENDIF -->> {L_NO}</label>
 				</dd>
 			</dl>
 		<!-- ENDIF -->
 		<dl class="fields2">
-			<dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br /><span>{L_CAN_LEAVE_BLANK}</span></dt>
+			<dt><label for="report_text">{L_MORE_INFO}{L_COLON}</label><br><span>{L_CAN_LEAVE_BLANK}</span></dt>
 			<dd><textarea name="report_text" id="report_text" rows="10" cols="76" class="inputbox">{REPORT_TEXT}</textarea></dd>
 		</dl>
 		<!-- IF CAPTCHA_TEMPLATE -->
@@ -42,8 +42,8 @@
 
 	<div class="content">
 		<fieldset class="submit-buttons">
-			<input type="submit" name="submit" class="button1" value="{L_SUBMIT}" />&nbsp;
-			<input type="submit" name="cancel" class="button2" value="{L_CANCEL}" />
+			<input type="submit" name="submit" class="button1" value="{L_SUBMIT}">&nbsp;
+			<input type="submit" name="cancel" class="button2" value="{L_CANCEL}">
 			{S_FORM_TOKEN}
 		</fieldset>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/search_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/search_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/search_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/search_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,14 +10,14 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
-		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked" /> {L_SEARCH_ALL_TERMS}</label></dd>
-		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any" /> {L_SEARCH_ANY_TERMS}</label></dd>
+		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}"></dd>
+		<dd><label for="terms1"><input type="radio" name="terms" id="terms1" value="all" checked="checked"> {L_SEARCH_ALL_TERMS}</label></dd>
+		<dd><label for="terms2"><input type="radio" name="terms" id="terms2" value="any"> {L_SEARCH_ANY_TERMS}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
-		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
+		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
+		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}"></dd>
 	</dl>
 	</fieldset>
 
@@ -31,38 +31,38 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
+		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
 		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_child1">{L_SEARCH_SUBFORUMS}{L_COLON}</label></dt>
 		<dd>
-			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked" /> {L_YES}</label>
-			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0" /> {L_NO}</label>
+			<label for="search_child1"><input type="radio" name="sc" id="search_child1" value="1" checked="checked"> {L_YES}</label>
+			<label for="search_child2"><input type="radio" name="sc" id="search_child2" value="0"> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="sf1">{L_SEARCH_WITHIN}{L_COLON}</label></dt>
-		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked" /> {L_SEARCH_TITLE_MSG}</label></dd>
-		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly" /> {L_SEARCH_MSG_ONLY}</label></dd>
-		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
-		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_FIRST_POST}</label></dd>
+		<dd><label for="sf1"><input type="radio" name="sf" id="sf1" value="all" checked="checked"> {L_SEARCH_TITLE_MSG}</label></dd>
+		<dd><label for="sf2"><input type="radio" name="sf" id="sf2" value="msgonly"> {L_SEARCH_MSG_ONLY}</label></dd>
+		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly"> {L_SEARCH_TITLE_ONLY}</label></dd>
+		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost"> {L_SEARCH_FIRST_POST}</label></dd>
 	</dl>
 
-	<hr class="dashed" />
+	<hr class="dashed">
 
 	<dl>
 		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>
 		<dd>
-			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked" /> {L_POSTS}</label>
-			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics" /> {L_TOPICS}</label>
+			<label for="show_results1"><input type="radio" name="sr" id="show_results1" value="posts" checked="checked"> {L_POSTS}</label>
+			<label for="show_results2"><input type="radio" name="sr" id="show_results2" value="topics"> {L_TOPICS}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="sd">{L_RESULT_SORT}{L_COLON}</label></dt>
 		<dd>{S_SELECT_SORT_KEY}&nbsp;
-			<label for="sa"><input type="radio" name="sd" id="sa" value="a" /> {L_SORT_ASCENDING}</label>
-			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked" /> {L_SORT_DESCENDING}</label>
+			<label for="sa"><input type="radio" name="sd" id="sa" value="a"> {L_SORT_ASCENDING}</label>
+			<label for="sd"><input type="radio" name="sd" id="sd" value="d" checked="checked"> {L_SORT_DESCENDING}</label>
 		</dd>
 	</dl>
 	<dl>
@@ -82,8 +82,8 @@
 	<div class="inner">
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+		<input type="submit" name="submit" value="{L_SEARCH}" class="button1">
 	</fieldset>
 
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/search_results.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/search_results.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/search_results.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/search_results.html	2014-09-21 12:00:00.000000000 +0200
@@ -18,7 +18,7 @@
 		<div class="search-box">
 			<form method="post" action="{S_SEARCH_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" />
+				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}">
 				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
 				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
 			</fieldset>
@@ -68,7 +68,7 @@
 							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
-							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br>
 							<!-- IF .searchresults.pagination -->
 							<div class="pagination">
 								<ul>
@@ -93,7 +93,7 @@
 					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
 					<dd class="lastpost"><span>
 						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
-						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>
+						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br>{searchresults.LAST_POST_TIME}<br> </span>
 					</dd>
 				</dl>
 			</li>
@@ -165,13 +165,13 @@
 		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
 			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
 			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 		<!-- ENDIF -->
 	</fieldset>
 
 	</form>
 
-	<hr />
+	<hr>
 <!-- ENDIF -->
 
 <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/simple_footer.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/simple_footer.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/simple_footer.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/simple_footer.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,8 +1,8 @@
 	</div>
 
 	<div class="copyright">{CREDIT_LINE}
-		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
+		<!-- IF TRANSLATION_INFO --><br>{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- IF DEBUG_OUTPUT --><br>{DEBUG_OUTPUT}<!-- ENDIF -->
 	</div>
 
 	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
@@ -20,9 +20,9 @@
 	</div>
 </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>
+<script src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/simple_header.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/simple_header.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/simple_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/simple_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,22 +2,22 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width" />
+<meta name="viewport" content="width=device-width">
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
-<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" />
-<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->
-<link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
+<link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="print" title="printonly">
+<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" media="screen, projection"><!-- ENDIF -->
+<link href="{T_STYLESHEET_LINK}" rel="stylesheet" media="screen, projection">
+<link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" media="screen, projection">
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)">
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen, projection">
 <!-- ENDIF -->
 
 <!--[if lte IE 8]>
-	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
+	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" media="screen, projection">
 <![endif]-->
 
 <!-- DEFINE $POPUP = 1 -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/timezone_option.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/timezone_option.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/timezone_option.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/timezone_option.html	2014-09-21 12:00:00.000000000 +0200
@@ -6,7 +6,7 @@
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
 			{S_TZ_DATE_OPTIONS}
 		</select>
-		<input type="button" id="tz_select_date_suggest" class="button2" 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}" />
+		<input type="button" id="tz_select_date_suggest" class="button2" 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}">
 	</dd>
 	<!-- ENDIF -->
 	<dd>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_agreement.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_agreement.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_agreement.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_agreement.html	2014-09-21 12:00:00.000000000 +0200
@@ -3,8 +3,7 @@
 <!-- IF S_SHOW_COPPA or S_REGISTRATION -->
 
 <!-- IF S_LANG_OPTIONS -->
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	/**
 	* Change language
 	*/
@@ -14,8 +13,6 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit();
 	}
-
-// ]]>
 </script>
 
 	<form method="post" action="{S_UCP_ACTION}" id="register">
@@ -48,8 +45,8 @@
 			<!-- IF S_SHOW_COPPA -->
 			<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a>
 			<!-- ELSE -->
-			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
-			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" />
+			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1">&nbsp;
+			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2">
 			<!-- ENDIF -->
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
@@ -65,7 +62,7 @@
 		<div class="content">
 			<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>
 			<p>{AGREEMENT_TEXT}</p>
-			<hr class="dashed" />
+			<hr class="dashed">
 			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>
 		</div>
 		</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_attachments.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_attachments.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_attachments.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_attachments.html	2014-09-21 12:00:00.000000000 +0200
@@ -38,13 +38,13 @@
 			<dl>
 				<dt>
 					<div class="list-inner">
-						<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle attachment-filename ellipsis-text" title="{attachrow.FILENAME}">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
+						<a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle attachment-filename ellipsis-text" title="{attachrow.FILENAME}">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br>
 						<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}{L_COLON} <!-- ELSE -->{L_TOPIC}{L_COLON} <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a>
 					</div>
 				</dt>
 				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>
 				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>
-				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd>
+				<dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1"></dd>
 			</dl>
 		</li>
 		<!-- END attachrow -->
@@ -53,11 +53,11 @@
 		<fieldset class="display-options">
 			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
 			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
-			<input class="button2" type="submit" name="sort" value="{L_SORT}" />
+			<input class="button2" type="submit" name="sort" value="{L_SORT}">
 			{S_FORM_TOKEN}
 		</fieldset>
 
-		<hr />
+		<hr>
 
 		<div class="action-bar bottom">
 			<div class="pagination">
@@ -79,7 +79,7 @@
 	
 <!-- IF S_ATTACHMENT_ROWS -->
 	<fieldset class="display-actions">	
-		<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
+		<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}">
 		<div><a href="#" onclick="marklist('ucp', 'attachment', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'attachment', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_auth_link_oauth.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_auth_link_oauth.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_auth_link_oauth.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_auth_link_oauth.html	2014-09-21 12:00:00.000000000 +0200
@@ -10,7 +10,7 @@
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1" /></dd>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1"></dd>
 				</dl>
 			<!-- ELSE -->
 				<dl>
@@ -18,7 +18,7 @@
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1"></dd>
 				</dl>
 			<!-- ENDIF -->
 		</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options.html	2014-09-21 12:00:00.000000000 +0200
@@ -7,9 +7,9 @@
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl>
-			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
-			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br><span>{L_AVATAR_EXPLAIN}</span></dt>
+			<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt=""><!-- ENDIF --></dd>
+			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete"> {L_DELETE_AVATAR}</label></dd>
 		</dl>
 	</fieldset>
 	<h3>{L_AVATAR_SELECT}</h3>
@@ -39,8 +39,8 @@
 	</div>
 <!-- IF not S_GROUP_MANAGE -->
 	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
-		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button2"> &nbsp;
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	</fieldset>
 <!-- ENDIF -->
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_gravatar.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_gravatar.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_gravatar.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_gravatar.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" data-reset-on-edit="#avatar_gravatar_width, #avatar_gravatar_height" /></dd>
+	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
+	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" data-reset-on-edit="#avatar_gravatar_width, #avatar_gravatar_height"></dd>
 </dl>
 <dl>
-	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth"> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth"> {L_PIXEL}</label>
 	</dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_local.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_local.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_local.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_local.html	2014-09-21 12:00:00.000000000 +0200
@@ -4,13 +4,13 @@
 <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 <!-- END avatar_local_cats -->
 </select></label>
-<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" />
+<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2">
 
 <div id="gallery">
 <!-- BEGIN avatar_local_row -->
 <!-- BEGIN avatar_local_col -->
-	<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
-	<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
+	<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt=""><br>
+	<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"></label>
 <!-- END avatar_local_col -->
 <!-- END avatar_local_row -->
 </div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_remote.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_remote.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_remote.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_remote.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
-	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" data-reset-on-edit="#avatar_remote_width, #avatar_remote_height" /></dd>
+	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" data-reset-on-edit="#avatar_remote_width, #avatar_remote_height"></dd>
 </dl>
 <dl>
-	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth"> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth"> {L_PIXEL}</label>
 	</dd>
 </dl>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_upload.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_upload.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_avatar_options_upload.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_avatar_options_upload.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,11 +1,11 @@
 <dl>
 	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}"><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth"></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
 	<dl>
-		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
+		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox"></dd>
 	</dl>
 <!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_groups_manage.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_groups_manage.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_groups_manage.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_groups_manage.html	2014-09-21 12:00:00.000000000 +0200
@@ -21,26 +21,26 @@
 		<fieldset>
 		<dl>
 			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>
-			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />
-				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox" /><!-- ENDIF --></dd>
+			<dd><!-- IF S_SPECIAL_GROUP --><strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong> <input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}">
+				<!-- ELSE --><input name="group_name" type="text" id="group_name" value="{GROUP_INTERNAL_NAME}" class="inputbox"><!-- ENDIF --></dd>
 		</dl>
 		<dl>
 			<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>
 			<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45" class="inputbox">{GROUP_DESC}</textarea></dd>
-			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>&nbsp;<label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>&nbsp;<label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
+			<dd><label for="desc_parse_bbcode"><input type="checkbox" class="radio" name="desc_parse_bbcode" id="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_BBCODE}</label>&nbsp;<label for="desc_parse_smilies"><input type="checkbox" class="radio" name="desc_parse_smilies" id="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_SMILIES}</label>&nbsp;<label for="desc_parse_urls"><input type="checkbox" class="radio" name="desc_parse_urls" id="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF -->> {L_PARSE_URLS}</label></dd>
 		</dl>
 		<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
-			<dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dt><label for="group_type1">{L_GROUP_TYPE}{L_COLON}</label><br><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label> 
-				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label> 
-				<label for="group_type3"><input type="radio" class="radio" name="group_type" id="group_type3" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label> 
-				<label for="group_type4"><input type="radio" class="radio" name="group_type" id="group_type4" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
+				<label for="group_type1"><input type="radio" class="radio" name="group_type" id="group_type1" value="{GROUP_TYPE_FREE}"{GROUP_FREE}> {L_GROUP_OPEN}</label> 
+				<label for="group_type2"><input type="radio" class="radio" name="group_type" id="group_type2" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN}> {L_GROUP_REQUEST}</label> 
+				<label for="group_type3"><input type="radio" class="radio" name="group_type" id="group_type3" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED}> {L_GROUP_CLOSED}</label> 
+				<label for="group_type4"><input type="radio" class="radio" name="group_type" id="group_type4" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN}> {L_GROUP_HIDDEN}</label>
 			</dd>
 		</dl>
 		<!-- ELSE -->
-			<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
+			<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}">
 		<!-- ENDIF -->
 		</fieldset>
 
@@ -53,9 +53,9 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd>
-			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" />
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow">
 			<span style="background-color: #{GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span>
 			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]
 			<div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
@@ -74,8 +74,8 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="update" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -141,7 +141,7 @@
 				<td><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 				<td class="posts">{member.USER_POSTS}</td>
 				<td class="joined">{member.JOINED}</td>
-				<td class="mark"><input type="checkbox" name="mark[]" value="{member.USER_ID}" /></td>
+				<td class="mark"><input type="checkbox" name="mark[]" value="{member.USER_ID}"></td>
 			</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
@@ -172,7 +172,7 @@
 
 <fieldset class="display-actions">	
 	<select name="action"><option value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-	<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+	<input class="button2" type="submit" name="update" value="{L_SUBMIT}">
 	<div><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
 </fieldset>
 
@@ -185,14 +185,14 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dt><label for="default0">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
 		<dd>
-			<label for="default1"><input type="radio" name="default" id="default1" value="1" /> {L_YES}</label> 
-			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked" /> {L_NO}</label>
+			<label for="default1"><input type="radio" name="default" id="default1" value="1"> {L_YES}</label> 
+			<label for="default0"><input type="radio" name="default" id="default0" value="0" checked="checked"> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea name="usernames" id="usernames" rows="3" cols="30" class="inputbox"></textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -202,7 +202,7 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input class="button1" type="submit" name="addusers" value="{L_SUBMIT}" />
+	<input class="button1" type="submit" name="addusers" value="{L_SUBMIT}">
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -225,7 +225,7 @@
 				<dt>
 					<div class="list-inner">
 						<a href="{leader.U_EDIT}" class="topictitle"<!-- IF leader.GROUP_COLOUR --> style="color: #{leader.GROUP_COLOUR};"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF leader.GROUP_DESC --><br>{leader.GROUP_DESC}<!-- ENDIF -->
 					</div>
 				</dt>
 				<dd class="option"><span><a href="{leader.U_EDIT}" >{L_EDIT}</a></span></dd>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_groups_membership.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_groups_membership.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_groups_membership.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_groups_membership.html	2014-09-21 12:00:00.000000000 +0200
@@ -28,13 +28,13 @@
 			<dl>
 				<dt>
 					<div class="list-inner">
-						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}" /> <!-- ENDIF -->
+						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF leader.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{leader.GROUP_ID}"> <!-- ENDIF -->
 						<a href="{leader.U_VIEW_GROUP}" class="forumtitle"<!-- IF leader.GROUP_COLOUR --> style="color:#{leader.GROUP_COLOUR}"<!-- ENDIF -->>{leader.GROUP_NAME}</a>
-						<!-- IF leader.GROUP_DESC --><br />{leader.GROUP_DESC}<!-- ENDIF -->
-						<!-- IF not leader.GROUP_SPECIAL --><br /><i>{leader.GROUP_STATUS}</i><!-- ENDIF -->
+						<!-- IF leader.GROUP_DESC --><br>{leader.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not leader.GROUP_SPECIAL --><br><i>{leader.GROUP_STATUS}</i><!-- ENDIF -->
 					</div>
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{leader.GROUP_ID}" <!-- IF leader.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{leader.GROUP_ID}" <!-- IF leader.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF -->></dd>
 			</dl>
 		</li>
 		<!-- END leader -->
@@ -60,13 +60,13 @@
 			<dl>
 				<dt>
 					<div class="list-inner">
-						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}" /> <!-- ENDIF -->
+						<!-- IF S_CHANGE_DEFAULT --><input title="{L_CHANGE_DEFAULT_GROUP}" type="radio" name="default"<!-- IF member.S_GROUP_DEFAULT --> checked="checked"<!-- ENDIF --> value="{member.GROUP_ID}"> <!-- ENDIF -->
 						<a href="{member.U_VIEW_GROUP}" class="forumtitle"<!-- IF member.GROUP_COLOUR --> style="color:#{member.GROUP_COLOUR}"<!-- ENDIF -->>{member.GROUP_NAME}</a>
-						<!-- IF member.GROUP_DESC --><br />{member.GROUP_DESC}<!-- ENDIF -->
-						<!-- IF not member.GROUP_SPECIAL --><br /><i>{member.GROUP_STATUS}</i><!-- ENDIF -->
+						<!-- IF member.GROUP_DESC --><br>{member.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not member.GROUP_SPECIAL --><br><i>{member.GROUP_STATUS}</i><!-- ENDIF -->
 					</div>
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{member.GROUP_ID}" <!-- IF member.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{member.GROUP_ID}" <!-- IF member.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF -->></dd>
 			</dl>
 		</li>
 		<!-- END member -->
@@ -97,11 +97,11 @@
 				<dt>
 					<div class="list-inner">
 						<a href="{pending.U_VIEW_GROUP}" class="forumtitle"<!-- IF pending.GROUP_COLOUR --> style="color:#{pending.GROUP_COLOUR}"<!-- ENDIF -->>{pending.GROUP_NAME}</a>
-						<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF -->
-						<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
+						<!-- IF pending.GROUP_DESC --><br>{pending.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not pending.GROUP_SPECIAL --><br><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
 					</div>
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF -->></dd>
 			</dl>
 		</li>
 		<!-- END pending -->
@@ -131,11 +131,11 @@
 				<dt>
 					<div class="list-inner">
 						<a href="{nonmember.U_VIEW_GROUP}" class="forumtitle"<!-- IF nonmember.GROUP_COLOUR --> style="color:#{nonmember.GROUP_COLOUR}"<!-- ENDIF -->>{nonmember.GROUP_NAME}</a>
-						<!-- IF nonmember.GROUP_DESC --><br />{nonmember.GROUP_DESC}<!-- ENDIF -->
-						<!-- IF not nonmember.GROUP_SPECIAL --><br /><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
+						<!-- IF nonmember.GROUP_DESC --><br>{nonmember.GROUP_DESC}<!-- ENDIF -->
+						<!-- IF not nonmember.GROUP_SPECIAL --><br><i>{nonmember.GROUP_STATUS}</i><!-- ENDIF -->
 					</div>
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{nonmember.GROUP_ID}" <!-- IF not nonmember.S_CAN_JOIN -->disabled="disabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{nonmember.GROUP_ID}" <!-- IF not nonmember.S_CAN_JOIN -->disabled="disabled"<!-- ENDIF -->></dd>
 			</dl>
 		</li>
 		<!-- END nonmember -->
@@ -149,7 +149,7 @@
 	<fieldset>
 		<!-- IF S_CHANGE_DEFAULT -->
 		<div class="left-box">
-			<input class="button2" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" />
+			<input class="button2" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}">
 			{S_FORM_TOKEN}
 		</div>
 		<!-- ENDIF -->
@@ -162,7 +162,7 @@
 				<option value="resign">{L_RESIGN_SELECTED}</option>
 				<option value="demote">{L_DEMOTE_SELECTED}</option>
 			</select>&nbsp;
-			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}">
 			{S_FORM_TOKEN}
 		</div>
 		<!-- ENDIF -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_header.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_header.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_header.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_header.html	2014-09-21 12:00:00.000000000 +0200
@@ -35,7 +35,7 @@
 				<!-- ENDIF -->
 			<!-- END t_block2 -->
 
-			<hr />
+			<hr>
 			<!-- BEGIN folder -->
 				<!-- IF folder.S_FIRST_ROW --><ul><!-- ENDIF -->
 				<!-- IF folder.S_CUR_FOLDER -->
@@ -45,7 +45,7 @@
 				<!-- ENDIF -->
 				<!-- IF folder.S_LAST_ROW --></ul><!-- ENDIF -->
 			<!-- END folder -->
-			<hr />
+			<hr>
 		<!-- ENDIF -->
 
 			<ul>
@@ -69,11 +69,11 @@
 				<dt>{L_FRIENDS}</dt>
 
 				<!-- BEGIN friends_online -->
-					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd>
+					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2"><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr><!-- ENDIF --></dd>
 				<!-- END friends_online -->
 
 				<!-- BEGIN friends_offline -->
-					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd>
+					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2"><!-- ENDIF --></dd>
 				<!-- END friends_offline -->
 			</dl>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_login_link.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_login_link.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_login_link.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_login_link.html	2014-09-21 12:00:00.000000000 +0200
@@ -18,7 +18,7 @@
 			<fieldset class="fields1">
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1"></dd>
 				</dl>
 			</fieldset>
 		</form>
@@ -32,11 +32,11 @@
 				<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
 				<dl>
 					<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
-					<dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd>
+					<dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth"></dd>
 				</dl>
 				<dl>
 					<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
-					<dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
+					<dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth"></dd>
 				</dl>
 				<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
 					<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
@@ -46,7 +46,7 @@
 				{S_LOGIN_REDIRECT}
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1"></dd>
 				</dl>
 			</fieldset>
 		</form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_bookmarks.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_bookmarks.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_bookmarks.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_bookmarks.html	2014-09-21 12:00:00.000000000 +0200
@@ -31,7 +31,7 @@
 				<dl>
 					<dt><div class="list-inner"><strong>{L_DELETED_TOPIC}</strong></div></dt>
 					<dd class="lastpost"><span>&nbsp;</span></dd>
-					<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
+					<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}"></dd>
 				</dl>
 			<!-- ELSE -->
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
@@ -40,7 +40,7 @@
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a 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}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br>
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -67,9 +67,9 @@
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br>{topicrow.LAST_POST_TIME}</span>
 				</dd>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
+				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}"></dd>
 			</dl>
 			<!-- ENDIF -->
 		</li>
@@ -98,7 +98,7 @@
 
 <!-- IF .topicrow and not S_NO_DISPLAY_BOOKMARKS -->
 	<fieldset class="display-actions">
-		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button2" />
+		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button2">
 		<div><a href="#" onclick="marklist('ucp', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', '', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_drafts.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_drafts.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_drafts.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_drafts.html	2014-09-21 12:00:00.000000000 +0200
@@ -16,8 +16,8 @@
 	</div>
 
 			<fieldset class="submit-buttons">
-				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-				<input type="submit" name="submit" value="{L_SAVE}" class="button1" />
+				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+				<input type="submit" name="submit" value="{L_SAVE}" class="button1">
 				{S_FORM_TOKEN}
 			</fieldset>
 
@@ -40,19 +40,19 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br />
+							<a class="topictitle" href="{draftrow.U_VIEW_EDIT}">{draftrow.DRAFT_SUBJECT}</a><br>
 							<!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 							<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 							<!-- ELSEIF S_PRIVMSGS -->
 							<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->
 							<div class="responsive-show" style="display: none;">
-								{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong><br />
+								{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong><br>
 								<!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a>
 							</div>
 						</div>
 					</dt>
-					<dd class="info"><span>{draftrow.DATE}<br /><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>
-					<dd class="mark"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" id="d{draftrow.DRAFT_ID}" /></dd>
+					<dd class="info"><span>{draftrow.DATE}<br><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>
+					<dd class="mark"><input type="checkbox" name="d[{draftrow.DRAFT_ID}]" id="d{draftrow.DRAFT_ID}"></dd>
 				</dl>
 			</li>
 		<!-- END draftrow -->
@@ -66,7 +66,7 @@
 
 	<!-- IF .draftrow -->
 		<fieldset class="display-actions">
-			<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
+			<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}">
 			<div><a href="#" onclick="marklist('postform', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('postform', '', false); return false;">{L_UNMARK_ALL}</a></div>
 			{S_FORM_TOKEN}
 		</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_front.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_front.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_front.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_front.html	2014-09-21 12:00:00.000000000 +0200
@@ -17,7 +17,7 @@
 				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
 					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF -->
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
+						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br>
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -43,7 +43,7 @@
 					</div>
 				</dt>
 				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br>{topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
 		</li>
@@ -56,9 +56,9 @@
 	<dl class="details">
 		<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
 		<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
-		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
-		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
-		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
+		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br>({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
+		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br>({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br>({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
 		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
 	</dl>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_subscribed.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_subscribed.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_main_subscribed.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_main_subscribed.html	2014-09-21 12:00:00.000000000 +0200
@@ -26,7 +26,7 @@
 				<dt>
 					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
 					<div class="list-inner">
-						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
+						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br>
 						{forumrow.FORUM_DESC}
 						<!-- IF forumrow.LAST_POST_TIME -->
 						<div class="responsive-show" style="display: none;">
@@ -36,10 +36,10 @@
 					</div>
 				</dt>
 				<dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL}
-					<a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span>
-					<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF -->
+					<a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br>{forumrow.LAST_POST_TIME}</span>
+					<!-- ELSE -->{L_NO_POSTS}<br>&nbsp;<!-- ENDIF -->
 				</dd>
-				<dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}" /></dd>
+				<dd class="mark"><input type="checkbox" name="f[{forumrow.FORUM_ID}]" id="f{forumrow.FORUM_ID}"></dd>
 			</dl>
 		</li>
 	<!-- END forumrow -->
@@ -54,7 +54,7 @@
     </ul>
 	<p><strong>{L_NO_WATCHED_FORUMS}</strong></p>
 <!-- ENDIF -->
-    <br />
+    <br>
 
 <!-- IF .topicrow -->
 	<ul class="topiclist missing-column">
@@ -76,7 +76,7 @@
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a 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}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br>
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -102,9 +102,9 @@
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br>{topicrow.LAST_POST_TIME}</span>
 				</dd>
-				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
+				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}"></dd>
 			</dl>
 		</li>
 	<!-- END topicrow -->
@@ -137,7 +137,7 @@
 
 <!-- IF .topicrow or .forumrow -->
 	<fieldset class="display-actions">
-		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button2" />
+		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button2">
 		<div><a href="#" onclick="marklist('ucp', 't', true); marklist('ucp', 'f', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 't', false); marklist('ucp', 'f', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_notifications.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_notifications.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_notifications.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_notifications.html	2014-09-21 12:00:00.000000000 +0200
@@ -29,12 +29,12 @@
 						<tr class="<!-- IF notification_types.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 							<td>
 								{notification_types.NAME}
-								<!-- IF notification_types.EXPLAIN --><br />&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
+								<!-- IF notification_types.EXPLAIN --><br>&nbsp; &nbsp;{notification_types.EXPLAIN}<!-- ENDIF -->
 							</td>
 							<!-- BEGIN notification_methods -->
-								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF -->></td>
 							<!-- END notification_methods -->
-							<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
+							<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF -->></td>
 						</tr>
 					<!-- ENDIF -->
 				<!-- END notification_types -->
@@ -69,7 +69,7 @@
 							<dl>
 								<dt>
 									<div class="list-inner">										
-										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt=""><!-- ENDIF -->
 										<div class="notifications">
 											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 											<p class="notifications_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
@@ -81,7 +81,7 @@
 									</div>
 								</dt>
 
-								<dd class="mark">&nbsp;<input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}"<!-- IF not notification_list.UNREAD --> disabled="disabled"<!-- ENDIF --> /> <dfn>{L_MARK_READ}</dfn>&nbsp;</dd>
+								<dd class="mark">&nbsp;<input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}"<!-- IF not notification_list.UNREAD --> disabled="disabled"<!-- ENDIF -->> <dfn>{L_MARK_READ}</dfn>&nbsp;</dd>
 							</dl>
 						</li>
 					<!-- END notification_list -->
@@ -109,9 +109,9 @@
 
 <!-- IF .notification_types or .notification_list -->
 <fieldset class="display-actions">
-	<input type="hidden" name="form_time" value="{FORM_TIME}" />
+	<input type="hidden" name="form_time" value="{FORM_TIME}">
 	{S_HIDDEN_FIELDS}
-	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" />
+	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1">
 	<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 	{S_FORM_TOKEN}
 </fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_history.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_history.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_history.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_history.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,10 +5,8 @@
 </h3>
 
 <div id="topicreview">
-	<script type="text/javascript">
-	// <![CDATA[
+	<script>
 		bbcodeEnabled = {S_BBCODE_ALLOWED};
-	// ]]>
 	</script>
 	<!-- BEGIN history_row -->
 	<div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
@@ -27,7 +25,7 @@
 			</ul>
 			<!-- ENDIF -->
 
-			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br />
+			<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong><br>
 				{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
 			<div class="content"><!-- 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>
@@ -38,5 +36,5 @@
 	<!-- END history_row -->
 </div>
 
-<hr />
+<hr>
 <p><a href="#cp-main" class="top2">{L_BACK_TO_TOP}</a></p>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_options.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_options.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_options.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_options.html	2014-09-21 12:00:00.000000000 +0200
@@ -14,7 +14,7 @@
 
 	<ol class="def-rules">
 	<!-- BEGIN rule -->
-		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
+		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2"></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
 	<!-- BEGINELSE -->
 		<li><strong>{L_NO_RULES_DEFINED}</strong></li>
 	<!-- END rule -->
@@ -28,48 +28,48 @@
 		<dl>
 			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}{L_COLON}</label></dt>
 			<dd>
-				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->
+				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2"><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}"><!-- ENDIF -->
 			</dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_RULE_DEFINED -->
 		<dl>
-			<dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd>
+			<dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button2"><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+			<dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2"><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}"><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_COND_DEFINED -->
 		<!-- IF S_COND_SELECT or COND_CURRENT -->
 			<dl>
-				<dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+				<dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button2"><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
 				<dd>
 					<!-- IF S_COND_SELECT -->
 						<!-- IF S_TEXT_CONDITION -->
-							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox medium" maxlength="250" />
+							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox medium" maxlength="250">
 						<!-- ELSEIF S_USER_CONDITION -->
-							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny" />&nbsp;<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
+							<input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny">&nbsp;<span>[ <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 -->
+							<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 -->
-						<input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" />
+						<input type="submit" name="next" value="{L_NEXT_STEP}" class="button2">
 					<!-- ELSE -->
-						<strong>{COND_CURRENT}</strong><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}" />
+						<strong>{COND_CURRENT}</strong><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 -->
 				</dd>
 			</dl>
 		<!-- ENDIF -->
-		<input type="hidden" name="cond_option" value="{COND_OPTION}" />
+		<input type="hidden" name="cond_option" value="{COND_OPTION}">
 	<!-- ENDIF -->
 
 
-	<!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none" /><!-- ENDIF -->
+	<!-- IF NONE_CONDITION --><input type="hidden" name="cond_option" value="none"><!-- ENDIF -->
 
 	<!-- IF S_ACTION_DEFINED -->
 		<dl>
-			<dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1" /><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></dd>
+			<dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button2"><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+			<dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1"><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}"><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
 
@@ -82,9 +82,9 @@
 	<!-- IF not S_MAX_FOLDER_ZERO -->
 	<dl>
 		<dt><label for="foldername">{L_ADD_FOLDER}{L_COLON}</label></dt>
-		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30"> <input class="button2" type="submit" name="addfolder" value="{L_ADD}"><!-- ENDIF --></dd>
 	</dl>
-	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->
+	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed"><!-- ENDIF -->
 	<!-- ENDIF -->
 
 
@@ -94,32 +94,32 @@
 			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}{L_COLON}</label></dt>
 			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd>
 			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}{L_COLON}</label></dt>
-			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>
+			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30"> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}"></dd>
 		</dl>
-		<hr class="dashed" />
+		<hr class="dashed">
 		<dl>
 			<dt><label for="remove_folder_id">{L_REMOVE_FOLDER}{L_COLON}</label></dt>
 			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd>
-			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
-			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>
-			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>
+			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked"> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
+			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2"> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>
+			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}"></dd>
 		</dl>
 	<!-- ENDIF -->
 
-	<hr class="dashed" />
+	<hr class="dashed">
 
 	<dl>
 		<dt><label for="full_action1">{L_IF_FOLDER_FULL}{L_COLON}</label></dt>
-		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED} /> {L_DELETE_OLDEST_MESSAGES}</label></dd>
-		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED} /> {L_MOVE_TO_FOLDER}{L_COLON}</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>
-		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED} /> {L_HOLD_NEW_MESSAGES}</label></dd>
+		<dd style="margin-top: 3px;"><label for="full_action1"><input type="radio" name="full_action" id="full_action1" value="1"{S_DELETE_CHECKED}> {L_DELETE_OLDEST_MESSAGES}</label></dd>
+		<dd style="margin-top: 3px;"><label for="full_action2"><input type="radio" name="full_action" id="full_action2" value="2"{S_MOVE_CHECKED}> {L_MOVE_TO_FOLDER}{L_COLON}</label> <select name="full_move_to">{S_FULL_FOLDER_OPTIONS}</select></dd>
+		<dd style="margin-top: 3px;"><label for="full_action3" style="white-space:normal;"><input type="radio" name="full_action" id="full_action3" value="3"{S_HOLD_CHECKED}> {L_HOLD_NEW_MESSAGES}</label></dd>
 	</dl>
 
 
 	<dl>
-		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
+		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
 		<dd>{DEFAULT_ACTION}</dd>
-		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>
+		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}"></dd>
 	</dl>
 	</fieldset>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewfolder.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewfolder.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewfolder.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewfolder.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,19 +13,19 @@
 		<fieldset>
 			<dl>
 				<dt><label for="delimiter">{L_DELIMITER}{L_COLON}</label></dt>
-				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value="," /></dd>
+				<dd><input class="inputbox" type="text" id="delimiter" name="delimiter" value=","></dd>
 			</dl>
 			<dl>
 				<dt><label for="enclosure">{L_ENCLOSURE}{L_COLON}</label></dt>
-				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value="&#034;" /></dd>
+				<dd><input class="inputbox" type="text" id="enclosure" name="enclosure" value="&#034;"></dd>
 			</dl>
 		</fieldset>
 		</div>
 	</div>
 	<fieldset class="submit-buttons">
-		<input type="hidden" name="export_option" value="CSV" />
-		<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
-		<input class="button2" type="reset" value="Reset" name="reset" />&nbsp;
+		<input type="hidden" name="export_option" value="CSV">
+		<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}">&nbsp;
+		<input class="button2" type="reset" value="Reset" name="reset">&nbsp;
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -40,7 +40,7 @@
 
 	<!-- IF NUM_NOT_MOVED -->
 		<div class="notice">
-			<p>{NOT_MOVED_MESSAGES}<br />{RELEASE_MESSAGE_INFO}</p>
+			<p>{NOT_MOVED_MESSAGES}<br>{RELEASE_MESSAGE_INFO}</p>
 		</div>
 	<!-- ENDIF -->
 
@@ -63,23 +63,23 @@
 						<div class="list-inner">
 
 						<!-- IF messagerow.S_PM_DELETED -->
-							<a href="{messagerow.U_REMOVE_PM}" class="topictitle">{L_DELETE_MESSAGE}</a><br />
+							<a href="{messagerow.U_REMOVE_PM}" class="topictitle">{L_DELETE_MESSAGE}</a><br>
 							<span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span>
 						<!-- ELSE -->
 							<a href="{messagerow.U_VIEW_PM}" class="topictitle">{messagerow.SUBJECT}</a>
 						<!-- ENDIF -->
 						<!-- IF messagerow.S_AUTHOR_DELETED -->
-							<br /><em class="small">{L_PM_FROM_REMOVED_AUTHOR}</em>
+							<br><em class="small">{L_PM_FROM_REMOVED_AUTHOR}</em>
 						<!-- ENDIF -->
 
-						<!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br />
+						<!-- IF messagerow.S_PM_REPORTED --><a href="{messagerow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --> {messagerow.ATTACH_ICON_IMG}<br>
 						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} &raquo; {messagerow.SENT_TIME}<!-- ENDIF -->
 
 						</div>
 					</dt>
 					<!-- IF S_SHOW_RECIPIENTS --><dd class="info"><span>{L_SENT_AT}{L_COLON} {messagerow.SENT_TIME}</span></dd><!-- ENDIF -->
 					<!-- IF S_UNREAD --><dd class="info"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></dd><!-- ENDIF -->
-					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></dd>
+					<dd class="mark"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}"></dd>
 				</dl>
 			</li>
 		<!-- END messagerow -->
@@ -97,12 +97,12 @@
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
 		<fieldset class="display-actions">
-			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="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></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
+			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="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></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}"><br></div>
+			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}">
 			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
 		</fieldset>
 	
-		<hr />
+		<hr>
 	
 		<div class="action-bar bottom">
 			<div class="pagination">
@@ -124,8 +124,8 @@
 		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
 		<label>{S_SELECT_SORT_DIR}</label>
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
+		<input type="submit" name="sort" value="{L_GO}" class="button2">
+		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}">
 	</fieldset>
 	<!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewmessage.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewmessage.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewmessage.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewmessage.html	2014-09-21 12:00:00.000000000 +0200
@@ -27,7 +27,7 @@
 			{MESSAGE_AUTHOR_FULL}
 		</dt>
 
-		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
+		<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
 
 		<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> {AUTHOR_POSTS}</dd>
 		<!-- IF AUTHOR_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {AUTHOR_JOINED}</dd><!-- ENDIF -->
@@ -101,9 +101,9 @@
 
 		<p class="author">
 			<strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE}
-			<br /><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL}
-			<!-- IF S_TO_RECIPIENT --><br /><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
-			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
+			<br><strong>{L_PM_FROM}{L_COLON}</strong> {MESSAGE_AUTHOR_FULL}
+			<!-- IF S_TO_RECIPIENT --><br><strong>{L_TO}{L_COLON}</strong> <!-- BEGIN to_recipient --><!-- IF to_recipient.NAME_FULL -->{to_recipient.NAME_FULL}<!-- ELSE --><a href="{to_recipient.U_VIEW}" style="color:<!-- IF to_recipient.COLOUR -->{to_recipient.COLOUR}<!-- ELSEIF to_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{to_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END to_recipient --><!-- ENDIF -->
+			<!-- IF S_BCC_RECIPIENT --><br><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}" style="color:<!-- IF bcc_recipient.COLOUR -->{bcc_recipient.COLOUR}<!-- ELSEIF bcc_recipient.IS_GROUP -->#0000FF<!-- ENDIF -->;">{bcc_recipient.NAME}</a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 		</p>
 
 
@@ -126,7 +126,7 @@
 
 		<!-- IF EDITED_MESSAGE or EDIT_REASON -->
 		<div class="notice">{EDITED_MESSAGE}
-			<!-- IF EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->
+			<!-- IF EDIT_REASON --><br><strong>{L_REASON}{L_COLON}</strong> <em>{EDIT_REASON}</em><!-- ENDIF -->
 		</div>
 		<!-- ENDIF -->
 
@@ -145,11 +145,11 @@
 	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
 	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
 
-	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
-	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
-	<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}" />
+	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}"><!-- ENDIF -->
+	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}"><!-- ENDIF -->
+	<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}">
 </fieldset>
 <!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewmessage_print.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewmessage_print.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_pm_viewmessage_print.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_pm_viewmessage_print.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="robots" content="noindex" />
+<meta name="robots" content="noindex">
 {META}
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<link href="{T_THEME_PATH}/print.css" rel="stylesheet">
 <!-- EVENT ucp_pm_viewmessage_print_head_append -->
 </head>
 <body id="phpbb">
@@ -32,15 +32,15 @@
 				<!-- IF S_BCC_RECIPIENT -->
 					<div class="author">{L_BCC} <strong><!-- BEGIN bcc_recipient -->{bcc_recipient.NAME}&nbsp;<!-- END bcc_recipient --></strong></div>
 				<!-- ENDIF -->
-				<hr />
+				<hr>
 				<div class="content">{MESSAGE}</div>
 			</div>
-			<hr />
+			<hr>
 	</div>
 
 	<div id="page-footer">
-		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
+		<div class="page-number">{S_TIMEZONE}<br>{PAGE_NUMBER}</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br>https://www.phpbb.com/</div>
 	</div>
 </div>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_personal.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_personal.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_personal.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_personal.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,30 +13,30 @@
 	<dl>
 		<dt><label for="viewemail0">{L_SHOW_EMAIL}{L_COLON}</label></dt>
 		<dd>
-			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="massemail1">{L_ADMIN_EMAIL}{L_COLON}</label></dt>
 		<dd>
-			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="allowpm1">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dt><label for="allowpm1">{L_ALLOW_PM}{L_COLON}</label><br><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd>
-			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<!-- IF S_CAN_HIDE_ONLINE -->
 		<dl>
-			<dt><label for="hideonline0">{L_HIDE_ONLINE}{L_COLON}</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
+			<dt><label for="hideonline0">{L_HIDE_ONLINE}{L_COLON}</label><br><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
 			<dd>
-				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF -->> {L_YES}</label>
+				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 	<!-- ENDIF -->
@@ -44,9 +44,9 @@
 		<dl>
 			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}{L_COLON}</label></dt>
 			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF -->> {L_NOTIFY_METHOD_EMAIL}</label>
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF -->> {L_NOTIFY_METHOD_IM}</label>
+				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF -->> {L_NOTIFY_METHOD_BOTH}</label>
 			</dd>
 		</dl>
 	<!-- ENDIF -->
@@ -64,13 +64,13 @@
 	<!-- ENDIF -->
 	<!-- INCLUDE timezone_option.html -->
 	<dl>
-		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd>
 			<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>
 		</dd>
-		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd>
+		<dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;"></dd>
 	</dl>
 	<!-- EVENT ucp_prefs_personal_append -->
 	</fieldset>
@@ -79,14 +79,13 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	var date_format = '{A_DATE_FORMAT}';
 	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
 
@@ -118,7 +117,6 @@
 	}
 
 	window.onload = customDates;
-// ]]>
 </script>
 
 <!-- INCLUDE ucp_footer.html -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_post.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_post.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_post.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_post.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,29 +12,29 @@
 	<dl>
 		<dt><label for="bbcode1">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
 		<dd>
-			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="bbcode1"><input type="radio" name="bbcode" id="bbcode1" value="1"<!-- IF S_BBCODE --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+			<label for="bbcode0"><input type="radio" name="bbcode" id="bbcode0" value="0"<!-- IF not S_BBCODE --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="smilies1">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>
 		<dd>
-			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+			<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
 		<dd>
-			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="sig1"><input type="radio" name="sig" id="sig1" value="1"<!-- IF S_SIG --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+			<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
 		<dd>
-			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			<label for="notify1"><input type="radio" name="notify" id="notify1" value="1"<!-- IF S_NOTIFY --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+			<label for="notify0"><input type="radio" name="notify" id="notify0" value="0"<!-- IF not S_NOTIFY --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 		</dd>
 	</dl>
 	<!-- EVENT ucp_prefs_post_append -->
@@ -44,8 +44,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_view.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_view.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_prefs_view.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_prefs_view.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,49 +13,49 @@
 		<dl>
 			<dt><label for="images1">{L_VIEW_IMAGES}{L_COLON}</label></dt>
 			<dd>
-				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="images1"><input type="radio" name="images" id="images1" value="1"<!-- IF S_IMAGES --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+				<label for="images0"><input type="radio" name="images" id="images0" value="0"<!-- IF not S_IMAGES --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="flash0">{L_VIEW_FLASH}{L_COLON}</label></dt>
 			<dd>
-				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="flash1"><input type="radio" name="flash" id="flash1" value="1"<!-- IF S_FLASH --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+				<label for="flash0"><input type="radio" name="flash" id="flash0" value="0"<!-- IF not S_FLASH --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="smilies1">{L_VIEW_SMILIES}{L_COLON}</label></dt>
 			<dd>
-				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="smilies1"><input type="radio" name="smilies" id="smilies1" value="1"<!-- IF S_SMILIES --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+				<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="sigs1">{L_VIEW_SIGS}{L_COLON}</label></dt>
 			<dd>
-				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="sigs1"><input type="radio" name="sigs" id="sigs1" value="1"<!-- IF S_SIGS --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+				<label for="sigs0"><input type="radio" name="sigs" id="sigs0" value="0"<!-- IF not S_SIGS --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 		<dl>
 			<dt><label for="avatars1">{L_VIEW_AVATARS}{L_COLON}</label></dt>
 			<dd>
-				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+				<label for="avatars1"><input type="radio" name="avatars" id="avatars1" value="1"<!-- IF S_AVATARS --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+				<label for="avatars0"><input type="radio" name="avatars" id="avatars0" value="0"<!-- IF not S_AVATARS --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 			</dd>
 		</dl>
 		<!-- IF S_CHANGE_CENSORS -->
 			<dl>
 				<dt><label for="wordcensor1">{L_DISABLE_CENSORS}{L_COLON}</label></dt>
 				<dd>
-					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
-					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+					<label for="wordcensor1"><input type="radio" name="wordcensor" id="wordcensor1" value="1"<!-- IF S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF -->> {L_YES}</label> 
+					<label for="wordcensor0"><input type="radio" name="wordcensor" id="wordcensor0" value="0"<!-- IF not S_DISABLE_CENSORS --> checked="checked"<!-- ENDIF -->> {L_NO}</label>
 				</dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- EVENT ucp_prefs_view_radio_buttons_append -->
-		<hr />
+		<hr>
 		<!-- EVENT ucp_prefs_view_select_menu_prepend -->
 		<dl>
 			<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
@@ -69,7 +69,7 @@
 			<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>
 			<dd>{S_TOPIC_SORT_DIR}</dd>
 		</dl>
-		<hr />
+		<hr>
 		<dl>
 			<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>
 			<dd>{S_POST_SORT_DAYS}</dd>
@@ -89,8 +89,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_autologin_keys.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_autologin_keys.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_autologin_keys.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_autologin_keys.html	2014-09-21 12:00:00.000000000 +0200
@@ -22,7 +22,7 @@
 					<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
 					<td style="text-align: center">{sessions.IP}</td>
 					<td style="text-align: center">{sessions.LOGIN_TIME}</td>
-					<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
+					<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"></td>
 				</tr>
 			<!-- BEGINELSE -->
 				<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
@@ -34,7 +34,7 @@
 
 <!-- IF .sessions -->
 	<fieldset class="display-actions">
-		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" />
+		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2">
 		<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_profile_info.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_profile_info.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_profile_info.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_profile_info.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,7 +12,7 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<!-- IF S_BIRTHDAYS_ENABLED -->
 		<dl>
-			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+			<dt><label for="bday_day">{L_BIRTHDAY}{L_COLON}</label><br><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
 			<dd>
 				<label for="bday_day">{L_DAY}{L_COLON} <select name="bday_day" id="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select></label>
 				<label for="bday_month">{L_MONTH}{L_COLON} <select name="bday_month" id="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select></label>
@@ -23,13 +23,13 @@
 	<!-- IF S_JABBER_ENABLED -->
 		<dl>
 			<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
+			<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox"></dd>
 		</dl>
 	<!-- ENDIF -->
 	<!-- BEGIN profile_fields -->
 		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+			<!-- IF profile_fields.LANG_EXPLAIN --><br><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<!-- IF profile_fields.ERROR --><dd class="error">{profile_fields.ERROR}</dd><!-- ENDIF -->
 			<dd>{profile_fields.FIELD}</dd>
 		</dl>
@@ -40,8 +40,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_reg_details.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_reg_details.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_reg_details.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_reg_details.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,21 +13,21 @@
 	<fieldset>
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<dl>
-		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
-		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>
+		<dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}{L_COLON}</label><br><span>{L_USERNAME_EXPLAIN}</span></dt>
+		<dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}"><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd>
 	</dl>
 	<dl>
 		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
-		<dd><!-- IF S_CHANGE_EMAIL --><input type="email" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
+		<dd><!-- IF S_CHANGE_EMAIL --><input type="email" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}"><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_CHANGE_PASSWORD -->
 		<dl>
-			<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}" /></dd>
+			<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+			<dd><input type="password" name="new_password" id="new_password" maxlength="255" value="{NEW_PASSWORD}" class="inputbox" title="{L_CHANGE_PASSWORD}"></dd>
 		</dl>
 		<dl>
-			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}" /></dd>
+			<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+			<dd><input type="password" name="password_confirm" id="password_confirm" maxlength="255" value="{PASSWORD_CONFIRM}" class="inputbox" title="{L_CONFIRM_PASSWORD}"></dd>
 		</dl>
 	<!-- ENDIF -->
 	</fieldset>
@@ -39,8 +39,8 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="cur_password">{L_CURRENT_PASSWORD}{L_COLON}</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>
-		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>
+		<dt><label for="cur_password">{L_CURRENT_PASSWORD}{L_COLON}</label><br><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>
+		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}"></dd>
 	</dl>
 	</fieldset>
 
@@ -48,8 +48,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_signature.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_signature.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_profile_signature.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_profile_signature.html	2014-09-21 12:00:00.000000000 +0200
@@ -25,13 +25,13 @@
 	<h3>{L_OPTIONS}</h3>
 	<fieldset>
 		<!-- IF S_BBCODE_ALLOWED -->
-			<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
+			<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED}> {L_DISABLE_BBCODE}</label></div>
 		<!-- ENDIF -->
 		<!-- IF S_SMILIES_ALLOWED -->
-			<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label></div>
+			<div><label for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED}> {L_DISABLE_SMILIES}</label></div>
 		<!-- ENDIF -->
 		<!-- IF S_LINKS_ALLOWED -->
-			<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label></div>
+			<div><label for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED}> {L_DISABLE_MAGIC_URL}</label></div>
 		<!-- ENDIF -->
 
 	</fieldset>
@@ -41,9 +41,9 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<input type="reset" name="reset" value="{L_RESET}" class="button2" />&nbsp;
-	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" name="reset" value="{L_RESET}" class="button2">&nbsp;
+	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2">&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_register.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_register.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_register.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_register.html	2014-09-21 12:00:00.000000000 +0200
@@ -1,7 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script type="text/javascript">
-// <![CDATA[
+<script>
 	/**
 	* Change language
 	*/
@@ -11,7 +10,6 @@
 		document.forms['register'].change_lang.value = lang_iso;
 		document.forms['register'].submit.click();
 	}
-// ]]>
 </script>
 
 <form method="post" action="{S_UCP_ACTION}" id="register">
@@ -28,24 +26,24 @@
 	<!-- ENDIF -->
 	<!-- EVENT ucp_register_credentials_before -->
 	<dl>
-		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt>
-		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd>
+		<dt><label for="username">{L_USERNAME}{L_COLON}</label><br><span>{L_USERNAME_EXPLAIN}</span></dt>
+		<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}"></dd>
 	</dl>
 	<dl>
 		<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
-		<dd><input type="email" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
+		<dd><input type="email" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}"></dd>
 	</dl>
 	<dl>
-		<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
+		<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br><span>{L_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}"></dd>
 	</dl>
 	<dl>
 		<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label></dt>
-		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
+		<dd><input type="password"  tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}"></dd>
 	</dl>
 
 	<!-- EVENT ucp_register_credentials_after -->
-	<hr />
+	<hr>
 
 	<!-- EVENT ucp_register_options_before -->
 	<dl>
@@ -62,8 +60,8 @@
 	<!-- BEGIN profile_fields -->
 		<dl>
 			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>
-			<!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
-			<!-- IF profile_fields.ERROR --><br /><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>
+			<!-- IF profile_fields.LANG_EXPLAIN --><br><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF -->
+			<!-- IF profile_fields.ERROR --><br><span class="error">{profile_fields.ERROR}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
 		</dl>
 	<!-- END profile_fields -->
@@ -96,8 +94,8 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp;
+		<input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action">
 		{S_FORM_TOKEN}
 	</fieldset>
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_remind.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_remind.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_remind.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_remind.html	2014-09-21 12:00:00.000000000 +0200
@@ -11,15 +11,15 @@
 		<fieldset>
 		<dl>
 			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
+			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25"></dd>
 		</dl>
 		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>
+			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br><span>{L_EMAIL_REMIND}</span></dt>
+			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100"></dd>
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2">&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2"></dd>
 		</dl>
 		{S_FORM_TOKEN}
 		</fieldset>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_resend.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_resend.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_resend.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_resend.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,15 +12,15 @@
 		<fieldset>
 		<dl>
 			<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd>
+			<dd><input class="inputbox narrow" type="text" name="username" id="username" size="25"></dd>
 		</dl>
 		<dl>
-			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br /><span>{L_EMAIL_REMIND}</span></dt>
-			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100" /></dd>
+			<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label><br><span>{L_EMAIL_REMIND}</span></dt>
+			<dd><input class="inputbox narrow" type="email" name="email" id="email" size="25" maxlength="100"></dd>
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+			<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2">&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2"></dd>
 		</dl>
 		</fieldset>
 	</div>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_zebra_foes.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_zebra_foes.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_zebra_foes.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_zebra_foes.html	2014-09-21 12:00:00.000000000 +0200
@@ -12,7 +12,7 @@
 	<fieldset class="fields2">
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}{L_COLON}</label><br /><span>{L_YOUR_FOES_EXPLAIN}</span></dt>
+		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FOES}{L_COLON}</label><br><span>{L_YOUR_FOES_EXPLAIN}</span></dt>
 		<dd>
 			<!-- IF S_USERNAME_OPTIONS -->
 				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
@@ -22,7 +22,7 @@
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="add">{L_ADD_FOES}{L_COLON}</label><br /><span>{L_ADD_FOES_EXPLAIN}</span></dt>
+		<dt><label for="add">{L_ADD_FOES}{L_COLON}</label><br><span>{L_ADD_FOES_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -32,8 +32,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/ucp_zebra_friends.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_zebra_friends.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/ucp_zebra_friends.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/ucp_zebra_friends.html	2014-09-21 12:00:00.000000000 +0200
@@ -13,7 +13,7 @@
 	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 	<!-- EVENT ucp_friend_list_before -->
 	<dl>
-		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}{L_COLON}</label><br /><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>
+		<dt><label <!-- IF S_USERNAME_OPTIONS -->for="usernames"<!-- ENDIF -->>{L_YOUR_FRIENDS}{L_COLON}</label><br><span>{L_YOUR_FRIENDS_EXPLAIN}</span></dt>
 		<dd>
 			<!-- IF S_USERNAME_OPTIONS -->
 				<select name="usernames[]" id="usernames" multiple="multiple" size="5">{S_USERNAME_OPTIONS}</select>
@@ -24,7 +24,7 @@
 	</dl>
 	<!-- EVENT ucp_friend_list_after -->
 	<dl>
-		<dt><label for="add">{L_ADD_FRIENDS}{L_COLON}</label><br /><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
+		<dt><label for="add">{L_ADD_FRIENDS}{L_COLON}</label><br><span>{L_ADD_FRIENDS_EXPLAIN}</span></dt>
 		<dd><textarea name="add" id="add" rows="3" cols="30" class="inputbox">{USERNAMES}</textarea></dd>
 		<dd><strong><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></strong></dd>
 	</dl>
@@ -34,8 +34,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2">&nbsp; 
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1">
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/viewforum_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewforum_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/viewforum_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewforum_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -5,7 +5,7 @@
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
 <div>
 	<!-- NOTE: remove the style="display: none" when you want to have the forum description on the forum body -->
-	<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
+	<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br></div><!-- ENDIF -->
 	<!-- IF MODERATORS --><p><strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON}</strong> {MODERATORS}</p><!-- ENDIF -->
 </div>
 <!-- ENDIF -->
@@ -17,7 +17,7 @@
 		<!-- IF U_FORUM_RULES -->
 			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
 		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
+			<strong>{L_FORUM_RULES}</strong><br>
 			{FORUM_RULES}
 		<!-- ENDIF -->
 
@@ -49,7 +49,7 @@
 		<div class="search-box">
 			<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
+				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}">
 				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
 				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
@@ -92,17 +92,17 @@
 				<fieldset class="fields1">
 				<dl>
 					<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd>
+					<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth"></dd>
 				</dl>
 				<dl>
 					<dt><label for="password">{L_PASSWORD}{L_COLON}</label></dt>
-					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd>
-					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
-					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd>
+					<dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth"></dd>
+					<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3"> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
+					<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4"> {L_HIDE_ME}</label></dd>
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
+					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1"></dd>
 				</dl>
 				{S_LOGIN_REDIRECT}
 				</fieldset>
@@ -150,12 +150,12 @@
 						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a 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}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
-						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br>
 
 						<!-- IF not S_IS_BOT -->
 						<div class="responsive-show" style="display: none;">
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
-							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br>{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 						</div>
 						<!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF -->
 						<!-- ENDIF -->
@@ -188,7 +188,7 @@
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>
+					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br>{topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
 		</li>
@@ -216,11 +216,11 @@
 			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
 			<label>{S_SELECT_SORT_DIR}</label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
+			<input type="submit" name="sort" value="{L_GO}" class="button2">
 	<!-- ENDIF -->
 		</fieldset>
 	</form>
-	<hr />
+	<hr>
 <!-- ENDIF -->
 
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
@@ -257,7 +257,7 @@
 <!-- IF S_DISPLAY_POST_INFO -->
 	<div class="stat-block permissions">
 		<h3>{L_FORUM_PERMISSIONS}</h3>
-		<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
+		<p><!-- BEGIN rules -->{rules.RULE}<br><!-- END rules --></p>
 	</div>
 <!-- ENDIF -->
 
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/viewonline_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewonline_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/viewonline_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewonline_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -30,7 +30,7 @@
 		<!-- BEGIN user_row -->
 		<tr class="<!-- IF user_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 			<td>{user_row.USERNAME_FULL}<!-- IF user_row.USER_IP --> <span style="float: {S_CONTENT_FLOW_END};">{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></span><!-- ENDIF -->
-				<!-- IF user_row.USER_BROWSER --><br />{user_row.USER_BROWSER}<!-- ENDIF --></td>
+				<!-- IF user_row.USER_BROWSER --><br>{user_row.USER_BROWSER}<!-- ENDIF --></td>
 			<td class="info"><a href="{user_row.U_FORUM_LOCATION}">{user_row.FORUM_LOCATION}</a></td>
 			<td class="active">{user_row.LASTUPDATE}</td>
 		</tr>
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/viewtopic_body.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewtopic_body.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/viewtopic_body.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewtopic_body.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,7 +2,7 @@
 
 <h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT viewtopic_topic_title_append --></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
-<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
+<!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br></div><!-- ENDIF -->
 
 <!-- IF MODERATORS -->
 <p>
@@ -17,7 +17,7 @@
 		<!-- IF U_FORUM_RULES -->
 			<a href="{U_FORUM_RULES}">{L_FORUM_RULES}</a>
 		<!-- ELSE -->
-			<strong>{L_FORUM_RULES}</strong><br />
+			<strong>{L_FORUM_RULES}</strong><br>
 			{FORUM_RULES}
 		<!-- ENDIF -->
 
@@ -41,7 +41,7 @@
 		<div class="search-box">
 			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
-				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
+				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}">
 				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
 				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
@@ -71,14 +71,14 @@
 
 		<div class="content">
 			<h2 class="poll-title"><!-- EVENT viewtopic_body_poll_question_prepend -->{POLL_QUESTION}<!-- EVENT viewtopic_body_poll_question_append --></h2>
-			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br /><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
+			<p class="author">{L_POLL_LENGTH}<!-- IF S_CAN_VOTE and L_POLL_LENGTH --><br><!-- ENDIF --><!-- IF S_CAN_VOTE --><span class="poll_max_votes">{L_MAX_VOTES}</span><!-- ENDIF --></p>
 
 			<fieldset class="polls">
 			<!-- BEGIN poll_option -->
 				<!-- EVENT viewtopic_body_poll_option_before -->
 				<dl class="<!-- IF poll_option.POLL_OPTION_VOTED -->voted<!-- ENDIF --><!-- IF poll_option.POLL_OPTION_MOST_VOTES --> most-votes<!-- ENDIF -->"<!-- IF poll_option.POLL_OPTION_VOTED --> title="{L_POLL_VOTED_OPTION}"<!-- ENDIF --> data-poll-option-id="{poll_option.POLL_OPTION_ID}">
 					<dt><!-- IF S_CAN_VOTE --><label for="vote_{poll_option.POLL_OPTION_ID}">{poll_option.POLL_OPTION_CAPTION}</label><!-- ELSE -->{poll_option.POLL_OPTION_CAPTION}<!-- ENDIF --></dt>
-					<!-- IF S_CAN_VOTE --><dd style="width: auto;" class="poll_option_select"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF --> /><!-- ENDIF --></dd><!-- ENDIF -->
+					<!-- IF S_CAN_VOTE --><dd style="width: auto;" class="poll_option_select"><!-- IF S_IS_MULTI_CHOICE --><input type="checkbox" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF -->><!-- ELSE --><input type="radio" name="vote_id[]" id="vote_{poll_option.POLL_OPTION_ID}" value="{poll_option.POLL_OPTION_ID}"<!-- IF poll_option.POLL_OPTION_VOTED --> checked="checked"<!-- ENDIF -->><!-- ENDIF --></dd><!-- ENDIF -->
 					<dd class="resultbar<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><div class="<!-- IF poll_option.POLL_OPTION_PCT < 20 -->pollbar1<!-- ELSEIF poll_option.POLL_OPTION_PCT < 40 -->pollbar2<!-- ELSEIF poll_option.POLL_OPTION_PCT < 60 -->pollbar3<!-- ELSEIF poll_option.POLL_OPTION_PCT < 80 -->pollbar4<!-- ELSE -->pollbar5<!-- ENDIF -->" style="width:{poll_option.POLL_OPTION_PERCENT_REL};">{poll_option.POLL_OPTION_RESULT}</div></dd>
 					<dd class="poll_option_percent<!-- IF not S_DISPLAY_RESULTS --> hidden<!-- ENDIF -->"><!-- IF poll_option.POLL_OPTION_RESULT == 0 -->{L_NO_VOTES}<!-- ELSE -->{poll_option.POLL_OPTION_PERCENT}<!-- ENDIF --></dd>
 				</dl>
@@ -93,7 +93,7 @@
 			<!-- IF S_CAN_VOTE -->
 				<dl style="border-top: none;" class="poll_vote">
 					<dt>&nbsp;</dt>
-					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1" /></dd>
+					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1"></dd>
 				</dl>
 			<!-- ENDIF -->
 
@@ -113,7 +113,7 @@
 	</div>
 
 	</form>
-	<hr />
+	<hr>
 <!-- ENDIF -->
 
 <!-- BEGIN postrow -->
@@ -136,7 +136,7 @@
 				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF -->
 			</dt>
 
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
 
 		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF postrow.POSTER_JOINED --><dd class="profile-joined"><strong>{L_JOINED}{L_COLON}</strong> {postrow.POSTER_JOINED}</dd><!-- ENDIF -->
@@ -190,19 +190,19 @@
 			<!-- IF postrow.S_POST_HIDDEN -->
 				<!-- IF postrow.S_POST_DELETED -->
 					<div class="ignore" id="post_hidden{postrow.POST_ID}">
-						{postrow.L_POST_DELETED_MESSAGE}<br />
+						{postrow.L_POST_DELETED_MESSAGE}<br>
 						{postrow.L_POST_DISPLAY}
 					</div>
 				<!-- ELSEIF postrow.S_IGNORE_POST -->
 					<div class="ignore" id="post_hidden{postrow.POST_ID}">
-						{postrow.L_IGNORE_POST}<br />
+						{postrow.L_IGNORE_POST}<br>
 						{postrow.L_POST_DISPLAY}
 					</div>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 			<div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>
 
-			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>
+			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt=""> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>
 
 		<!-- IF not S_IS_BOT -->
 			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE -->
@@ -249,9 +249,9 @@
 			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
 				<p class="post-notice unapproved">
 					<strong>{L_POST_UNAPPROVED_ACTION}</strong>
-					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
-					<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
-					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
+					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]">
+					<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]">
+					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}">
 					{S_FORM_TOKEN}
 				</p>
 			</form>
@@ -259,9 +259,9 @@
 			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
 				<p class="post-notice deleted">
 					<strong>{L_POST_DELETED_ACTION}</strong>
-					<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" />
-					<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
-					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
+					<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]">
+					<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]">
+					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}">
 					{S_FORM_TOKEN}
 				</p>
 			</form>
@@ -291,16 +291,16 @@
 			<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON -->
 				<div class="notice post_deleted_msg">
 					{postrow.DELETED_MESSAGE}
-					<!-- IF postrow.DELETE_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF -->
+					<!-- IF postrow.DELETE_REASON --><br><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF -->
 				</div>
 			<!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->
 				<div class="notice">
 					{postrow.EDITED_MESSAGE}
-					<!-- IF postrow.EDIT_REASON --><br /><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->
+					<!-- IF postrow.EDIT_REASON --><br><strong>{L_REASON}{L_COLON}</strong> <em>{postrow.EDIT_REASON}</em><!-- ENDIF -->
 				</div>
 			<!-- ENDIF -->
 
-			<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
+			<!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br><br>{postrow.BUMPED_MESSAGE}</div><!-- ENDIF -->
 			<!-- EVENT viewtopic_body_postrow_post_notices_after -->
 			<!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF -->
 
@@ -314,7 +314,7 @@
 		</div>
 	</div>
 
-	<hr class="divider" />
+	<hr class="divider">
 	<!-- EVENT viewtopic_body_postrow_post_after -->
 <!-- END postrow -->
 
@@ -328,11 +328,11 @@
 		<!-- IF not S_IS_BOT -->
 		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label>
-		<input type="submit" name="sort" value="{L_GO}" class="button2" />
+		<input type="submit" name="sort" value="{L_GO}" class="button2">
 		<!-- ENDIF -->
 	</fieldset>
 	</form>
-	<hr />
+	<hr>
 <!-- ENDIF -->
 
 <!-- EVENT viewtopic_body_topic_actions_before -->
diff -Naur phpbb-3.1.0-RC4/styles/prosilver/template/viewtopic_print.html phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewtopic_print.html
--- phpbb-3.1.0-RC4/styles/prosilver/template/viewtopic_print.html	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/styles/prosilver/template/viewtopic_print.html	2014-09-21 12:00:00.000000000 +0200
@@ -2,11 +2,11 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta name="robots" content="noindex" />
+<meta name="robots" content="noindex">
 {META}
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
-<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<link href="{T_THEME_PATH}/print.css" rel="stylesheet">
 <!-- EVENT viewtopic_print_head_append -->
 </head>
 <body id="phpbb">
@@ -15,7 +15,7 @@
 
 	<div id="page-header">
 		<h1>{SITENAME}</h1>
-		<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
+		<p>{SITE_DESCRIPTION}<br><a href="{U_FORUM}">{U_FORUM}</a></p>
 
 		<h2>{TOPIC_TITLE}</h2>
 		<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
@@ -30,13 +30,13 @@
 				<div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div>
 				<div class="content">{postrow.MESSAGE}</div>
 			</div>
-			<hr />
+			<hr>
 		<!-- END postrow -->
 	</div>
 
 	<div id="page-footer">
-		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
+		<div class="page-number">{S_TIMEZONE}<br>{PAGE_NUMBER}</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br>https://www.phpbb.com/</div>
 	</div>
 </div>
 
diff -Naur phpbb-3.1.0-RC4/ucp.php phpbb-3.1.0-RC4-HTML5/ucp.php
--- phpbb-3.1.0-RC4/ucp.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/ucp.php	2014-09-21 12:00:00.000000000 +0200
@@ -103,7 +103,7 @@
 		{
 			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
 
-			$message = $user->lang['LOGOUT_FAILED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> ');
+			$message = $user->lang['LOGOUT_FAILED'] . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> ');
 			trigger_error($message);
 		}
 
@@ -182,7 +182,7 @@
 
 			meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
 
-			$message = $user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+			$message = $user->lang['COOKIES_DELETED'] . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -220,7 +220,7 @@
 
 		add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']);
 
-		$message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+		$message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 		trigger_error($message);
 
 	break;
@@ -243,7 +243,7 @@
 
 		add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username);
 
-		$message = $user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
+		$message = $user->lang['PERMISSIONS_RESTORED'] . '<br><br>' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 		trigger_error($message);
 
 	break;
diff -Naur phpbb-3.1.0-RC4/viewforum.php phpbb-3.1.0-RC4-HTML5/viewforum.php
--- phpbb-3.1.0-RC4/viewforum.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/viewforum.php	2014-09-21 12:00:00.000000000 +0200
@@ -206,7 +206,7 @@
 		$json_response->send($data);
 	}
 
-	trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
+	trigger_error($user->lang['TOPICS_MARKED'] . '<br><br>' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>'));
 }
 
 // Is a forum specific topic count required?
@@ -226,7 +226,7 @@
 	if ($task->is_ready())
 	{
 		$url = $task->get_url();
-		$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
+		$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron">');
 	}
 	else
 	{
@@ -237,7 +237,7 @@
 		if ($task->is_ready())
 		{
 			$url = $task->get_url();
-			$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
+			$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron">');
 		}
 	}
 }
diff -Naur phpbb-3.1.0-RC4/viewtopic.php phpbb-3.1.0-RC4-HTML5/viewtopic.php
--- phpbb-3.1.0-RC4/viewtopic.php	2014-09-21 12:00:00.000000000 +0200
+++ phpbb-3.1.0-RC4-HTML5/viewtopic.php	2014-09-21 12:00:00.000000000 +0200
@@ -486,7 +486,7 @@
 
 		if (!$request->is_ajax())
 		{
-			$message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
 		}
 	}
 	else
@@ -495,7 +495,7 @@
 
 		if (!$request->is_ajax())
 		{
-			$message .= '<br /><br />' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
+			$message .= '<br><br>' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>');
 		}
 	}
 	meta_refresh(3, $viewtopic_url);
@@ -793,7 +793,7 @@
 				$message = 'FORM_INVALID';
 			}
 
-			$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
+			$message = $user->lang[$message] . '<br><br>' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
 			trigger_error($message);
 		}
 
@@ -861,7 +861,7 @@
 		$db->sql_query($sql);
 
 		$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start"));
-		$message = $user->lang['VOTE_SUBMITTED'] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $user->lang['VOTE_SUBMITTED'] . '<br><br>' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
 
 		if ($request->is_ajax())
 		{
