diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 3f0aa4009b..68f8ee634a 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -53,12 +53,19 @@ $module_id = $request->variable('i', '');
$mode = $request->variable('mode', '');
// Set custom style for admin area
-$template->set_custom_style(array(
- array(
- 'name' => 'adm',
- 'ext_path' => 'adm/style/',
- ),
-), $phpbb_admin_path . 'style');
+/** @var \phpbb\template\base $template */
+$template->set_custom_style(
+ [
+ [
+ 'name' => 'adm',
+ 'ext_path' => 'adm/style/',
+ ]
+ ],
+ [
+ $phpbb_admin_path . 'style',
+ $phpbb_root_path . 'styles/all/template/',
+ ],
+);
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index a2cfe8f11e..c33d30b1c1 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -49,7 +49,13 @@
{options.TITLE_EXPLAIN}
- - {options.CONTENT}
+ -
+ {% if options.CONTENT is iterable %}
+ {{ FormsBuildTemplate(options.CONTENT)}}
+ {% else %}
+ {options.CONTENT}
+ {% endif %}
+
{% if (options.KEY == 'allow_attachments' and S_EMPTY_POST_GROUPS) or (options.KEY == 'allow_pm_attach' and S_EMPTY_PM_GROUPS) %}
- {{ lang(options.KEY == 'allow_attachments' ? 'NO_EXT_GROUP_ALLOWED_POST' : 'NO_EXT_GROUP_ALLOWED_PM', U_EXTENSION_GROUPS) }}
{% endif %}
@@ -175,8 +181,14 @@
-
{L_SPECIAL_CATEGORY_EXPLAIN}
- - {S_CATEGORY_SELECT}
+
{L_SPECIAL_CATEGORY_EXPLAIN}
+ -
+
+
@@ -195,7 +207,10 @@
- -
+ -
+
+ {{ FormsSelect(EXT_GROUP_SIZE_OPTIONS) }}
+
@@ -275,8 +290,14 @@
-
- - {GROUP_SELECT_OPTIONS}
+
+ -
+
+
@@ -309,7 +330,13 @@
{extensions.EXTENSION} |
- {extensions.GROUP_OPTIONS} |
+
+
+ |
|
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html
index fe3e250099..ae1525d586 100644
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -27,7 +27,13 @@
{options.TITLE_EXPLAIN}
- - {options.CONTENT}
+ -
+ {% if options.CONTENT is iterable %}
+ {{ FormsBuildTemplate(options.CONTENT)}}
+ {% else %}
+ {{ options.CONTENT }}
+ {% endif %}
+
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html
index b0e61015b6..b4f8ea5072 100644
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -30,8 +30,10 @@
-
{L_BOT_LANG_EXPLAIN}
-
+
{L_BOT_LANG_EXPLAIN}
+ -
+ {{ FormsSelect(LANG_OPTIONS) }}
+
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 1b0b6d46de..153a93fdb4 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -65,7 +65,7 @@