diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
index 5b38d9b8d0..0f3adb7cfe 100644
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 18786d80f9..af28acdc54 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
@@ -10,39 +10,39 @@
 		<legend>{L_EXT_DETAILS}</legend>
 		<!-- IF META_DISPLAY_NAME -->
 		<dl>
-			<dt><label for="meta_display_name">{L_DISPLAY_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
+			<dt><label>{L_DISPLAY_NAME}{L_COLON}</label></dt>
+			<dd><strong>{META_DISPLAY_NAME}</strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_name">{L_CLEAN_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_name">{META_NAME}</strong></dd>
+			<dt><label>{L_CLEAN_NAME}{L_COLON}</label></dt>
+			<dd><strong>{META_NAME}</strong></dd>
 		</dl>
 		<!-- IF META_DESCRIPTION -->
 		<dl>
-			<dt><label for="meta_description">{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
+			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
+			<dd><p>{META_DESCRIPTION}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_version">{L_VERSION}{L_COLON}</label></dt>
-			<dd><p id="meta_version">{META_VERSION}</p></dd>
+			<dt><label>{L_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_VERSION}</p></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
-			<dt><label for="meta_homepage">{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><p id="meta_homepage">{META_HOMEPAGE}</p></dd>
+			<dt><label>{L_HOMEPAGE}{L_COLON}</label></dt>
+			<dd><strong><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_TIME -->
 		<dl>
-			<dt><label for="meta_time">{L_TIME}{L_COLON}</label></dt>
-			<dd><p id="meta_time">{META_TIME}</p></dd>
+			<dt><label>{L_TIME}{L_COLON}</label></dt>
+			<dd><p>{META_TIME}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="meta_license">{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p id="meta_license">{META_LICENCE}</p></dd>
+			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
+			<dd><p>{META_LICENCE}</p></dd>
 		</dl>
 	</fieldset>
 
@@ -51,14 +51,14 @@
 		<legend>{L_REQUIREMENTS}</legend>
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_phpbb">{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
+			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_REQUIRE_PHPBB}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label for="require_php">{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
+			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
+			<dd><p>{META_REQUIRE_PHP}</p></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
@@ -69,25 +69,25 @@
 		<!-- BEGIN meta_authors -->
 		<fieldset>
 			<dl>
-				<dt><label for="meta_author_name">{L_AUTHOR_NAME}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_name">{meta_authors.AUTHOR_NAME}</strong></dd>
+				<dt><label>{L_AUTHOR_NAME}{L_COLON}</label></dt>
+				<dd><strong>{meta_authors.AUTHOR_NAME}</strong></dd>
 			</dl>
 			<!-- IF meta_authors.AUTHOR_EMAIL -->
 			<dl>
-				<dt><label for="meta_author_email">{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_email"><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
+				<dt><label>{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
+				<dd><strong><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
 			<dl>
-				<dt><label for="meta_author_url">{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_url"><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
+				<dt><label>{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
+				<dd><strong><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
 			</dl>
 			<!-- ENDIF -->
 			<!-- IF meta_authors.AUTHOR_ROLE -->
 			<dl>
-				<dt><label for="author_role">{L_AUTHOR_ROLE}{L_COLON}</label></dt>
-				<dd><strong id="meta_author_role">{meta_authors.AUTHOR_ROLE}</strong></dd>
+				<dt><label>{L_AUTHOR_ROLE}{L_COLON}</label></dt>
+				<dd><strong>{meta_authors.AUTHOR_ROLE}</strong></dd>
 			</dl>
 			<!-- ENDIF -->
 		</fieldset>
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 4fa0893be7..d650544ff7 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 670904a2ce..42523f1f58 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-	<a name="maincontent"></a>
+	<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 09cf6a31f5..2fcc6eab31 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<a name="maincontent"></a>
+<a id="maincontent"></a>
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>