7 files changed, 37 insertions, 24 deletions
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 22859b2452..c90f5b0639 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -26,7 +26,9 @@
 	<!-- EVENT forumlist_body_category_header_after -->
 
 	<!-- IF not forumrow.S_IS_CAT -->
+		<!-- EVENT forumlist_body_forum_row_before -->
 		<li class="row">
+			<!-- EVENT forumlist_body_forum_row_prepend -->
 			<dl class="icon {forumrow.FORUM_IMG_STYLE}">
 				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
 					<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
@@ -80,7 +82,9 @@
 					</dd>
 				<!-- ENDIF -->
 			</dl>
+			<!-- EVENT forumlist_body_forum_row_append -->
 		</li>
+		<!-- EVENT forumlist_body_forum_row_after -->
 	<!-- ENDIF -->
 
 	<!-- IF forumrow.S_LAST_ROW -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index b31e7b7b5d..970a7bcdd1 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -11,10 +11,10 @@
 	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
-<!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->
+<!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER -->
 	<div class="action-bar top">
 
-	<!-- IF SEARCH_MATCHES -->
+	<!-- IF TOTAL_MATCHES > 0 -->
 		<div class="search-box">
 			<form method="post" action="{S_SEARCH_ACTION}">
 			<fieldset>
@@ -178,9 +178,9 @@
 <div class="action-bar bottom">
 	<div class="pagination">
 		{SEARCH_MATCHES}
-		<!-- IF .pagination --> 
+		<!-- IF .pagination -->
 			<!-- INCLUDE pagination.html -->
-		<!-- ELSE --> 
+		<!-- ELSE -->
 			 &bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index fc0579bffd..b8be456489 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -1,10 +1,12 @@
 <dl>
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF S_TZ_DATE_OPTIONS -->
+	<!-- IF .timezone_date -->
 	<dd id="tz_select_date" style="display: none;">
 		<select name="tz_date" id="tz_date" class="autowidth tz_select">
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			{S_TZ_DATE_OPTIONS}
+			<!-- BEGIN timezone_date -->
+				<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
+			<!-- END timezone_date -->
 		</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}" />
 	</dd>
@@ -12,7 +14,13 @@
 	<dd>
 		<select name="tz" id="timezone" class="autowidth tz_select">
 			<option value="">{L_SELECT_TIMEZONE}</option>
-			{S_TZ_OPTIONS}
+			<!-- BEGIN timezone_select -->
+			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
+				<!-- BEGIN timezone_options -->
+				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
+				<!-- END timezone_options -->
+			</optgroup>
+			<!-- END timezone_select -->
 		</select>
 
 		<!-- INCLUDEJS timezone.js -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 4463f6dfc0..127a3ca1aa 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -170,7 +170,7 @@
 								<!-- IF REMAINDER eq 0 -->
 									<div>
 								<!-- ENDIF -->
-									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
+									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
 										<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span>
 									</a>
 								<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW -->
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index d3699c3012..014bb91e7a 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -110,7 +110,7 @@ ul.cplist {
 }
 
 #tabs .tab, #minitabs .tab {
-	display: inline-block;
+	display: block;
 	float: left;
 	font-size: 1em;
 	font-weight: bold;
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index cbdeab11f9..f08a8a9691 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -129,6 +129,10 @@ dd select {
 	width: auto;
 }
 
+dd select[multiple] {
+	width: 100%;
+}
+
 dd textarea {
 	width: 85%;
 }
@@ -410,7 +414,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 .search-header a.button {
 	border: 0;
-	border-left: 1;
+	border-left: 1px;
 	padding: 3px 5px 3px 4px;
 }
 
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 698b9efd75..ed3ba61334 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -161,8 +161,7 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn {
 	font-weight: normal;
 }
 
-@media only screen and (max-width: 550px), only screen and (max-device-width: 550px)
-{
+@media only screen and (max-width: 550px), only screen and (max-device-width: 550px) {
 	ul.topiclist.forums dt {
 		margin-right: 0;
 	}
@@ -191,8 +190,7 @@ ul.topiclist li.row dt a.subforum {
 
 /* Notifications list
 ----------------------------------------*/
-@media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
-{
+@media only screen and (max-width: 350px), only screen and (max-device-width: 350px) {
 	.dropdown-extended .dropdown-contents {
 		width: auto;
 	}
@@ -344,22 +342,23 @@ fieldset.quick-login label[for="autologin"] {
 	min-width: 50%;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
+	dd label {
+		white-space: normal;
+	}
+
 	select, .inputbox {
 		max-width: 260px;
 	}
 }
 
-@media only screen and (max-width: 430px), only screen and (max-device-width: 430px)
-{
+@media only screen and (max-width: 430px), only screen and (max-device-width: 430px) {
 	.section-viewtopic .search-box .inputbox {
 		width: 110px;
 	}
 }
 
-@media only screen and (max-width: 320px), only screen and (max-device-width: 320px)
-{
+@media only screen and (max-width: 320px), only screen and (max-device-width: 320px) {
 	select, .inputbox {
 		max-width: 240px;
 	}
@@ -372,8 +371,7 @@ fieldset.quick-login label[for="autologin"] {
 	width: auto;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
 	dl.details dt, dl.details dd {
 		width: auto;
 		float: none;
@@ -513,8 +511,7 @@ fieldset.display-actions {
 	width: 100%;
 }
 
-@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
-{
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
 	p.responsive-center {
 		float: none;
 		text-align: center;