20 files changed, 230 insertions, 227 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index d27f56f28b..c648fdf100 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -49,7 +49,6 @@ if (!$auth->acl_get('a_'))
 define('IN_ADMIN', true);
 
 // Some oft used variables
-$safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
 $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
 $module_id		= $request->variable('i', '');
 $mode			= $request->variable('mode', '');
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index 63a734ea7d..666950e0ae 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,6 +1,6 @@
 <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" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->
diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index d63fd08a3a..c46a2d7fed 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -44,7 +44,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
diff --git a/phpBB/adm/style/acp_ext_actions.html b/phpBB/adm/style/acp_ext_actions.html
new file mode 100644
index 0000000000..6f2341f381
--- /dev/null
+++ b/phpBB/adm/style/acp_ext_actions.html
@@ -0,0 +1,6 @@
+{% for action in enabled.actions %}
+<a href="{{ action.U_ACTION }}"{% if action.L_ACTION_EXPLAIN %} title="{{ action.L_ACTION_EXPLAIN }}"{% endif %}{% if action.COLOR %} style="color: {{ action.COLOR }};"{% endif %} data-ajax="{{ action.ACTION_AJAX }}" data-refresh="true">{{ action.L_ACTION }}</a>{% if not action.S_LAST_ROW %}&nbsp;|&nbsp;{% endif %}
+{% endfor %}
+{% for action in disabled.actions %}
+<a href="{{ action.U_ACTION }}"{% if action.L_ACTION_EXPLAIN %} title="{{ action.L_ACTION_EXPLAIN }}"{% endif %}{% if action.COLOR %} style="color: {{ action.COLOR }};"{% endif %} data-ajax="{{ action.ACTION_AJAX }}" data-refresh="true">{{ action.L_ACTION }}</a>{% if not action.S_LAST_ROW %}&nbsp;|&nbsp;{% endif %}
+{% endfor %}
+\ No newline at end of file
diff --git a/phpBB/adm/style/acp_ext_delete_data.html b/phpBB/adm/style/acp_ext_delete_data.html
deleted file mode 100644
index 0f3adb7cfe..0000000000
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<div class="errorbox">
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
-
-	<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}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
-			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
deleted file mode 100644
index d2b5c46fe8..0000000000
--- a/phpBB/adm/style/acp_ext_disable.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
-
-	<!-- IF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<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}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
deleted file mode 100644
index 8a4a35359e..0000000000
--- a/phpBB/adm/style/acp_ext_enable.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<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}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8e2c7452a3..e5783124c6 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -7,7 +7,7 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.2" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.3" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -42,8 +42,8 @@
 		</tr>
 	</thead>
 	<tbody>
-		<!-- IF .enabled -->
-		<tr>
+
+		<tr id="ext_enabled_header"<!-- IF not .enabled --> class="hidden"<!-- ENDIF -->>
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
 		</tr>
 		<!-- BEGIN enabled -->
@@ -59,17 +59,12 @@
 			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
-					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
+				<!-- INCLUDE acp_ext_actions.html -->
 			</td>
 		</tr>
 		<!-- END enabled -->
-		<!-- ENDIF -->
 
-		<!-- IF .disabled -->
-		<tr>
+		<tr id="ext_disabled_header"<!-- IF not .disabled --> class="hidden"<!-- ENDIF -->>
 			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
 		</tr>
 		<!-- BEGIN disabled -->
@@ -87,14 +82,10 @@
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
 			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
-					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
+				<!-- INCLUDE acp_ext_actions.html -->
 			</td>
 		</tr>
 		<!-- END disabled -->
-		<!-- ENDIF -->
 	</tbody>
 	</table>
 
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 723a190899..8651b63b7f 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -100,7 +100,7 @@
 			<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>
