diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index c9c5295d13..550962db67 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -2,7 +2,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html
index c179f6dc20..1671987f63 100644
--- a/phpBB/styles/prosilver/template/captcha_qa.html
+++ b/phpBB/styles/prosilver/template/captcha_qa.html
@@ -2,7 +2,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<fieldset class="fields2">
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
index aad1008241..bde0c9df13 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -2,7 +2,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3>{L_CONFIRMATION}</h3>
+	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html
index a0428025cf..aaea5cfd05 100644
--- a/phpBB/styles/prosilver/template/confirm_body.html
+++ b/phpBB/styles/prosilver/template/confirm_body.html
@@ -17,7 +17,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
 
 	<fieldset class="submit-buttons">
diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index dc09974d1c..2d4dde5cd5 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -33,7 +33,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 
 	<p>{MESSAGE_TEXT}</p>
 
diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html
index 4b2e1bf0c6..ea2849a485 100644
--- a/phpBB/styles/prosilver/template/drafts.html
+++ b/phpBB/styles/prosilver/template/drafts.html
@@ -4,7 +4,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<h3>{L_LOAD_DRAFT}</h3>
+	<h3 class="draft-title">{L_LOAD_DRAFT}</h3>
 	<p>{L_LOAD_DRAFT_EXPLAIN}</p>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
index f72807cdec..53205d14e9 100644
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ b/phpBB/styles/prosilver/template/faq_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_FAQ_TITLE}</h2>
+<h2 class="faq-title">{L_FAQ_TITLE}</h2>
 
 
 <div class="panel bg1" id="faqlinks">
@@ -29,7 +29,7 @@
 		<div class="inner">
 
 		<div class="content">
-			<h2>{faq_block.BLOCK_TITLE}</h2>
+			<h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>
 			<!-- BEGIN faq_row -->
 				<dl class="faq">
 					<dt id="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"><strong>{faq_block.faq_row.FAQ_QUESTION}</strong></dt>
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index 38d9f8c68b..c852ffd5f2 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -5,7 +5,7 @@
 	<div class="inner">
 
 	<div class="content">
-		<h2><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
+		<h2 class="login-title"><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_LOGIN}<!-- ENDIF --></h2>
 
 		<fieldset <!-- IF not S_CONFIRM_CODE -->class="fields1"<!-- ELSE -->class="fields2"<!-- ENDIF -->>
 		<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html
index c83a625b3f..18a95c0a8f 100644
--- a/phpBB/styles/prosilver/template/login_forum.html
+++ b/phpBB/styles/prosilver/template/login_forum.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<!-- IF FORUM_NAME --><h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->
+<!-- IF FORUM_NAME --><h2 class="forum-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2><!-- ENDIF -->
 
 <form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
 {S_FORM_TOKEN}
@@ -8,7 +8,7 @@
 	<div class="inner">
 
 	<div class="content">
-		<h2>{L_LOGIN}</h2>
+		<h2 class="login-title">{L_LOGIN}</h2>
 
 		<p>{L_LOGIN_FORUM}</p>
 
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
index ab7f92e262..14472bcf4f 100644
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ b/phpBB/styles/prosilver/template/mcp_approve.html
@@ -34,7 +34,7 @@
 
 	<div class="content">
 
-		<h2>{MESSAGE_TITLE}</h2>
+		<h2 class="message-title">{MESSAGE_TITLE}</h2>
 		<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
 
 		<fieldset>
diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
index 2b2105e770..bdfa254741 100644
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ b/phpBB/styles/prosilver/template/mcp_header.html
@@ -42,7 +42,7 @@
 	<div id="cp-main" class="mcp-main panel-container">
 		<!-- IF MESSAGE -->
 		<div class="content">
-			<h2>{L_MESSAGE}</h2>
+			<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>
 		</div>
diff --git a/phpBB/styles/prosilver/template/mcp_message.html b/phpBB/styles/prosilver/template/mcp_message.html
index 7102c658c4..062103b91c 100644
--- a/phpBB/styles/prosilver/template/mcp_message.html
+++ b/phpBB/styles/prosilver/template/mcp_message.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE mcp_header.html -->
 
 <div class="content">
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html
index c2ee25f0d9..d028fffeb4 100644
--- a/phpBB/styles/prosilver/template/mcp_move.html
+++ b/phpBB/styles/prosilver/template/mcp_move.html
@@ -37,7 +37,7 @@
 	<div class="inner">
 
 	<div class="content">