+			<div id="color_palette_placeholder" style="display: none;" data-color-palette="h" data-height="12" data-width="15" data-target="#group_colour"></div>
 		</dd>
 	</dl>
 	<dl>
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html
index 79fef94207..5e3ac9532a 100644
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -69,7 +69,7 @@
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.2" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.3" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
 	</fieldset>
 
 	<table class="table1 zebra-table">
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 12477a4b77..ce55d81375 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -94,90 +94,113 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-	<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" />
-	<thead>
-	<tr>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-		<th>{L_STATISTIC}</th>
-		<th>{L_VALUE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<td>{L_NUMBER_POSTS}{L_COLON} </td>
-		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}{L_COLON} </td>
-		<td><strong>{POSTS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_TOPICS}{L_COLON} </td>
-		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
-		<td><strong>{TOPICS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_USERS}{L_COLON} </td>
-		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}{L_COLON} </td>
-		<td><strong>{USERS_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_NUMBER_FILES}{L_COLON} </td>
-		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}{L_COLON} </td>
-		<td><strong>{FILES_PER_DAY}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_BOARD_STARTED}{L_COLON} </td>
-		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
-		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SIZE}{L_COLON} </td>
-		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
-		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
-		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
-		<td><strong>{GZIP_COMPRESSION}</strong></td>
-	</tr>
-	<tr>
-		<td>{L_PHP_VERSION}{L_COLON} </td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
-		<td>
-		<!-- IF TOTAL_ORPHAN > 0 -->
-			<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
-		<!-- ELSE -->
-			<strong>{TOTAL_ORPHAN}</strong>
-		<!-- ENDIF -->
-		</td>
-		<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
-	<!-- IF S_VERSIONCHECK -->
-	<tr>
-		<td>{L_BOARD_VERSION}{L_COLON} </td>
-		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
-		</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-
+		<div class="lside">
+			<table class="table1 zebra-table no-header" data-no-responsive-header="true">
+				<thead>
+					<tr>
+						<th>{L_STATISTIC}</th>
+						<th>{L_VALUE}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="tabled">{L_NUMBER_POSTS}{L_COLON}</td>
+						<td class="tabled"><strong>{TOTAL_POSTS}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_POSTS_PER_DAY}{L_COLON}</td>
+						<td class="tabled"><strong>{POSTS_PER_DAY}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_NUMBER_TOPICS}{L_COLON}</td>
+						<td class="tabled"><strong>{TOTAL_TOPICS}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_TOPICS_PER_DAY}{L_COLON}</td>
+						<td class="tabled"><strong>{TOPICS_PER_DAY}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_NUMBER_USERS}{L_COLON}</td>
+						<td class="tabled"><strong>{TOTAL_USERS}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_USERS_PER_DAY}{L_COLON}</td>
+						<td class="tabled"><strong>{USERS_PER_DAY}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_NUMBER_FILES}{L_COLON}</td>
+						<td class="tabled"><strong>{TOTAL_FILES}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_FILES_PER_DAY}{L_COLON}</td>
+						<td class="tabled"><strong>{FILES_PER_DAY}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">&nbsp;</td>
+						<td class="tabled">&nbsp;</td>
+					</tr>
+				</tbody>
+			</table>
+			<table class="table1 zebra-table no-header" data-no-responsive-header="true">
+				<thead>
+					<tr>
+						<th>{L_STATISTIC}</th>
+						<th>{L_VALUE}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="tabled">{L_BOARD_STARTED}{L_COLON}</td>
+						<td class="tabled"><strong>{START_DATE}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_AVATAR_DIR_SIZE}{L_COLON}</td>
+						<td class="tabled"><strong>{AVATAR_DIR_SIZE}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_DATABASE_SIZE}{L_COLON}</td>
+						<td class="tabled"><strong>{DBSIZE}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_UPLOAD_DIR_SIZE}{L_COLON}</td>
+						<td class="tabled"><strong>{UPLOAD_DIR_SIZE}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_DATABASE_SERVER_INFO}{L_COLON}</td>
+						<td class="tabled"><strong>{DATABASE_INFO}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_GZIP_COMPRESSION}{L_COLON}</td>
+						<td class="tabled"><strong>{GZIP_COMPRESSION}</strong></td>
+					</tr>
+					<tr>
+						<td class="tabled">{L_PHP_VERSION}{L_COLON}</td>
+						<td class="tabled"><strong>{PHP_VERSION_INFO}</strong></td>
+					</tr>
+					<tr>
+					<!-- IF S_TOTAL_ORPHAN -->
+						<td class="tabled">{L_NUMBER_ORPHAN}{L_COLON}</td>
+						<td class="tabled">
+						<!-- IF TOTAL_ORPHAN > 0 -->
+							<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
+						<!-- ELSE -->
+							<strong>{TOTAL_ORPHAN}</strong>
+						<!-- ENDIF -->
+						</td>
+						<!-- ELSE -->
+					<!-- ENDIF -->
+					</tr>
+					<!-- IF S_VERSIONCHECK -->
+					<tr>
+						<td class="tabled">{L_BOARD_VERSION}{L_COLON}</td>
+						<td class="tabled">
+							<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+						</td>
+					</tr>
+					<!-- ENDIF -->
+				</tbody>
+			</table>
+		</div>
 	<!-- IF S_ACTION_OPTIONS -->
 		<fieldset>
 			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index cfa804090f..c09294beaf 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -33,7 +33,7 @@
 <!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
 <fieldset class="quick">
-	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.2" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.3" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
 </fieldset>
 
 <form id="acp_styles" method="post" action="{U_ACTION}">
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 180c24c96d..40f0fc25d9 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -26,7 +26,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 			<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;">
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 7cf6c22236..4f0a3312e4 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1,4 +1,4 @@
-/*  phpBB 3.2 Admin Style Sheet
+/*  phpBB 3.3 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
@@ -723,9 +723,20 @@ td {
 }
 
 .table1 {
-	border-collapse: separate;
-	border-spacing: 1px;
 	clear: both;
+	border-spacing: 1px;
+	border-collapse: separate;
+}
+
+@media only screen and (min-width: 1100px), only screen and (min-device-width: 1100px) {
+	.lside .table1 {
+		display: inline-table;
+		width: 49.7%;
+	}
+}
+
+.tabled {
+	width: 25%;
 }
 
 dt#color_palette_placeholder table {
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js
index 551c78a4a3..5fdd07356c 100644
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -229,6 +229,64 @@ function parse_document(container)
 }
 
 /**
+ * Extension actions helper functions
+ */
+function move_to_enabled(element)
+{
+	var disabled_header = document.querySelector('#ext_disabled_header');
+	disabled_header.parentNode.insertBefore(element, disabled_header);
+	element.classList.remove('ext_disabled');
+	element.classList.add('ext_enabled');
+}
+function move_to_disabled(element)
+{
+	var table_body = document.querySelector('#ext_disabled_header').parentNode;
+	table_body.appendChild(element);
+	element.classList.remove('ext_enabled');
+	element.classList.add('ext_disabled');
+}
+function set_actions(container, actions) {
+	container.innerHTML = '';
+	for (var i = 0; i < actions.length; i++) {
+		var a = document.createElement('a');
+		a.href = actions[i].U_ACTION.split('&amp;').join('&'); // replace all occurances
+		a.title = actions[i].L_ACTION_EXPLAIN;
+		if (actions[i].COLOR) {
+			a.style = actions[i].COLOR;
+		}
+		a.innerHTML = actions[i].L_ACTION;
+		// ajaxify this action as well
+		phpbb.ajaxify({
+			selector: a,
+			refresh: true,
+			callback: actions[i].ACTION_AJAX
+		});
+
+		container.appendChild(a);
+
+		if (i < actions.length - 1) {
+			container.innerHTML += '&nbsp;|&nbsp;';
+		}
+	}
+}
+function show_enabled_header() {
+	document.querySelector('#ext_enabled_header').classList.remove('hidden');
+}
+function show_disabled_header() {
+	document.querySelector('#ext_disabled_header').classList.remove('hidden');
+}
+function hide_disabled_header_if_empty() {
+	if (!document.querySelector('.ext_disabled')) {
+		document.querySelector('#ext_disabled_header').classList.add('hidden');
+	}
+}
+function hide_enabled_header_if_empty() {
+	if (!document.querySelector('.ext_enabled')) {
+		document.querySelector('#ext_enabled_header').classList.add('hidden');
+	}
+}
+
+/**
 * Run onload functions
 */
 (function($) {
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 895bb056e5..644e74bef7 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -158,6 +158,34 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 });
 
 /**
+ * Callbacks for extension actions
+ */
+phpbb.addAjaxCallback('ext_enable', function(res) {
+	if (res.EXT_ENABLE_SUCCESS) {
+		move_to_enabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_enabled_header();
+		hide_disabled_header_if_empty();
+	}
+});
+phpbb.addAjaxCallback('ext_delete_data', function(res) {
+	if (res.EXT_DELETE_DATA_SUCCESS) {
+		move_to_disabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_disabled_header();
+		hide_enabled_header_if_empty();
+	}
+});
+phpbb.addAjaxCallback('ext_disable', function(res) {
+	if (res.EXT_DISABLE_SUCCESS) {
+		move_to_disabled(this.parentNode.parentNode);
+		set_actions(this.parentNode, res.ACTIONS);
+		show_disabled_header();
+		hide_enabled_header_if_empty();
+	}
+});
+
+/**
  * Handler for submitting permissions form in chunks
  * This call will submit permissions forms in chunks of 5 fieldsets.
  */
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index 3f61c76cb1..563bd98835 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -5,8 +5,9 @@
 		<div>{L_RECAPTCHA_NOSCRIPT}</div>
 	</noscript>
 
+		{L_RECAPTCHA_INVISIBLE}
 		<script src="{RECAPTCHA_SERVER}.js?hl={LA_RECAPTCHA_LANG}" async defer></script>
-		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}"></div>
+		<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-size="invisible"></div>
 	</dd>
 	</dl>
 <!-- ELSE -->
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 8b3b04d8a5..81a85d1b01 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -23,7 +23,7 @@ installLang = {
 </script>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 3ab633e04b..7a5b620f48 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -34,7 +34,7 @@
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 4b54b83373..dd9dc90fd0 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>
 
 <script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->