-		<h2>{MESSAGE_TITLE}</h2>
+		<h2 class="message-title">{MESSAGE_TITLE}</h2>
 		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
 
 		<fieldset>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 7ba289cfd6..dd5e27a10e 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -14,7 +14,7 @@
 
 	<!-- IF S_SHOW_GROUP -->
 
-		<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
+		<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
 		<p>{GROUP_DESC} {GROUP_TYPE}</p>
 		<p>
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 6665019ab8..3ef3f7ca07 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{PAGE_TITLE}</h2>
+<h2 class="memberlist-title">{PAGE_TITLE}</h2>
 
 <form method="post" action="{S_PROFILE_ACTION}" id="viewprofile">
 <div class="panel bg1<!-- IF S_ONLINE --> online<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
index a844246055..8062fed9a0 100644
--- a/phpBB/styles/prosilver/template/message_body.html
+++ b/phpBB/styles/prosilver/template/message_body.html
@@ -6,7 +6,7 @@
 
 <div class="panel" id="message">
 	<div class="inner">
-	<h2>{MESSAGE_TITLE}</h2>
+	<h2 class="message-title">{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
 	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
index 0b9ddedf47..4ef0954200 100644
--- a/phpBB/styles/prosilver/template/posting_layout.html
+++ b/phpBB/styles/prosilver/template/posting_layout.html
@@ -1,9 +1,9 @@
 <!-- INCLUDE overall_header.html -->
 
 <!-- IF TOPIC_TITLE -->
-	<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+	<h2 class="posting-title"><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- ELSE -->
-	<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
+	<h2 class="posting-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
  <!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html
index c9b4a915ae..3bdadd06ca 100644
--- a/phpBB/styles/prosilver/template/posting_pm_layout.html
+++ b/phpBB/styles/prosilver/template/posting_pm_layout.html
@@ -15,7 +15,7 @@
 
 <!-- IF S_DISPLAY_PREVIEW --><!-- INCLUDE posting_preview.html --><!-- ENDIF -->
 
-<h2>{L_TITLE}</h2>
+<h2 class="posting-title">{L_TITLE}</h2>
 
 <div class="panel" id="pmheader-postingbox">
 	<div class="inner">
diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index 8da9919db8..6a8846626e 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -2,7 +2,7 @@
 <!-- EVENT quickreply_editor_panel_before -->
 	<div class="panel">
 		<div class="inner">
-				<h2>{L_QUICKREPLY}</h2>
+				<h2 class="quickreply-title">{L_QUICKREPLY}</h2>
 				<fieldset class="fields1">
 					<dl style="clear: left;">
 						<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 3307c68627..818b8ee642 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
+<h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
 <!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}{L_COLON} <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF -->
 <!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}{L_COLON} <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
 <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
index 6c96be864a..b52acdd955 100644
--- a/phpBB/styles/prosilver/template/ucp_agreement.html
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html
@@ -33,7 +33,7 @@
 	<div class="panel">
 		<div class="inner">
 		<div class="content">
-			<h2>{SITENAME} - {L_REGISTRATION}</h2>
+			<h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2>
 			<p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p>
 		</div>
 		</div>
@@ -60,7 +60,7 @@
 	<div class="panel">
 		<div class="inner">
 		<div class="content">
-			<h2>{SITENAME} - {AGREEMENT_TITLE}</h2>
+			<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>
 			<p>{AGREEMENT_TEXT}</p>
 			<hr class="dashed" />
 			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index 8ce2c54294..102ea5a3a0 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_UCP}</h2>
+<h2 class="ucp-title">{L_UCP}</h2>
 
 <div id="tabs">
 	<ul>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 7372834dd3..33d309bcb8 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 <!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
+<h2 class="forum-title"><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
 <div>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index 13f459b57f..553e322f92 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{TOTAL_REGISTERED_USERS_ONLINE}</h2>
+<h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>
 <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
 
 <ul class="linklist">
diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html
index 8abd933efa..031f18afdc 100644
--- a/phpBB/styles/prosilver/template/viewonline_whois.html
+++ b/phpBB/styles/prosilver/template/viewonline_whois.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 
-<h2>{L_WHOIS}</h2>
+<h2 class="whois-title">{L_WHOIS}</h2>
 
 <div class="panel">
 	<div class="inner">
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 649129923a..01a49d6888 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 <!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
-<h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+<h2 class="topic-title"><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></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 -->
 
@@ -67,7 +67,7 @@
 		<div class="inner">
 
 		<div class="content">
-			<h2>{POLL_QUESTION}</h2>
+			<h2 class="poll-title">{POLL_QUESTION}</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>
 
 			<fieldset class="polls">