diff --git a/.dev/README.md b/.dev/README.md
index c7a34b0de54..aa2d5afb246 100644
--- a/.dev/README.md
+++ b/.dev/README.md
@@ -583,6 +583,54 @@ at.
 
 [baseline]: https://github.com/SimpleMachines/SMF/pull/9330
 
+## Converting templates to Plates
+
+The default theme's `*.template.php` files, each a set of `template_*()`
+functions that echo, convert mechanically into Plates templates, one file per
+sub-template in `Themes/default/templates/<Template>/`:
+
+```bash
+.dev/convert-templates.sh Who Recent
+.dev/convert-templates.sh --from <commit> --all --skip Stats
+```
+
+Every run starts again from the old files as the commit has them (`HEAD` by
+default), so it can be repeated as often as the converter changes, and the
+result depends on nothing else. `.dev/plates/convert.php` does the conversion;
+the script adds the handful of fix-ups the default theme needs, removes the
+empty lines the conversion leaves where HTML does not need them, and runs
+php-cs-fixer. The converter stops on anything it cannot convert faithfully,
+and warns about what a person should look at: a template that returns a
+value, a by-reference parameter, a call whose parameters it cannot find.
+
+Convert callers before the templates they call. A converted template reaches
+a sub-template of either kind through `$this->subTemplate()`, but an old one
+calling a `template_*()` function breaks once that function is gone.
+
+The point of converting mechanically is that the result can be checked
+mechanically. Capture every page the template snapshot suite renders, on both
+engines, before and after, and compare them:
+
+```bash
+.dev/capture-pages.sh before
+.dev/convert-templates.sh Who
+.dev/capture-pages.sh after
+.dev/compare-pages.sh before after -v
+.dev/compare-pages.sh before after --rendered -v
+```
+
+Straight out of the converter the pages match byte for byte, once sessions,
+tokens, times and counts are masked. After the tidying they match as a browser
+shows them: `--rendered` treats a run of whitespace as one space, except
+inside `<pre>`, `<textarea>` and `<script>`, which must still match exactly.
+The capture includes a few responses the snapshot suite does not cover:
+`ssi_examples.php`, XML responses, and `.dev/plates/probe.php`, which calls
+the template helpers the way a mod does.
+
+Capture both sides on the same forum, one straight after the other. The pages
+show counts and recent activity, so a forum that has been used in between
+reads differently for reasons that have nothing to do with the templates.
+
 ## Debugging SQL with the PostgreSQL log
 
 The `postgres` log is the best tool in the stack for tracking down a broken
@@ -671,6 +719,14 @@ compose.yaml                     the stack
 .dev/interrupt-upgrade.sh        kill an upgrade part way, report what recovery left
 .dev/compare-upgrade.sh          upgrade a 2.1 dump, install 3.0, diff the two
 .dev/schema-tool.php             read a database's shape, and compare readings
+
+.dev/convert-templates.sh        convert default theme templates to Plates, repeatably
+.dev/capture-pages.sh            save every snapshot page's HTML, on both engines
+.dev/compare-pages.sh            diff two captures, byte for byte or as rendered
+.dev/plates/convert.php          the converter: template_*() functions to Plates files
+.dev/plates/tidy.php             drop empty lines HTML does not need
+.dev/plates/compare.php          what compare-pages.sh runs
+.dev/plates/probe.php            call the template helpers the way a mod does
 ```
 
 `.dev/db.php` exists because the two runners reach the database differently.
diff --git a/.dev/capture-pages.sh b/.dev/capture-pages.sh
new file mode 100755
index 00000000000..9c278841642
--- /dev/null
+++ b/.dev/capture-pages.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# Saves the HTML of every page the template snapshot suite renders, on both
+# engines, plus a few responses the suite does not cover, so that two versions
+# of the templates can be compared page by page.
+#
+#   .dev/capture-pages.sh before                  into logs/pages-before/
+#   ... change the templates ...
+#   .dev/capture-pages.sh after
+#   .dev/compare-pages.sh before after -v
+#
+# The extra responses, fetched as a guest from $SMF_BOARDURL: ssi_examples.php,
+# the statistics centre's XML, the keep-alive and a help popup, and
+# .dev/plates/probe.php, which calls the template helpers the way a mod does.
+#
+# Capture both sides on the same forum, one straight after the other: the
+# pages show counts and recent activity, and a forum that has been used in
+# between reads differently for reasons that have nothing to do with the
+# templates.
+set -euo pipefail
+
+. "$(dirname -- "${BASH_SOURCE[0]}")/lib.sh"
+
+parse_runner_args "$@"
+
+LABEL=''
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--docker|--local) shift ;;
+		-h|--help) sed -n '2,19p' "${BASH_SOURCE[0]}"; exit 0 ;;
+		-*) die "unknown option: $1" ;;
+		*) LABEL="$1"; shift ;;
+	esac
+done
+
+[ -n "$LABEL" ] || die "name the capture, for example: $(basename -- "$0") before"
+
+cd "$BOARD_DIR"
+
+out="logs/pages-$LABEL"
+rm -rf "$out"
+
+SMF_SNAPSHOT_RAW="$out" "$DEV_DIR/test.sh" "--$SMF_RUNNER" --engine both --testsuite snapshot
+
+mkdir -p "$out/extras"
+cp .dev/plates/probe.php ./plates-probe.php
+trap 'rm -f ./plates-probe.php' EXIT
+
+fetch() {
+	curl -sS -o "$out/extras/$1.html" "$SMF_BOARDURL/$2"
+}
+
+fetch ssi_examples 'ssi_examples.php'
+fetch probe 'plates-probe.php'
+fetch stats_xml 'index.php?action=stats;xml;expand=202001'
+fetch stats_xml_now "index.php?action=stats;xml;expand=$(date +%Y%m)"
+fetch keepalive 'index.php?action=keepalive'
+fetch help_popup 'index.php?action=helpadmin;help=cal_enabled'
+
+log "captured $(find "$out" -name '*.html' | wc -l | tr -d ' ') pages in $out"
diff --git a/.dev/compare-pages.sh b/.dev/compare-pages.sh
new file mode 100755
index 00000000000..a846c5e7b1d
--- /dev/null
+++ b/.dev/compare-pages.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Compares two captures made by .dev/capture-pages.sh and lists the pages that
+# differ. Exits non-zero if any do.
+#
+#   .dev/compare-pages.sh before after              byte for byte, after masking
+#   .dev/compare-pages.sh before after --rendered   as a browser shows them
+#   .dev/compare-pages.sh before after -v           and where each page differs
+#
+# What is masked, and what --rendered lets through, is described at the top of
+# .dev/plates/compare.php.
+set -euo pipefail
+
+. "$(dirname -- "${BASH_SOURCE[0]}")/lib.sh"
+
+parse_runner_args "$@"
+
+LABELS=()
+FLAGS=()
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--docker|--local) shift ;;
+		-h|--help) sed -n '2,11p' "${BASH_SOURCE[0]}"; exit 0 ;;
+		-*) FLAGS+=("$1"); shift ;;
+		*) LABELS+=("$1"); shift ;;
+	esac
+done
+
+[ ${#LABELS[@]} -eq 2 ] || die "name two captures, for example: $(basename -- "$0") before after"
+
+run_php .dev/plates/compare.php "logs/pages-${LABELS[0]}" "logs/pages-${LABELS[1]}" ${FLAGS[@]+"${FLAGS[@]}"}
diff --git a/.dev/convert-templates.sh b/.dev/convert-templates.sh
new file mode 100755
index 00000000000..4093898e46d
--- /dev/null
+++ b/.dev/convert-templates.sh
@@ -0,0 +1,140 @@
+#!/usr/bin/env bash
+# Converts the default theme's templates to Plates, from the *.template.php
+# files as a commit has them. Safe to run as often as needed: each run starts
+# again from the old file, so the result depends only on the commit and the
+# converter.
+#
+#   .dev/convert-templates.sh Who Recent                 from HEAD
+#   .dev/convert-templates.sh --from ea5ae213e Who       from another commit
+#   .dev/convert-templates.sh --from ea5ae213e --all --skip Stats
+#
+# For each template it restores the old file, converts it with
+# .dev/plates/convert.php into Themes/default/templates/<Template>/, applies
+# the few fix-ups the converter cannot make on its own, removes the old file,
+# drops the empty lines the conversion leaves where HTML does not need them
+# (.dev/plates/tidy.php), and runs php-cs-fixer over the result.
+#
+# Convert callers before the templates they call: a converted template reaches
+# either kind through $this->subTemplate(), while an old one calling a
+# template_*() function breaks once that function is gone.
+#
+# Needs git and perl on the host; PHP runs wherever $SMF_RUNNER says.
+set -euo pipefail
+
+. "$(dirname -- "${BASH_SOURCE[0]}")/lib.sh"
+
+parse_runner_args "$@"
+
+FROM='HEAD'
+ALL=''
+SKIP=()
+TEMPLATES=()
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--from) FROM="$2"; shift 2 ;;
+		--from=*) FROM="${1#*=}"; shift ;;
+		--all) ALL=1; shift ;;
+		--skip) SKIP+=("$2"); shift 2 ;;
+		--skip=*) SKIP+=("${1#*=}"); shift ;;
+		--docker|--local) shift ;;
+		-h|--help) sed -n '2,22p' "${BASH_SOURCE[0]}"; exit 0 ;;
+		-*) die "unknown option: $1" ;;
+		*) TEMPLATES+=("$1"); shift ;;
+	esac
+done
+
+cd "$BOARD_DIR"
+
+theme='Themes/default'
+
+# The old templates, so the converter knows the parameter names of templates
+# that have already been converted. Inside the checkout, where the container
+# can read them too; ignored by git.
+signatures='.dev/plates/signatures'
+rm -rf "$signatures"
+mkdir -p "$signatures"
+trap 'rm -rf "$signatures"' EXIT
+
+while IFS= read -r path; do
+	git show "$FROM:$path" > "$signatures/$(basename -- "$path")"
+done < <(git ls-tree --name-only "$FROM" "$theme/" | grep '\.template\.php$')
+
+if [ -n "$ALL" ]; then
+	for path in "$signatures"/*.template.php; do
+		TEMPLATES+=("$(basename -- "$path" .template.php)")
+	done
+fi
+
+files=()
+
+for t in ${TEMPLATES[@]+"${TEMPLATES[@]}"}; do
+	for s in ${SKIP[@]+"${SKIP[@]}"}; do
+		[ "$t" = "$s" ] && continue 2
+	done
+
+	[ -f "$signatures/$t.template.php" ] || die "$FROM has no $theme/$t.template.php"
+
+	cp "$signatures/$t.template.php" "$theme/$t.template.php"
+	rm -rf "$theme/templates/$t"
+	files+=("$theme/$t.template.php")
+done
+
+[ ${#files[@]} -gt 0 ] || die "nothing to convert; name the templates, or pass --all"
+
+# The fallbacks Xml defines for when no index template is loaded are defined
+# with the other legacy functions in Sources/TemplateFunctions.php.
+if [ -f "$theme/Xml.template.php" ]; then
+	perl -0pi -e 's{/\*\n \* This is just to hold off some errors if people are stupid\.\n \*/\nif \(!function_exists\(\x27template_button_strip\x27\)\) \{\n.*?\n\}\n\n}{}s' "$theme/Xml.template.php"
+
+	if grep -q 'hold off some errors' "$theme/Xml.template.php"; then
+		die "could not remove Xml's fallbacks"
+	fi
+fi
+
+run_php .dev/plates/convert.php --signatures="$signatures" "${files[@]}"
+
+# Applies a fix-up with perl, and fails if what it should have removed is still there.
+fixup() {
+	local file=$1 perl=$2 check=$3
+
+	[ -f "$file" ] || return 0
+	perl -0pi -e "$perl" "$file"
+
+	if grep -qF -- "$check" "$file"; then
+		die "fix-up did not apply to $file: $check"
+	fi
+}
+
+# The moderation centre's blocks, called through a variable inside an echo.
+fixup "$theme/templates/ModerationCenter/moderation_center.php" \
+	's/<\?php \$block_function = \x27template_\x27 \. \$block; \?>//; s/function_exists\(\$block_function\) \? \$block_function\(\) : \x27\x27/\$this->hasSubTemplate(\$block) ? \$this->subTemplate(\$block) : \x27\x27/' \
+	'$block_function'
+
+# Returned its HTML for a list column; a Plates template outputs it instead.
+fixup "$theme/templates/ModerationCenter/user_watch_post_callback.php" \
+	's/<\?php return \$output_html; \?>/<?php echo \$output_html; ?>/' \
+	'return $output_html'
+
+# The quick buttons are always output; template_quickbuttons() returns them when asked.
+fixup "$theme/templates/index/quickbuttons.php" \
+	's/<\?php if \(\$output_method == \x27echo\x27\): \?><\?= \$output \?><\?php else: \?><\?php return \$output; \?><\?php endif; \?>/<?= \$output ?>/; s/ \* \@param string \$output_method [^\n]*\n/ * \@param string \$output_method Ignored: the buttons are output, and template_quickbuttons() returns them when asked.\n/; s/ \* \@return void\|string [^\n]*\n//' \
+	'return $output'
+
+converted=()
+
+for file in "${files[@]}"; do
+	t=$(basename -- "$file" .template.php)
+
+	rm "$file"
+	git rm -q --cached --ignore-unmatch "$file"
+
+	while IFS= read -r path; do
+		converted+=("$path")
+	done < <(find "$theme/templates/$t" -name '*.php' ! -name index.php | sort)
+done
+
+run_php .dev/plates/tidy.php "${converted[@]}"
+run_cmd php vendor/bin/php-cs-fixer fix --allow-risky=yes --quiet --config .php-cs-fixer.dist.php "${converted[@]}"
+
+log "converted ${#files[@]} templates into ${#converted[@]} files"
diff --git a/.dev/plates/compare.php b/.dev/plates/compare.php
new file mode 100644
index 00000000000..62f1a7e1dc3
--- /dev/null
+++ b/.dev/plates/compare.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * Compares two sets of captured pages, as written by .dev/capture-pages.sh,
+ * and lists the pages that differ.
+ *
+ *   php .dev/plates/compare.php logs/pages-before logs/pages-after [--rendered] [-v]
+ *
+ * Both sides are masked first for what changes between any two runs: the
+ * verification honeypot's random field name, every run of hex that holds a
+ * digit (sessions, tokens, ids, counts, times), and the plural that follows
+ * the number of guests online.
+ *
+ * By default the rest must match byte for byte. With --rendered, runs of
+ * whitespace count as one space, as a browser shows them, except inside
+ * <pre>, <textarea> and <script>, where a newline is content or a statement
+ * boundary and must still match exactly.
+ *
+ * COMPARE_SKIP is a regular expression of pages to leave out. By default it
+ * skips the login history and the error log, which grow with every run.
+ */
+
+declare(strict_types=1);
+
+$args = array_slice($argv, 1);
+$verbose = in_array('-v', $args, true);
+$rendered = in_array('--rendered', $args, true);
+$dirs = array_values(array_filter($args, fn ($a) => !str_starts_with($a, '-')));
+
+if (count($dirs) !== 2 || !is_dir($dirs[0]) || !is_dir($dirs[1])) {
+	fwrite(STDERR, "usage: php .dev/plates/compare.php BEFORE_DIR AFTER_DIR [--rendered] [-v]\n");
+
+	exit(2);
+}
+
+[$before, $after] = array_map(fn ($d) => rtrim($d, '/'), $dirs);
+$skip = getenv('COMPARE_SKIP') ?: 'profile_track_logins|admin.track_ip';
+
+$mask = function (string $s): string {
+	$s = preg_replace('/name="[a-z]+-[a-z]+-[0-9a-z]{4}"/', 'name="{honeypot}"', $s);
+	$s = preg_replace('/\b(\d+) guests?\b/', '$1 guest', $s);
+
+	return preg_replace('/[0-9a-f]*\d[0-9a-f]*/', 'H', $s);
+};
+
+// The blocks whose whitespace matters, and the text around them with its whitespace collapsed.
+$split = function (string $s): array {
+	$pattern = '~<(pre|textarea|script)\b.*?</\1>~is';
+	preg_match_all($pattern, $s, $m);
+
+	return [$m[0], array_map(fn ($t) => preg_replace('/\s+/', ' ', $t), preg_split($pattern, $s))];
+};
+
+// Where two strings first differ, with some context on each side.
+$near = function (string $a, string $b): string {
+	$at = strspn($a ^ $b, "\0");
+
+	return '    ' . json_encode(substr($a, max(0, $at - 80), 160)) . "\n    " . json_encode(substr($b, max(0, $at - 80), 160)) . "\n";
+};
+
+$files = [];
+
+foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($before, FilesystemIterator::SKIP_DOTS)) as $file) {
+	if (str_ends_with($file->getPathname(), '.html')) {
+		$files[] = substr($file->getPathname(), strlen($before) + 1);
+	}
+}
+
+sort($files);
+$total = $identical = $changed = 0;
+
+foreach ($files as $rel) {
+	if (preg_match("~$skip~", $rel)) {
+		continue;
+	}
+
+	$total++;
+
+	if (!is_file("$after/$rel")) {
+		echo "MISSING $rel\n";
+		$changed++;
+
+		continue;
+	}
+
+	$a = $mask(file_get_contents("$before/$rel"));
+	$b = $mask(file_get_contents("$after/$rel"));
+
+	if ($a === $b) {
+		$identical++;
+
+		continue;
+	}
+
+	if ($rendered) {
+		[$blocks_a, $text_a] = $split($a);
+		[$blocks_b, $text_b] = $split($b);
+
+		if ($blocks_a === $blocks_b && $text_a === $text_b) {
+			continue;
+		}
+	}
+
+	$changed++;
+	echo "DIFF $rel\n";
+
+	if (!$verbose) {
+		continue;
+	}
+
+	if (!$rendered) {
+		echo $near($a, $b);
+
+		continue;
+	}
+
+	foreach ($blocks_a as $i => $block) {
+		if ($block !== ($blocks_b[$i] ?? null)) {
+			echo "  in <pre>, <textarea> or <script> number $i:\n" . $near($block, $blocks_b[$i] ?? '');
+
+			continue 2;
+		}
+	}
+
+	foreach ($text_a as $i => $text) {
+		if ($text !== ($text_b[$i] ?? null)) {
+			echo "  in the text:\n" . $near($text, $text_b[$i] ?? '');
+
+			continue 2;
+		}
+	}
+
+	echo "  in the number of <pre>, <textarea> or <script> blocks\n";
+}
+
+echo "$changed of $total pages differ ($identical identical"
+	. ($rendered ? ', the rest the same as rendered' : '') . ")\n";
+
+exit($changed === 0 ? 0 : 1);
diff --git a/.dev/plates/convert.php b/.dev/plates/convert.php
new file mode 100644
index 00000000000..f36df590442
--- /dev/null
+++ b/.dev/plates/convert.php
@@ -0,0 +1,1148 @@
+<?php
+
+/**
+ * Converts a *.template.php file of template_*() functions into Plates
+ * templates, one file per sub-template in templates/<Template>/, that render
+ * byte for byte what the functions echoed.
+ *
+ *   php .dev/plates/convert.php [--dry] [--signatures=DIR] Themes/default/Who.template.php ...
+ *
+ * Usually run through .dev/convert-templates.sh, which also applies the
+ * fix-ups the default theme needs and tidies the result.
+ *
+ * - echo 'literal' becomes the literal as HTML; any other echo argument
+ *   becomes <?= ... ?>. A concatenation is split into its parts when nothing
+ *   in it binds looser than the dot, and adjacent literals are joined.
+ * - if/elseif/else, foreach, for and while with braces become the alternative
+ *   syntax. Everything else is kept as a PHP block, as written.
+ * - PHP eats the newline that follows ?>. Where every text after a tag starts
+ *   with a newline, the tags go on their own lines and each line of text
+ *   keeps a trailing newline instead. Otherwise the tags stay inline and an
+ *   empty line after a tag keeps the newline it ate.
+ * - template_foo($a, $b) as a statement becomes
+ *   $this->subTemplate('foo', ['a' => $a, ...]), and inside an expression
+ *   $this->fetchSubTemplate(...), with the parameter names of template_foo(),
+ *   so the call works whichever kind of template has foo.
+ *   function_exists('template_...') becomes $this->hasSubTemplate('...'), and
+ *   call_user_func('template_' . $x) becomes a call by the built name.
+ * - The parameter names come from the *.template.php files next to the one
+ *   being converted, and from those in --signatures=DIR, for calls into
+ *   templates that have already been converted.
+ *
+ * Anything it cannot convert faithfully stops it with a message rather than
+ * guessing, and anything it converted but a person should check is listed
+ * as a warning: a returned value, a by-reference parameter, a call whose
+ * parameters are unknown.
+ */
+
+declare(strict_types=1);
+
+final class ConvertError extends RuntimeException {}
+
+final class Converter
+{
+	/** @var PhpToken[] */
+	private array $t;
+
+	private array $signatures;
+
+	public static array $layouts = ['own lines' => 0, 'inline' => 0];
+
+	/**
+	 * Functions in templates that are not named template_*, and the
+	 * sub-templates they become.
+	 */
+	private const RENAMED = ['theme_linktree' => 'linktree'];
+
+	private array $warnings = [];
+
+	private const LOOSER_THAN_DOT = [
+		'?', '<', '>', '=', '&', '|', '^',
+		T_COALESCE, T_BOOLEAN_AND, T_BOOLEAN_OR, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR,
+		T_IS_EQUAL, T_IS_NOT_EQUAL, T_IS_IDENTICAL, T_IS_NOT_IDENTICAL, T_IS_SMALLER_OR_EQUAL,
+		T_IS_GREATER_OR_EQUAL, T_SPACESHIP, T_PLUS_EQUAL, T_MINUS_EQUAL, T_MUL_EQUAL, T_DIV_EQUAL,
+		T_CONCAT_EQUAL, T_MOD_EQUAL, T_AND_EQUAL, T_OR_EQUAL, T_XOR_EQUAL, T_SL_EQUAL, T_SR_EQUAL,
+		T_POW_EQUAL, T_COALESCE_EQUAL, T_DOUBLE_ARROW, T_PRINT, T_YIELD, T_YIELD_FROM,
+		T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG, T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG,
+	];
+
+	public function __construct(private string $file, private bool $dry, ?string $signatures_dir = null)
+	{
+		// The original templates, so that calls into ones already converted still find their parameters.
+		$this->signatures = self::collectSignatures(dirname($file)) + ($signatures_dir === null ? [] : self::collectSignatures($signatures_dir));
+		$this->t = PhpToken::tokenize(file_get_contents($file));
+	}
+
+	public function run(): void
+	{
+		$template = basename($this->file, '.template.php');
+		$out_dir = dirname($this->file) . '/templates/' . $template;
+
+		[$license, $uses, $functions, $notes] = $this->parseFile();
+
+		foreach ($notes as $note) {
+			$this->warnings[] = 'file-level comment not carried over: ' . substr(preg_replace('/\s+/', ' ', $note), 0, 100);
+		}
+
+		$files = [];
+
+		foreach ($functions as $fn) {
+			$segments = $this->convertBlock($fn['body'][0] + 1, $fn['body'][1]);
+			$body = $this->render($segments);
+
+			$header = "<?php\n\n" . $license . "\n\n";
+
+			$used = array_filter($uses, fn ($use) => preg_match('/\b' . preg_quote($use['alias'], '/') . '\b/', $body));
+
+			if ($used !== []) {
+				$header .= implode("\n", array_column($used, 'line')) . "\n\n";
+			}
+
+			$header .= "if (!defined('SMF')) {\n\tdie('No direct access...');\n}\n";
+
+			// Not a docblock any more, since nothing follows it to document.
+			if ($fn['doc'] !== null) {
+				$header .= "\n" . preg_replace('~^(\s*)/\*\*(?=\s)~m', '$1/*', $fn['doc']) . "\n";
+			}
+
+			$defaults = array_filter($fn['params'], fn ($p) => $p['default'] !== null);
+
+			if ($defaults !== []) {
+				$pairs = array_map(fn ($p) => var_export($p['name'], true) . ' => ' . $p['default'], $defaults);
+				$header .= "\n// The parameters that were not passed get the defaults they had as arguments.\n"
+					. 'extract([' . implode(', ', $pairs) . "], EXTR_SKIP);\n";
+			}
+
+			$files[$fn['name']] = $header . '?>' . $body;
+		}
+
+		if ($this->dry) {
+			foreach ($files as $name => $content) {
+				echo "===== $out_dir/$name.php\n$content\n";
+			}
+		} else {
+			if (!is_dir($out_dir)) {
+				mkdir($out_dir, 0o755, true);
+			}
+
+			// Every directory gets the theme's stub that refuses direct access.
+			$stub = dirname($this->file) . '/index.php';
+
+			if (is_file($stub)) {
+				foreach ([dirname($out_dir), $out_dir] as $dir) {
+					if (!is_file($dir . '/index.php')) {
+						copy($stub, $dir . '/index.php');
+					}
+				}
+			}
+
+			foreach ($files as $name => $content) {
+				file_put_contents("$out_dir/$name.php", $content);
+			}
+		}
+
+		fwrite(STDERR, sprintf("%s: %d sub-templates\n", $template, count($files)));
+
+		foreach (array_unique($this->warnings) as $warning) {
+			fwrite(STDERR, "  WARNING $warning\n");
+		}
+	}
+
+	/***********************************************************************
+	 * The file
+	 ***********************************************************************/
+
+	private function parseFile(): array
+	{
+		$license = null;
+		$uses = [];
+		$functions = [];
+		$notes = [];
+		$doc = null;
+		$n = count($this->t);
+
+		for ($i = 0; $i < $n; $i++) {
+			$tok = $this->t[$i];
+
+			if ($tok->is([T_OPEN_TAG, T_WHITESPACE])) {
+				continue;
+			}
+
+			if ($tok->is(T_DOC_COMMENT)) {
+				if ($license === null && str_contains($tok->text, 'Simple Machines Forum (SMF)')) {
+					$license = $tok->text;
+				} else {
+					$doc = $tok->text;
+				}
+
+				continue;
+			}
+
+			if ($tok->is(T_COMMENT)) {
+				// Comments between functions describe the next one, apart from separator lines.
+				if (preg_match('~^//\s*[-=*]{5,}\s*$~', trim($tok->text)) === 0) {
+					$notes[] = rtrim($tok->text);
+				}
+
+				continue;
+			}
+
+			if ($tok->is(T_USE)) {
+				$end = $this->find($i, ';');
+				$line = $this->text($i, $end + 1);
+				$alias = preg_match('/\bas\s+(\w+)\s*;$/', $line, $m) ? $m[1] : preg_replace('/^.*\\\\/', '', rtrim(substr($line, 4), '; '));
+				$uses[] = ['line' => $line, 'alias' => $alias];
+				$i = $end;
+
+				continue;
+			}
+
+			if ($tok->is(T_FUNCTION)) {
+				$name_at = $this->next($i);
+				$function_name = $this->t[$name_at]->text;
+
+				if (!str_starts_with($function_name, 'template_') && !isset(self::RENAMED[$function_name])) {
+					throw new ConvertError('top-level function that is not a sub-template: ' . $function_name);
+				}
+
+				$open = $this->next($name_at);
+				$close = $this->match($open);
+				$body_open = $this->next($close);
+
+				if ($this->t[$body_open]->text === ':') {
+					// A return type.
+					$body_open = $this->find($body_open, '{');
+				}
+
+				// Comments written before the function come ahead of its docblock.
+				if ($notes !== []) {
+					$doc = implode("\n", $notes) . ($doc !== null ? "\n" . $doc : '');
+					$notes = [];
+				}
+
+				$functions[] = [
+					'name' => self::RENAMED[$function_name] ?? substr($function_name, 9),
+					'doc' => $doc,
+					'params' => $this->parseParams($open + 1, $close),
+					'body' => [$body_open, $this->match($body_open)],
+				];
+
+				$doc = null;
+				$i = $this->match($body_open);
+
+				continue;
+			}
+
+			throw new ConvertError('top-level code outside the functions, line ' . $tok->line . ': ' . trim($this->text($i, min($i + 8, $n))));
+		}
+
+		if ($license === null) {
+			throw new ConvertError('no license docblock');
+		}
+
+		return [$license, $uses, $functions, $notes];
+	}
+
+	private function parseParams(int $a, int $b): array
+	{
+		$params = [];
+
+		foreach ($this->split($a, $b, ',') as [$s, $e]) {
+			$var = null;
+			$default = null;
+
+			for ($i = $s; $i < $e; $i++) {
+				if ($this->t[$i]->is(T_ELLIPSIS)) {
+					throw new ConvertError('variadic parameter');
+				}
+
+				if ($this->t[$i]->is(T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG)) {
+					$this->warnings[] = 'by-reference parameter ' . $this->t[$this->next($i)]->text . ' at line ' . $this->t[$i]->line . ' is now passed by value: check nothing writes to it';
+				}
+
+				if ($this->t[$i]->is(T_VARIABLE) && $var === null) {
+					$var = substr($this->t[$i]->text, 1);
+				}
+
+				if ($this->t[$i]->text === '=') {
+					$default = trim($this->text($i + 1, $e));
+
+					break;
+				}
+			}
+
+			if ($var !== null) {
+				$params[] = ['name' => $var, 'default' => $default];
+			}
+		}
+
+		return $params;
+	}
+
+	private static function collectSignatures(string $dir): array
+	{
+		$signatures = [];
+
+		foreach (glob($dir . '/*.template.php') as $file) {
+			preg_match_all('/^function (template_\w+|' . implode('|', array_keys(self::RENAMED)) . ')\s*\(([^)]*)\)/m', file_get_contents($file), $m, PREG_SET_ORDER);
+
+			foreach ($m as [, $name, $params]) {
+				preg_match_all('/\$(\w+)/', $params, $vars);
+				$signatures[self::RENAMED[$name] ?? substr($name, 9)] = $vars[1];
+			}
+		}
+
+		return $signatures;
+	}
+
+	/***********************************************************************
+	 * Statements
+	 ***********************************************************************/
+
+	/**
+	 * Converts the statements in [$a, $b) into segments: ['text', s],
+	 * ['echo', code], ['php', code] or ['ctl', code].
+	 */
+	private function convertBlock(int $a, int $b): array
+	{
+		$segments = [];
+		$i = $a;
+
+		while ($i < $b) {
+			$tok = $this->t[$i];
+
+			if ($tok->is(T_WHITESPACE)) {
+				$i++;
+
+				continue;
+			}
+
+			if ($tok->is([T_COMMENT, T_DOC_COMMENT])) {
+				$segments[] = ['php', rtrim($tok->text)];
+				$i++;
+
+				continue;
+			}
+
+			if ($tok->is(T_ECHO)) {
+				$end = $this->find($i, ';');
+
+				foreach ($this->split($i + 1, $end, ',') as [$s, $e]) {
+					array_push($segments, ...$this->convertEchoArg($s, $e));
+				}
+
+				$i = $end + 1;
+
+				continue;
+			}
+
+			if ($tok->is(T_IF)) {
+				[$converted, $i] = $this->convertIf($i);
+				array_push($segments, ...$converted);
+
+				continue;
+			}
+
+			if ($tok->is([T_FOREACH, T_FOR, T_WHILE])) {
+				$open = $this->next($i);
+				$close = $this->match($open);
+				$body = $this->next($close);
+
+				if ($this->t[$body]->text !== '{') {
+					throw new ConvertError('loop without braces, line ' . $tok->line);
+				}
+
+				$keyword = strtolower($tok->text);
+				$segments[] = ['ctl', $keyword . ' ' . $this->rewrite($open, $close + 1) . ':'];
+				array_push($segments, ...$this->convertBlock($body + 1, $this->match($body)));
+				$segments[] = ['ctl', 'end' . $keyword . ';'];
+				$i = $this->match($body) + 1;
+
+				continue;
+			}
+
+			if ($tok->is(T_RETURN) && $this->t[$this->next($i)]->text !== ';') {
+				$this->warnings[] = 'returns a value at line ' . $tok->line . ', which a Plates template cannot: output it instead';
+			}
+
+			// Anything else is kept as PHP, as it was written.
+			$end = $this->statementEnd($i);
+			$segments[] = ['php', $this->rewrite($i, $end + 1)];
+			$i = $end + 1;
+		}
+
+		return $this->callsThroughVariables($segments);
+	}
+
+	/**
+	 * $f = 'template_prefix_' . $x; followed by $f(); calls a sub-template
+	 * whose name is built at runtime.
+	 */
+	private function callsThroughVariables(array $segments): array
+	{
+		for ($i = 0; $i + 1 < count($segments); $i++) {
+			if (
+				$segments[$i][0] === 'php'
+				&& $segments[$i + 1][0] === 'php'
+				&& preg_match('/^\$(\w+) = \'template_([^\']*)\' \. (.+);$/s', $segments[$i][1], $m)
+				&& $segments[$i + 1][1] === '$' . $m[1] . '();'
+			) {
+				$name = $m[2] === '' ? $m[3] : "'" . $m[2] . "' . " . $m[3];
+				array_splice($segments, $i, 2, [['php', '$this->subTemplate(' . $name . ');']]);
+			}
+		}
+
+		return $segments;
+	}
+
+	private function convertIf(int $i): array
+	{
+		$segments = [];
+		$keyword = 'if';
+
+		while (true) {
+			$open = $this->next($i);
+			$close = $this->match($open);
+			$body = $this->next($close);
+
+			if ($this->t[$body]->text !== '{') {
+				throw new ConvertError('if without braces, line ' . $this->t[$i]->line);
+			}
+
+			$segments[] = ['ctl', $keyword . ' ' . $this->rewrite($open, $close + 1) . ':'];
+			array_push($segments, ...$this->convertBlock($body + 1, $this->match($body)));
+			$after = $this->match($body) + 1;
+
+			// Comments between a closing brace and the else stay with the branch before.
+			$k = $after;
+
+			while ($k < count($this->t) && $this->t[$k]->is([T_WHITESPACE, T_COMMENT])) {
+				if ($this->t[$k]->is(T_COMMENT)) {
+					$comment = ['php', rtrim($this->t[$k]->text)];
+				}
+
+				$k++;
+			}
+
+			$next = $this->t[$k];
+
+			if ($next->is(T_ELSEIF) || ($next->is(T_ELSE) && $this->t[$this->next($k)]->is(T_IF))) {
+				if (isset($comment)) {
+					$segments[] = $comment;
+					unset($comment);
+				}
+
+				$i = $next->is(T_ELSEIF) ? $k : $this->next($k);
+				$keyword = 'elseif';
+
+				continue;
+			}
+
+			if ($next->is(T_ELSE)) {
+				if (isset($comment)) {
+					$segments[] = $comment;
+					unset($comment);
+				}
+
+				$body = $this->next($k);
+
+				if ($this->t[$body]->text !== '{') {
+					throw new ConvertError('else without braces, line ' . $next->line);
+				}
+
+				$segments[] = ['ctl', 'else:'];
+				array_push($segments, ...$this->convertBlock($body + 1, $this->match($body)));
+				$after = $this->match($body) + 1;
+			}
+
+			$segments[] = ['ctl', 'endif;'];
+
+			// A comment that followed the whole if belongs to what comes next.
+			return [$segments, $after];
+		}
+	}
+
+	private function convertEchoArg(int $a, int $b): array
+	{
+		[$a, $b] = $this->trim($a, $b);
+
+		if ($b - $a === 1 && $this->t[$a]->is(T_CONSTANT_ENCAPSED_STRING)) {
+			$literal = $this->t[$a]->text;
+
+			if ($literal[0] === "'") {
+				$value = $this->decodeSingle(substr($literal, 1, -1));
+
+				return str_contains($value, '<?') ? [['echo', $literal]] : [['text', $value]];
+			}
+
+			if (!str_contains($literal, '\\') && !str_contains($literal, '$') && !str_contains($literal, '<?')) {
+				return [['text', substr($literal, 1, -1)]];
+			}
+
+			return [['echo', $literal]];
+		}
+
+		if ($this->isTemplateCall($a, $b)) {
+			return [['php', $this->rewrite($a, $b) . ';']];
+		}
+
+		if ($this->canSplitConcat($a, $b)) {
+			$segments = [];
+
+			foreach ($this->split($a, $b, '.') as [$s, $e]) {
+				array_push($segments, ...$this->convertEchoArg($s, $e));
+			}
+
+			return $segments;
+		}
+
+		return [['echo', $this->rewrite($a, $b)]];
+	}
+
+	private function decodeSingle(string $s): string
+	{
+		$out = '';
+
+		for ($i = 0, $n = strlen($s); $i < $n; $i++) {
+			if ($s[$i] === '\\' && $i + 1 < $n && ($s[$i + 1] === '\\' || $s[$i + 1] === "'")) {
+				$out .= $s[++$i];
+			} else {
+				$out .= $s[$i];
+			}
+		}
+
+		return $out;
+	}
+
+	private function canSplitConcat(int $a, int $b): bool
+	{
+		$depth = 0;
+		$dots = 0;
+
+		for ($i = $a; $i < $b; $i++) {
+			$tok = $this->t[$i];
+
+			if ($this->opens($tok)) {
+				$depth++;
+			} elseif (in_array($tok->text, [')', ']', '}'], true)) {
+				$depth--;
+			} elseif ($depth === 0) {
+				if ($tok->text === '.') {
+					$dots++;
+				} elseif ($tok->is(self::LOOSER_THAN_DOT)) {
+					return false;
+				}
+			}
+
+			// A call that outputs while the concatenation is being built would move.
+			if ($tok->is(T_STRING) && str_starts_with($tok->text, 'template_')) {
+				return false;
+			}
+		}
+
+		return $dots > 0;
+	}
+
+	private function isTemplateCall(int $a, int $b): bool
+	{
+		if (!$this->t[$a]->is(T_STRING) || !str_starts_with($this->t[$a]->text, 'template_')) {
+			return false;
+		}
+
+		$open = $this->next($a);
+
+		return $this->t[$open]->text === '(' && $this->match($open) === $b - 1;
+	}
+
+	/***********************************************************************
+	 * Rewriting calls
+	 ***********************************************************************/
+
+	private function rewrite(int $a, int $b): string
+	{
+		$out = '';
+
+		// A call that is a whole statement outputs; one inside an expression is used as a value.
+		[$whole_a, $whole_b] = $this->trim($a, $b);
+
+		if ($whole_b > $whole_a && $this->t[$whole_b - 1]->text === ';') {
+			[$whole_a, $whole_b] = $this->trim($whole_a, $whole_b - 1);
+		}
+
+		for ($i = $a; $i < $b; $i++) {
+			$tok = $this->t[$i];
+			$prev = $this->t[$this->prev($i)] ?? null;
+			$after_member = $prev !== null && $prev->is([T_FUNCTION, T_OBJECT_OPERATOR, T_NULLSAFE_OBJECT_OPERATOR, T_DOUBLE_COLON, T_NEW]);
+
+			if ($tok->is(T_STRING) && !$after_member && ($open = $this->next($i)) < $b && $this->t[$open]->text === '(') {
+				$close = $this->match($open);
+				$args = $this->split($open + 1, $close, ',');
+				$method = $i === $whole_a && $close === $whole_b - 1 ? 'subTemplate' : 'fetchSubTemplate';
+
+				if (str_starts_with($tok->text, 'template_') || isset(self::RENAMED[$tok->text])) {
+					$out .= $this->subTemplateCall(self::RENAMED[$tok->text] ?? substr($tok->text, 9), $args, $method);
+					$i = $close;
+
+					continue;
+				}
+
+				if (in_array(strtolower($tok->text), ['function_exists', 'call_user_func', 'call_user_func_array'], true) && $args !== []) {
+					$first = $this->stripTemplatePrefix(...$args[0]);
+
+					if ($first !== null) {
+						$rest = array_map(fn ($arg) => $this->rewrite(...$this->trim(...$arg)), array_slice($args, 1));
+
+						// A Plates template takes its parameters by name, so name them after
+						// whichever sub-templates the built name can reach, if they agree.
+						if (strtolower($tok->text) === 'call_user_func' && $rest !== []) {
+							$names = $this->namesForDynamicCall(...$args[0]);
+
+							if ($names !== null && count($names) >= count($rest)) {
+								$rest = array_map(fn ($n, $arg) => var_export($n, true) . ' => ' . $arg, array_slice($names, 0, count($rest)), $rest);
+							} else {
+								$this->warnings[] = 'call through a built name at line ' . $tok->line . ' passes its arguments in order, which a Plates template cannot take';
+							}
+						}
+
+						$out .= match (strtolower($tok->text)) {
+							'function_exists' => '$this->hasSubTemplate(' . $first . ')',
+							'call_user_func' => '$this->' . $method . '(' . $first . ($rest === [] ? '' : ', [' . implode(', ', $rest) . ']') . ')',
+							'call_user_func_array' => '$this->' . $method . '(' . $first . ', ' . ($rest[0] ?? '[]') . ')',
+						};
+						$i = $close;
+
+						continue;
+					}
+				}
+			}
+
+			if ($tok->is(T_CONSTANT_ENCAPSED_STRING) && preg_match('/^.template_/', $tok->text)) {
+				$this->warnings[] = 'a template_ name in a string, line ' . $tok->line . ': ' . $this->text($a, $b);
+			}
+
+			$out .= $tok->text;
+		}
+
+		return $out;
+	}
+
+	/**
+	 * The parameter names shared by every known sub-template a name built at
+	 * runtime could be, such as 'template_bi_' . $board['type'] . '_icon'.
+	 */
+	private function namesForDynamicCall(int $a, int $b): ?array
+	{
+		$pattern = '';
+		$depth = 0;
+
+		for ($i = $a; $i < $b; $i++) {
+			$tok = $this->t[$i];
+
+			if ($this->opens($tok)) {
+				$depth++;
+			} elseif (in_array($tok->text, [')', ']', '}'], true)) {
+				$depth--;
+			}
+
+			// Only the literals being concatenated are part of the name, not an array key inside the variables.
+			if ($depth === 0 && $tok->is(T_CONSTANT_ENCAPSED_STRING)) {
+				$pattern .= preg_quote(substr($tok->text, 1, -1), '/');
+			} elseif (!$tok->is(T_WHITESPACE) && $tok->text !== '.' && !str_ends_with($pattern, '.*')) {
+				$pattern .= '.*';
+			}
+		}
+
+		$pattern = '/^' . preg_replace('/^template_/', '', $pattern) . '$/';
+		$found = null;
+
+		foreach ($this->signatures as $name => $params) {
+			if (preg_match($pattern, $name)) {
+				if ($found !== null && $found !== $params) {
+					return null;
+				}
+
+				$found = $params;
+			}
+		}
+
+		return $found;
+	}
+
+	private function subTemplateCall(string $name, array $args, string $method): string
+	{
+		if ($args === []) {
+			return '$this->' . $method . '(' . var_export($name, true) . ')';
+		}
+
+		$params = $this->signatures[$name] ?? null;
+
+		if ($params === null) {
+			$this->warnings[] = "call to template_$name(), whose parameters are unknown; passed in order";
+		}
+
+		$items = [];
+
+		foreach (array_values($args) as $n => [$s, $e]) {
+			[$s, $e] = $this->trim($s, $e);
+
+			// A named argument keeps its name.
+			if ($this->t[$s]->is(T_STRING) && $this->t[$this->next($s)]->text === ':') {
+				$items[] = var_export($this->t[$s]->text, true) . ' => ' . $this->rewrite($this->next($this->next($s)), $e);
+
+				continue;
+			}
+
+			if ($params !== null && !isset($params[$n])) {
+				throw new ConvertError("template_$name() is called with more arguments than it takes");
+			}
+
+			$items[] = ($params !== null ? var_export($params[$n], true) . ' => ' : '') . $this->rewrite($s, $e);
+		}
+
+		return '$this->' . $method . '(' . var_export($name, true) . ', [' . implode(', ', $items) . '])';
+	}
+
+	/**
+	 * For 'template_foo' or 'template_' . $x, the same without the prefix.
+	 */
+	private function stripTemplatePrefix(int $a, int $b): ?string
+	{
+		[$a, $b] = $this->trim($a, $b);
+
+		if (!$this->t[$a]->is(T_CONSTANT_ENCAPSED_STRING) || !preg_match('/^([\'"])template_/', $this->t[$a]->text, $m)) {
+			return null;
+		}
+
+		$rest = substr($this->t[$a]->text, 10);
+
+		if ($rest === $m[1]) {
+			// 'template_' . $x: drop the literal and the dot after it.
+			$dot = $this->next($a);
+
+			if ($this->t[$dot]->text !== '.') {
+				return null;
+			}
+
+			return trim($this->rewrite($this->next($dot), $b));
+		}
+
+		return $m[1] . $rest . $this->rewrite($a + 1, $b);
+	}
+
+	/***********************************************************************
+	 * Output
+	 ***********************************************************************/
+
+	/**
+	 * Lays the segments out as a file.
+	 *
+	 * PHP eats the newline that follows a closing tag, so where the newlines go
+	 * decides what is output. SMF writes each line of HTML as a literal that
+	 * starts with a newline. When every line of a sub-template does, its
+	 * output is the same with each newline moved to the end of its line
+	 * instead: the first newline is written right after the header, the last
+	 * line keeps none, and every tag in between can stand on a line of its
+	 * own. When they do not, the tags follow the text they come after, and a
+	 * line after a tag gets one extra newline for PHP to eat.
+	 */
+	private function render(array $segments): string
+	{
+		$segments = $this->protectOpenTags($segments);
+
+		// Consecutive PHP statements share one block.
+		$merged = [];
+
+		foreach ($segments as $segment) {
+			$last = array_key_last($merged);
+
+			if ($segment[0] === 'text' && $segment[1] === '') {
+				continue;
+			}
+
+			if ($segment[0] === 'php' && !$this->outputs($segment[1]) && $last !== null && $merged[$last][0] === 'php' && !$this->outputs($merged[$last][1])) {
+				$merged[$last][1] .= "\n" . $segment[1];
+			} else {
+				$merged[] = $segment;
+			}
+		}
+
+		if ($this->canTrailNewlines($merged)) {
+			self::$layouts['own lines']++;
+
+			return $this->renderTrailing($merged);
+		}
+
+		self::$layouts['inline']++;
+
+		return $this->renderInline($merged);
+	}
+
+	/**
+	 * Keeps text that would read as an opening PHP tag out of the HTML.
+	 *
+	 * The templates write the XML declaration as '<', '?xml ...?', '>' so that
+	 * no one literal holds the tag. Written next to each other in a file, the
+	 * pieces would make one. Adjacent literals are joined first, and a line
+	 * that holds the tag is output as a PHP string instead.
+	 */
+	private function protectOpenTags(array $segments): array
+	{
+		$joined = [];
+
+		foreach ($segments as $segment) {
+			$last = array_key_last($joined);
+
+			if ($segment[0] === 'text' && $last !== null && $joined[$last][0] === 'text') {
+				$joined[$last][1] .= $segment[1];
+			} else {
+				$joined[] = $segment;
+			}
+		}
+
+		$out = [];
+
+		foreach ($joined as $segment) {
+			if ($segment[0] !== 'text' || !str_contains($segment[1], '<?')) {
+				$out[] = $segment;
+
+				continue;
+			}
+
+			// Every newline stays in the text, so the layout still sees where lines begin.
+			foreach (preg_split('/(\n)/', $segment[1], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $piece) {
+				if (str_contains($piece, '<?')) {
+					$out[] = ['echo', var_export($piece, true)];
+				} elseif ($out !== [] && end($out)[0] === 'text') {
+					$out[array_key_last($out)][1] .= $piece;
+				} else {
+					$out[] = ['text', $piece];
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/** Whether a segment is a tag that outputs nothing. */
+	private function isQuietTag(array $segment): bool
+	{
+		return $segment[0] === 'ctl' || ($segment[0] === 'php' && !$this->outputs($segment[1]));
+	}
+
+	/** Whether a PHP statement may write to the output. */
+	private function outputs(string $code): bool
+	{
+		// A call through a variable could be anything, so it counts as output.
+		return preg_match('/\b(echo|print|printf|vprintf|readfile|passthru|var_dump|print_r)\b|subTemplate\(|template_\w*\s*\(|copyright\s*\(|\$\w+\s*\(/i', $code) === 1;
+	}
+
+	private function canTrailNewlines(array $segments): bool
+	{
+		$first_output = null;
+		$last_output = null;
+
+		foreach ($segments as $i => $segment) {
+			if (!$this->isQuietTag($segment)) {
+				$first_output ??= $i;
+				$last_output = $i;
+			}
+
+			// An early return would leave the last line's newline behind.
+			if ($segment[0] === 'php' && preg_match('/\breturn\b/', $segment[1])) {
+				return false;
+			}
+
+			// Whatever follows a tag has to start a line.
+			$after_tag = $i === 0 || $this->isQuietTag($segments[$i - 1]);
+
+			if ($after_tag && !$this->isQuietTag($segment) && !($segment[0] === 'text' && $segment[1][0] === "\n")) {
+				return false;
+			}
+		}
+
+		if ($first_output === null) {
+			return false;
+		}
+
+		// The first line has to be output every time, and so does the last.
+		for ($i = 0; $i < count($segments); $i++) {
+			if ($segments[$i][0] === 'ctl' && ($i < $first_output || $i > $last_output)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private function renderTrailing(array $segments): string
+	{
+		// The header's closing tag eats the first newline, and the second starts the output.
+		$out = "\n\n";
+		$line_open = false;
+		$at_tag = false;
+		$n = count($segments);
+
+		foreach ($segments as $i => [$type, $value]) {
+			if ($type === 'text' && $value[0] === "\n") {
+				if ($line_open) {
+					$out .= $at_tag ? "\n\n" : "\n";
+				}
+
+				$out .= substr($value, 1);
+				$line_open = true;
+				$at_tag = false;
+
+				continue;
+			}
+
+			if ($type === 'text') {
+				$out .= $value;
+				$at_tag = false;
+
+				continue;
+			}
+
+			if ($type === 'echo' || !$this->isQuietTag([$type, $value])) {
+				$out .= $type === 'echo' ? '<?= ' . $value . ' ?>' : $this->tag($value);
+				$at_tag = true;
+
+				continue;
+			}
+
+			// A tag that outputs nothing ends the line, and stands on its own.
+			if ($line_open) {
+				$out .= $at_tag ? "\n\n" : "\n";
+				$line_open = false;
+			}
+
+			$out .= $this->tag($value) . "\n";
+			$at_tag = false;
+		}
+
+		// A final newline after a closing tag is eaten, so the file can end with one.
+		return $at_tag ? $out . "\n" : $out;
+	}
+
+	private function renderInline(array $segments): string
+	{
+		$out = '';
+		// Whether the file so far ends with a closing tag, which eats a newline written after it.
+		$at_tag = true;
+
+		foreach ($segments as [$type, $value]) {
+			if ($type === 'text') {
+				if ($at_tag && $value[0] === "\n") {
+					$out .= "\n";
+				}
+
+				$out .= $value;
+				$at_tag = false;
+
+				continue;
+			}
+
+			$out .= $type === 'echo' ? '<?= ' . $value . ' ?>' : $this->tag($value);
+			$at_tag = true;
+		}
+
+		return $at_tag ? $out . "\n" : $out;
+	}
+
+	private function tag(string $code): string
+	{
+		// A line comment would run into the closing tag.
+		if (preg_match('~^//\s?(.*)$~', $code, $m) && !str_contains($m[1], '*/')) {
+			return '<?php /* ' . rtrim($m[1]) . ' */ ?>';
+		}
+
+		return str_contains($code, "\n") ? "<?php\n" . $code . "\n?>" : '<?php ' . $code . ' ?>';
+	}
+
+	/***********************************************************************
+	 * Tokens
+	 ***********************************************************************/
+
+	private function text(int $a, int $b): string
+	{
+		$s = '';
+
+		for ($i = $a; $i < $b; $i++) {
+			$s .= $this->t[$i]->text;
+		}
+
+		return $s;
+	}
+
+	private function next(int $i): int
+	{
+		do {
+			$i++;
+		} while ($i < count($this->t) && $this->t[$i]->is([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT]));
+
+		return $i;
+	}
+
+	private function prev(int $i): int
+	{
+		do {
+			$i--;
+		} while ($i >= 0 && $this->t[$i]->is([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT]));
+
+		return $i;
+	}
+
+	private function trim(int $a, int $b): array
+	{
+		while ($a < $b && $this->t[$a]->is([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
+			$a++;
+		}
+
+		while ($b > $a && $this->t[$b - 1]->is([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
+			$b--;
+		}
+
+		return [$a, $b];
+	}
+
+	private function opens(PhpToken $tok): bool
+	{
+		return in_array($tok->text, ['(', '[', '{'], true) || $tok->is([T_CURLY_OPEN, T_DOLLAR_OPEN_CURLY_BRACES]);
+	}
+
+	private function match(int $open): int
+	{
+		$depth = 0;
+
+		for ($i = $open, $n = count($this->t); $i < $n; $i++) {
+			if ($this->opens($this->t[$i])) {
+				$depth++;
+			} elseif (in_array($this->t[$i]->text, [')', ']', '}'], true) && --$depth === 0) {
+				return $i;
+			}
+		}
+
+		throw new ConvertError('unbalanced brackets from line ' . $this->t[$open]->line);
+	}
+
+	/** The next $char at the same depth as $i. */
+	private function find(int $i, string $char): int
+	{
+		$depth = 0;
+
+		for ($n = count($this->t); $i < $n; $i++) {
+			$tok = $this->t[$i];
+
+			if ($depth === 0 && $tok->text === $char) {
+				return $i;
+			}
+
+			if ($this->opens($tok)) {
+				$depth++;
+			} elseif (in_array($tok->text, [')', ']', '}'], true)) {
+				$depth--;
+			}
+		}
+
+		throw new ConvertError("no $char from line " . $this->t[$i - 1]->line);
+	}
+
+	/**
+	 * Where a statement kept as written ends: its semicolon, or the closing
+	 * brace of a switch, try or do block and whatever belongs to it.
+	 */
+	private function statementEnd(int $i): int
+	{
+		$tok = $this->t[$i];
+
+		if ($tok->is(T_SWITCH)) {
+			return $this->match($this->next($this->match($this->next($i))));
+		}
+
+		if ($tok->is(T_TRY)) {
+			$end = $this->match($this->next($i));
+
+			while ($this->t[$this->next($end)]->is([T_CATCH, T_FINALLY])) {
+				$k = $this->next($end);
+
+				if ($this->t[$k]->is(T_CATCH)) {
+					$k = $this->match($this->next($k));
+				}
+
+				$end = $this->match($this->next($k));
+			}
+
+			return $end;
+		}
+
+		if ($tok->is(T_DO)) {
+			return $this->find($this->match($this->next($i)), ';');
+		}
+
+		if ($tok->is([T_IF, T_ELSE, T_ELSEIF, T_FOREACH, T_FOR, T_WHILE])) {
+			throw new ConvertError('control structure that could not be converted, line ' . $tok->line);
+		}
+
+		return $this->find($i, ';');
+	}
+
+	/** Splits [$a, $b) on $char at the top level. */
+	private function split(int $a, int $b, string $char): array
+	{
+		$parts = [];
+		$depth = 0;
+		$start = $a;
+
+		for ($i = $a; $i < $b; $i++) {
+			$tok = $this->t[$i];
+
+			if ($this->opens($tok)) {
+				$depth++;
+			} elseif (in_array($tok->text, [')', ']', '}'], true)) {
+				$depth--;
+			} elseif ($depth === 0 && $tok->text === $char) {
+				$parts[] = [$start, $i];
+				$start = $i + 1;
+			}
+		}
+
+		$parts[] = [$start, $b];
+
+		// A trailing comma leaves nothing after it.
+		return array_values(array_filter($parts, fn ($p) => trim($this->text($p[0], $p[1])) !== ''));
+	}
+}
+
+$dry = false;
+$signatures_dir = null;
+$files = [];
+
+foreach (array_slice($argv, 1) as $arg) {
+	if ($arg === '--dry') {
+		$dry = true;
+	} elseif (str_starts_with($arg, '--signatures=')) {
+		$signatures_dir = substr($arg, strlen('--signatures='));
+	} else {
+		$files[] = $arg;
+	}
+}
+
+if ($files === []) {
+	fwrite(STDERR, "usage: php .dev/plates/convert.php [--dry] [--signatures=DIR] Themes/<theme>/<Template>.template.php ...\n");
+
+	exit(2);
+}
+
+$failed = false;
+
+foreach ($files as $file) {
+	try {
+		(new Converter($file, $dry, $signatures_dir))->run();
+	} catch (ConvertError $e) {
+		fwrite(STDERR, basename($file) . ': NOT CONVERTED - ' . $e->getMessage() . "\n");
+		$failed = true;
+	}
+}
+
+fwrite(STDERR, sprintf("layouts: %d with tags on their own lines, %d inline\n", Converter::$layouts['own lines'], Converter::$layouts['inline']));
+
+exit($failed ? 1 : 0);
diff --git a/.dev/plates/probe.php b/.dev/plates/probe.php
new file mode 100644
index 00000000000..bfac507daba
--- /dev/null
+++ b/.dev/plates/probe.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Calls the template functions the way a mod's own template would, through
+ * SSI, so that the old templates and the Plates ones can be compared on what
+ * mods reach directly. .dev/capture-pages.sh copies it into the forum root,
+ * requests it, and removes it again.
+ */
+
+declare(strict_types=1);
+
+require __DIR__ . '/SSI.php';
+
+echo "\n[ssi_menubar]\n";
+ssi_menubar();
+
+echo "\n[template_button_strip]\n";
+template_button_strip([
+	'home' => ['text' => 'home', 'url' => SMF\Config::$scripturl, 'lang' => true],
+	'search' => ['text' => 'search', 'url' => SMF\Config::$scripturl . '?action=search', 'lang' => true, 'active' => true],
+], 'right');
+
+echo "\n[template_quickbuttons return]\n";
+echo var_export(template_quickbuttons([
+	'reply' => ['label' => 'Reply', 'href' => '#reply', 'icon' => 'reply_button'],
+	'more' => [['label' => 'Split', 'href' => '#split']],
+], 'probe', 'return'), true);
+
+echo "\n[template_quickbuttons echo]\n";
+var_export(template_quickbuttons([
+	'reply' => ['label' => 'Reply', 'href' => '#reply'],
+], 'probe'));
+
+SMF\Utils::$context['linktree'] = [
+	['url' => SMF\Config::$scripturl, 'name' => 'Forum'],
+	['url' => SMF\Config::$scripturl . '?board=1.0', 'name' => 'Board'],
+];
+
+echo "\n[theme_linktree]\n";
+theme_linktree(true);
+
+echo "\n[done]\n";
diff --git a/.dev/plates/tidy.php b/.dev/plates/tidy.php
new file mode 100644
index 00000000000..dd70a016ecb
--- /dev/null
+++ b/.dev/plates/tidy.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Removes the empty line the converter leaves after a line ending in a closing
+ * tag, when the next line is indented. PHP eats the newline after the tag, so
+ * the empty line is what kept that newline in the output; dropping it leaves
+ * "\t\t<div>" where "\n\t\t<div>" was, and HTML collapses both to one space.
+ *
+ * Text inside <pre>, <textarea> and <script> is left alone, since a newline
+ * there is content or a statement boundary. `compare.php --rendered` checks
+ * that the pages are the same both ways.
+ *
+ *   php .dev/plates/tidy.php Themes/default/templates/Who/*.php
+ */
+
+declare(strict_types=1);
+
+foreach (array_slice($argv, 1) as $file) {
+	$lines = explode("\n", file_get_contents($file));
+	$out = [];
+	$removed = 0;
+
+	for ($i = 0, $n = count($lines); $i < $n; $i++) {
+		// Inside these, a newline is content, or a statement boundary in JavaScript.
+		$before = implode("\n", array_slice($lines, 0, $i));
+		$protected = false;
+
+		foreach (['script', 'pre', 'textarea'] as $tag) {
+			$open = max(strripos($before, "<$tag>"), strripos($before, "<$tag "));
+			$close = strripos($before, "</$tag>");
+
+			if ($open !== false && ($close === false || $open > $close)) {
+				$protected = true;
+			}
+		}
+
+		if (
+			!$protected
+			&& $lines[$i] === ''
+			&& $i > 0
+			&& str_ends_with($lines[$i - 1], '?>')
+			&& isset($lines[$i + 1])
+			&& preg_match('/^[ \t]/', $lines[$i + 1])
+		) {
+			$removed++;
+			continue;
+		}
+
+		$out[] = $lines[$i];
+	}
+
+	if ($removed > 0) {
+		file_put_contents($file, implode("\n", $out));
+		fwrite(STDERR, "$removed\t$file\n");
+	}
+}
diff --git a/.dev/test.sh b/.dev/test.sh
index 50145274082..d5a391e031e 100755
--- a/.dev/test.sh
+++ b/.dev/test.sh
@@ -98,6 +98,17 @@ for smf_type in $ENGINES; do
 		TEST_ENV+=(SMF_TESTS_BASE_URL="$SMF_BOARDURL")
 	fi
 
+	# Re-records the snapshots rather than comparing against them. See
+	# tests/Integration/Http/Snapshot/SnapshotTestCase.php.
+	if [[ -n "${SMF_UPDATE_SNAPSHOTS:-}" ]]; then
+		TEST_ENV+=(SMF_UPDATE_SNAPSHOTS="$SMF_UPDATE_SNAPSHOTS")
+	fi
+
+	# Also keeps each page's HTML, in a directory per engine.
+	if [[ -n "${SMF_SNAPSHOT_RAW:-}" ]]; then
+		TEST_ENV+=(SMF_SNAPSHOT_RAW="$SMF_SNAPSHOT_RAW/$smf_type")
+	fi
+
 	if run_php_env "${TEST_ENV[@]}" -- vendor/bin/phpunit \
 		--no-coverage --colors=always "${PHPUNIT_ARGS[@]+"${PHPUNIT_ARGS[@]}"}"; then
 		log "${smf_type}: passed"
diff --git a/.gitignore b/.gitignore
index bd1b552fb27..6860d4b284d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ Thumbs.db
 # Schema readings and reports from compare-upgrade.sh. They describe one
 # machine's databases at one moment, and are rewritten on every run.
 /.dev/compare/
+/.dev/plates/signatures/
 
 # Test / Private files #
 ########################
diff --git a/AGENTS.md b/AGENTS.md
index c9a0339583f..60a9dc41eb2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -329,7 +329,8 @@ harder than it looks, all of them handled in the base class:
   preview wins, the post is never made, and the response is a perfectly ordinary 200.
 - **Flood control will hit you.** `Security::spamProtection()` allows a moderator one
   login or post every two seconds per IP, and tests are far faster than people.
-  `submitForm()` waits it out once rather than failing at random.
+  `submitForm()` clears `log_floodcontrol` first, so there is nothing to wait out; use
+  it, not `$this->http->submit()`, for anything the forum counts.
 - **Quote `errorText()` in failure messages, not the body.** A fatal error in SMF is a
   normal page, and its first few hundred characters are the menu.
 
@@ -339,6 +340,40 @@ in place*, because MySQL silently coerces text to a number where PostgreSQL refu
 On PostgreSQL a failed query also poisons the rest of the transaction, so one swallowed
 error turns every later query in the test into `false`.
 
+#### Template snapshots
+
+`tests/Integration/Http/Snapshot/` records what about 250 pages render today, as a guest,
+a member and an administrator, in `snapshots/<audience>/<page>.txt`. It exists so a
+change to the template layer, such as moving the templates to another engine, can be
+checked page by page: a page that renders differently fails, and the diff says how.
+
+```bash
+.dev/test.sh --engine mysql --testsuite snapshot
+SMF_UPDATE_SNAPSHOTS=1 .dev/test.sh --engine mysql --testsuite snapshot   # re-record
+```
+
+- **What is compared is not the HTML.** `tests/Support/DomSnapshot.php` reduces a page to
+  its elements, attributes and text, with whitespace, comments and attribute order
+  dropped and the forum's own data masked: ids and counts become `#`, dates `{date}`,
+  names and subjects `{member}`, `{board}`, `{subject}`, and identical rows of a list
+  collapse into one. So reflowing a template is not a failure, and neither is somebody
+  posting.
+- **Pages that list content look at fixtures.** `fixture-forum.php` builds a category of
+  boards, topics, members, a poll, a PM and calendar events with pinned dates, once per
+  forum, and the snapshots are scoped to it. Point a new case at a fixture, not at
+  whatever the forum happens to hold.
+- **A snapshot includes what the page logged.** A conversion that renders the same page
+  while logging an undefined index shows up as a diff too.
+- **Re-recording is a decision, not a fix.** Read the diff first. The only diffs that
+  should appear while converting templates are ones you meant to make.
+- **Check a new case is stable** by recording it on a fresh forum, running
+  `perturb-forum.php` (which adds unrelated members, boards and posts, so only on a
+  forum you will throw away), and running the suite again without recording.
+- **Content is masked; configuration is not.** The admin pages show the forum's
+  settings, so compare against a freshly installed forum, as CI does. A dev forum with
+  `securityDisable` switched on differs on the pages that show it, and that is not a
+  regression.
+
 #### Writing one
 
 `tests/Unit/<Class>Test.php`, namespace `SMF\Tests\Unit`, `declare(strict_types=1)`,
diff --git a/Sources/Actions/Admin/ACP.php b/Sources/Actions/Admin/ACP.php
index 76aa3b572c2..83aa9653b13 100644
--- a/Sources/Actions/Admin/ACP.php
+++ b/Sources/Actions/Admin/ACP.php
@@ -33,6 +33,7 @@
 use SMF\Routable;
 use SMF\Sapi;
 use SMF\SecurityToken;
+use SMF\TemplateEngine;
 use SMF\Theme;
 use SMF\Url;
 use SMF\User;
@@ -1592,26 +1593,48 @@ public static function getFileVersions(array &$versionOptions): array
 		}
 
 		foreach ($directories as $type => $dirname) {
+			$files = [];
+
 			$this_dir = dir($dirname);
 
 			while ($entry = $this_dir->read()) {
 				if (str_ends_with($entry, 'template.php') && !is_dir($dirname . '/' . $entry)) {
-					// Read the first 768 bytes from the file.... enough for the header.
-					$fp = fopen($dirname . '/' . $entry, 'rb');
-					$header = fread($fp, 768);
-					fclose($fp);
+					$files[$entry] = $dirname . '/' . $entry;
+				}
+			}
+			$this_dir->close();
 
-					// Look for the version comment in the file header.
-					if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
-						$version_info[$type][$entry] = $match[1];
-					}
-					// It wasn't found, but the file was... show a '??'.
-					else {
-						$version_info[$type][$entry] = '??';
+			// The Plates templates are named by their path in the theme, since every template has a main.php.
+			if (is_dir($dirname . '/' . TemplateEngine::DIRECTORY)) {
+				$plates_dir = new \RecursiveIteratorIterator(
+					new \RecursiveDirectoryIterator(
+						$dirname . '/' . TemplateEngine::DIRECTORY,
+						\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS,
+					),
+				);
+
+				foreach ($plates_dir as $path => $file) {
+					if ($file->isFile() && $file->getExtension() === 'php' && $file->getFilename() !== 'index.php') {
+						$files[substr($path, \strlen($dirname) + 1)] = $path;
 					}
 				}
 			}
-			$this_dir->close();
+
+			foreach ($files as $entry => $path) {
+				// Read the first 768 bytes from the file.... enough for the header.
+				$fp = fopen($path, 'rb');
+				$header = fread($fp, 768);
+				fclose($fp);
+
+				// Look for the version comment in the file header.
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info[$type][$entry] = $match[1];
+				}
+				// It wasn't found, but the file was... show a '??'.
+				else {
+					$version_info[$type][$entry] = '??';
+				}
+			}
 		}
 
 		// Load up all the files in the default language directory and sort by language.
diff --git a/Sources/Actions/Admin/Permissions.php b/Sources/Actions/Admin/Permissions.php
index 58a1128cdda..6648331a026 100644
--- a/Sources/Actions/Admin/Permissions.php
+++ b/Sources/Actions/Admin/Permissions.php
@@ -1082,7 +1082,7 @@ public static function theme_inline_permissions(string $permission): void
 		Utils::$context['current_permission'] = $permission;
 		Utils::$context['member_groups'] = Utils::$context[$permission];
 
-		template_inline_permissions();
+		Theme::loadSubTemplate('inline_permissions');
 	}
 
 	/**
diff --git a/Sources/Actions/Admin/Themes.php b/Sources/Actions/Admin/Themes.php
index a2d795e09fc..1b45a5db227 100644
--- a/Sources/Actions/Admin/Themes.php
+++ b/Sources/Actions/Admin/Themes.php
@@ -27,6 +27,7 @@
 use SMF\PackageManager\{PackageUtils, XmlArray};
 use SMF\Sapi;
 use SMF\SecurityToken;
+use SMF\TemplateEngine;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
@@ -365,7 +366,7 @@ public function setOptions(): void
 
 			// There has to be a Settings template!
 			foreach (Utils::$context['themes'] as $k => $v) {
-				if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members']))) {
+				if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && !is_dir($v['theme_dir'] . '/' . TemplateEngine::DIRECTORY . '/Settings') && empty($v['num_members']))) {
 					unset(Utils::$context['themes'][$k]);
 				}
 			}
@@ -769,8 +770,8 @@ public function setSettings(): void
 		// Load the variants separately...
 		Theme::$current->settings['theme_variants'] = [];
 
-		if (file_exists(Theme::$current->settings['theme_dir'] . '/index.template.php')) {
-			$file_contents = implode('', file(Theme::$current->settings['theme_dir'] . '/index.template.php'));
+		if (($init_file = Theme::templateInitFile(Theme::$current->settings['theme_dir'])) !== null) {
+			$file_contents = implode('', file($init_file));
 
 			if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
 				eval('use SMF\\Theme; global $settings; ' . $matches[0]);
@@ -1055,7 +1056,7 @@ public function edit(): ?string
 
 			foreach (Utils::$context['themes'] as $key => $theme) {
 				// There has to be a Settings template!
-				if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css')) {
+				if (Theme::templateInitFile($theme['theme_dir']) === null && !file_exists($theme['theme_dir'] . '/css/index.css')) {
 					unset(Utils::$context['themes'][$key]);
 				} else {
 					Utils::$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
@@ -1075,7 +1076,7 @@ public function edit(): ?string
 		Utils::$context['theme_id'] = $currentTheme['id'];
 		Utils::$context['browse_title'] = Lang::getTxt('themeadmin_browsing_theme', $currentTheme, file: 'Themes');
 
-		if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
+		if (Theme::templateInitFile($currentTheme['theme_dir']) === null && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
 			ErrorHandler::fatalLang('theme_edit_missing', false);
 		}
 
@@ -1275,6 +1276,17 @@ public function copy(): void
 		if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0) {
 			User::$me->checkSession('get');
 
+			// A Plates template is a directory of sub-templates, and is copied whole.
+			if (is_dir(Theme::$current->settings['default_theme_dir'] . '/' . TemplateEngine::DIRECTORY . '/' . $_REQUEST['template'])) {
+				if (!$this->canCopyPlatesTemplate($theme['theme_dir'])) {
+					ErrorHandler::fatalLang('no_access', false);
+				}
+
+				$this->copyPlatesTemplate($_REQUEST['template'], $theme['theme_dir']);
+
+				Utils::redirectexit('action=admin;area=theme;th=' . Utils::$context['theme_id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=copy');
+			}
+
 			if (file_exists(Theme::$current->settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php')) {
 				$filename = Theme::$current->settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
 			} else {
@@ -1318,12 +1330,24 @@ public function copy(): void
 		$templates = [];
 		$lang_files = [];
 
+		$plates_dir = Theme::$current->settings['default_theme_dir'] . '/' . TemplateEngine::DIRECTORY;
+		$plates_templates = [];
+
 		foreach (new \DirectoryIterator(Theme::$current->settings['default_theme_dir']) as $fileInfo) {
 			if (str_ends_with($fileInfo->getFilename(), '.template.php')) {
 				$templates[] = substr($fileInfo->getFilename(), 0, -13);
 			}
 		}
 
+		if (is_dir($plates_dir)) {
+			foreach (new \DirectoryIterator($plates_dir) as $fileInfo) {
+				if ($fileInfo->isDir() && !$fileInfo->isDot()) {
+					$templates[] = $fileInfo->getFilename();
+					$plates_templates[] = $fileInfo->getFilename();
+				}
+			}
+		}
+
 		if (is_dir(Theme::$current->settings['default_theme_dir'] . '/languages')) {
 			foreach (new \DirectoryIterator(Theme::$current->settings['default_theme_dir'] . '/languages') as $langDir) {
 				if (!is_dir($langDir->getPathname()) || $langDir->getFilename()[0] == '.') {
@@ -1346,6 +1370,17 @@ public function copy(): void
 		Utils::$context['available_templates'] = [];
 
 		foreach ($templates as $template) {
+			if (\in_array($template, $plates_templates)) {
+				Utils::$context['available_templates'][$template] = [
+					'filename' => TemplateEngine::DIRECTORY . '/' . $template . '/',
+					'value' => $template,
+					'already_exists' => is_dir($theme['theme_dir'] . '/' . TemplateEngine::DIRECTORY . '/' . $template),
+					'can_copy' => $this->canCopyPlatesTemplate($theme['theme_dir']),
+				];
+
+				continue;
+			}
+
 			Utils::$context['available_templates'][$template] = [
 				'filename' => $template . '.template.php',
 				'value' => $template,
@@ -1370,7 +1405,7 @@ public function copy(): void
 		foreach (new \DirectoryIterator($theme['theme_dir']) as $fileInfo) {
 			$theme_basename = substr($fileInfo->getFilename(), 0, -13);
 
-			if (str_ends_with($fileInfo->getFilename(), '.template.php') && isset(Utils::$context['available_templates'][$theme_basename])) {
+			if (str_ends_with($fileInfo->getFilename(), '.template.php') && isset(Utils::$context['available_templates'][$theme_basename]) && !\in_array($theme_basename, $plates_templates)) {
 				Utils::$context['available_templates'][$theme_basename]['already_exists'] = true;
 				Utils::$context['available_templates'][$theme_basename]['can_copy'] = is_writable($theme['theme_dir'] . '/' . $theme_basename);
 			}
@@ -1554,7 +1589,6 @@ protected function installCopy(): array
 		// Copy over the default non-theme files.
 		$to_copy = [
 			'/index.php',
-			'/index.template.php',
 			'/css/admin.css',
 			'/css/calendar.css',
 			'/css/calendar.rtl.css',
@@ -1571,6 +1605,9 @@ protected function installCopy(): array
 			Utils::makeWritable(Utils::$context['to_install']['theme_dir'] . $file, '0777');
 		}
 
+		// And the index template, which holds the layout and the theme's settings.
+		$this->copyPlatesTemplate('index', Utils::$context['to_install']['theme_dir']);
+
 		// And now the entire images directory!
 		PackageUtils::copytree(Theme::$current->settings['default_theme_dir'] . '/images', Utils::$context['to_install']['theme_dir'] . '/images');
 		PackageUtils::flushCache();
@@ -2204,6 +2241,54 @@ protected function deltree(string $path): bool
 		return @rmdir($path);
 	}
 
+	/**
+	 * Checks whether the default theme's Plates templates can be copied into a theme.
+	 *
+	 * @param string $theme_dir The directory of the theme to copy them into.
+	 * @return bool Whether they can be.
+	 */
+	protected function canCopyPlatesTemplate(string $theme_dir): bool
+	{
+		// Copying the default theme's templates onto themselves would empty them.
+		if (realpath($theme_dir) === realpath(Theme::$current->settings['default_theme_dir'])) {
+			return false;
+		}
+
+		$target = $theme_dir . '/' . TemplateEngine::DIRECTORY;
+
+		return is_dir($target) ? is_writable($target) : is_writable($theme_dir);
+	}
+
+	/**
+	 * Copies one of the default theme's Plates templates into a theme.
+	 *
+	 * Every sub-template is copied, overwriting any the theme already has.
+	 * The theme only needs to keep the ones it changes, since the rest are
+	 * found in the default theme anyway.
+	 *
+	 * @param string $template The name of the template, such as 'Stats'.
+	 * @param string $theme_dir The directory of the theme to copy it into.
+	 */
+	protected function copyPlatesTemplate(string $template, string $theme_dir): void
+	{
+		$source = Theme::$current->settings['default_theme_dir'] . '/' . TemplateEngine::DIRECTORY;
+		$target = $theme_dir . '/' . TemplateEngine::DIRECTORY;
+
+		// Each new directory gets the index.php that keeps it from being listed.
+		foreach ([$target, $target . '/' . $template] as $dir) {
+			if (!is_dir($dir)) {
+				mkdir($dir);
+				copy($source . '/index.php', $dir . '/index.php');
+			}
+		}
+
+		foreach (new \DirectoryIterator($source . '/' . $template) as $fileInfo) {
+			if ($fileInfo->isFile() && $fileInfo->getExtension() === 'php') {
+				copy($fileInfo->getPathname(), $target . '/' . $template . '/' . $fileInfo->getFilename());
+			}
+		}
+	}
+
 	/**
 	 * Generates a list of files in a given directory.
 	 *
diff --git a/Sources/Actions/Moderation/WatchedUsers.php b/Sources/Actions/Moderation/WatchedUsers.php
index 5458c93adb6..3582b5d7f28 100644
--- a/Sources/Actions/Moderation/WatchedUsers.php
+++ b/Sources/Actions/Moderation/WatchedUsers.php
@@ -24,6 +24,7 @@
 use SMF\Menu;
 use SMF\Msg;
 use SMF\Parser;
+use SMF\TemplateEngine;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
@@ -229,7 +230,7 @@ public function execute(): void
 				'posts' => [
 					'data' => [
 						'function' => function ($post) {
-							return template_user_watch_post_callback($post);
+							return TemplateEngine::get()->fetchSubTemplate('user_watch_post_callback', ['post' => $post]);
 						},
 						'class' => 'unique',
 					],
diff --git a/Sources/Actions/ThemeChooser.php b/Sources/Actions/ThemeChooser.php
index b442f3f824c..73d7556efca 100644
--- a/Sources/Actions/ThemeChooser.php
+++ b/Sources/Actions/ThemeChooser.php
@@ -284,8 +284,8 @@ public function execute(): void
 			// Are there any variants?
 			Utils::$context['available_themes'][$id_theme]['variants'] = [];
 
-			if (file_exists($theme_data['theme_dir'] . '/index.template.php') && (empty($theme_data['disable_user_variant']) || User::$me->allowedTo('admin_forum'))) {
-				$file_contents = implode('', file($theme_data['theme_dir'] . '/index.template.php'));
+			if (($init_file = Theme::templateInitFile($theme_data['theme_dir'])) !== null && (empty($theme_data['disable_user_variant']) || User::$me->allowedTo('admin_forum'))) {
+				$file_contents = implode('', file($init_file));
 
 				if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
 					Theme::$current->settings['theme_variants'] = [];
diff --git a/Sources/ServerSideIncludes.php b/Sources/ServerSideIncludes.php
index 87e22bca887..978cf418ff2 100644
--- a/Sources/ServerSideIncludes.php
+++ b/Sources/ServerSideIncludes.php
@@ -534,7 +534,7 @@ public static function menubar(string $output_method = 'echo'): ?array
 		}
 
 		if ($output_method == 'echo') {
-			template_menu();
+			Theme::loadSubTemplate('menu');
 
 			return null;
 		}
diff --git a/Sources/TemplateEngine.php b/Sources/TemplateEngine.php
new file mode 100644
index 00000000000..b2b8dcb9af9
--- /dev/null
+++ b/Sources/TemplateEngine.php
@@ -0,0 +1,383 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF;
+
+use League\Plates\Engine;
+use League\Plates\Template\Theme as PlatesTheme;
+
+/**
+ * Renders the templates that are written for Plates.
+ *
+ * A theme keeps its Plates templates in its templates directory, with one
+ * directory per template and one file per sub-template. So the 'main'
+ * sub-template of the Stats template is templates/Stats/main.php, and it is
+ * what Theme::loadTemplate('Stats') followed by Theme::loadSubTemplate('main')
+ * renders.
+ *
+ * Templates that have not been written for Plates yet are still the
+ * *.template.php files holding template_*() functions, and both kinds can be
+ * loaded side by side. A theme can override a single Plates sub-template by
+ * holding a file of the same name: each file is looked for in the current
+ * theme, then the base theme, then the default theme.
+ */
+class TemplateEngine
+{
+	/*****************
+	 * Class constants
+	 *****************/
+
+	/**
+	 * @var string
+	 *
+	 * The directory in a theme that holds its Plates templates.
+	 */
+	public const DIRECTORY = 'templates';
+
+	/*******************
+	 * Public properties
+	 *******************/
+
+	/**
+	 * @var array
+	 *
+	 * The template directories the engine looks in, in the order it looks.
+	 */
+	public array $dirs = [];
+
+	/**
+	 * @var array
+	 *
+	 * The templates loaded so far, in the order they were loaded. Keys are
+	 * template names. Values are null for a Plates template, or the file
+	 * holding the template_*() functions of one that is not.
+	 */
+	public array $loaded = [];
+
+	/*********************
+	 * Internal properties
+	 *********************/
+
+	/**
+	 * @var Engine
+	 *
+	 * The Plates engine that finds and renders the templates.
+	 */
+	protected Engine $engine;
+
+	/****************************
+	 * Internal static properties
+	 ****************************/
+
+	/**
+	 * @var self
+	 *
+	 * The engine for the current theme.
+	 */
+	protected static self $instance;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Constructor.
+	 *
+	 * @param array $dirs The template directories to look in, in the order to
+	 *    look in them, as in Theme::$current->settings['template_dirs'].
+	 */
+	public function __construct(array $dirs)
+	{
+		$this->setDirs($dirs);
+	}
+
+	/**
+	 * Changes the directories the engine looks in.
+	 *
+	 * The templates that were loaded stay loaded.
+	 *
+	 * @param array $dirs The template directories to look in, in the order to
+	 *    look in them.
+	 */
+	public function setDirs(array $dirs): void
+	{
+		$this->dirs = array_values(array_unique($dirs));
+
+		// Before a theme is loaded there is nowhere to look, and Plates refuses an empty hierarchy.
+		if ($this->dirs === []) {
+			unset($this->engine);
+
+			return;
+		}
+
+		// Plates wants the hierarchy from the bottom up, and a name for each level.
+		$themes = [];
+
+		foreach (array_reverse($this->dirs) as $dir) {
+			$themes[] = PlatesTheme::new($dir . '/' . self::DIRECTORY, $dir);
+		}
+
+		$this->engine = Engine::fromTheme(PlatesTheme::hierarchy($themes));
+
+		// So that a template can call another sub-template without knowing
+		// whether it is a Plates template or a template_*() function.
+		$this->engine->registerFunction(
+			'subTemplate',
+			function (string $name, array $params = []): void {
+				if (!$this->renderSubTemplate($name, $params)) {
+					throw new \Error('Call to undefined sub-template ' . $name);
+				}
+			},
+		);
+		$this->engine->registerFunction('hasSubTemplate', $this->hasSubTemplate(...));
+		$this->engine->registerFunction('fetchSubTemplate', $this->fetchSubTemplate(...));
+	}
+
+	/**
+	 * Checks whether a template directory holds a template written for Plates.
+	 *
+	 * @param string $dir A template directory.
+	 * @param string $template The name of a template, such as 'Stats'.
+	 * @return bool Whether $dir holds a Plates version of $template.
+	 */
+	public function isPlatesTemplate(string $dir, string $template): bool
+	{
+		return is_dir($dir . '/' . self::DIRECTORY . '/' . $template);
+	}
+
+	/**
+	 * Records that a template has been loaded.
+	 *
+	 * @param string $template The name of the template.
+	 * @param ?string $file The file holding the template's template_*()
+	 *    functions, or null if it is a Plates template.
+	 */
+	public function addLoaded(string $template, ?string $file = null): void
+	{
+		// Loading a template again makes it the last one loaded.
+		unset($this->loaded[$template]);
+
+		$this->loaded[$template] = $file;
+
+		// Templates that others call by name get functions of that name.
+		if ($file === null) {
+			self::defineFunctions($template);
+		}
+	}
+
+	/**
+	 * Finds the Plates template that renders a sub-template.
+	 *
+	 * The templates loaded last are searched first. A template_*() function
+	 * defined by a template loaded after every Plates template that has the
+	 * sub-template wins, so that the most recent loadTemplate() call decides
+	 * which one runs whatever kind of template it loaded.
+	 *
+	 * @param string $sub_template The name of the sub-template, such as 'main'.
+	 * @return ?string The Plates name of the template, such as 'Stats/main',
+	 *    or null if the sub-template is not one of the loaded Plates templates.
+	 */
+	public function find(string $sub_template): ?string
+	{
+		// Every directory has an index.php to stop it being listed, which is not a sub-template.
+		if ($sub_template === 'index') {
+			return null;
+		}
+
+		$function = 'template_' . $sub_template;
+
+		foreach (array_reverse($this->loaded) as $template => $file) {
+			if ($file === null) {
+				if ($this->exists($template . '/' . $sub_template)) {
+					return $template . '/' . $sub_template;
+				}
+			} elseif (\function_exists($function) && realpath((new \ReflectionFunction($function))->getFileName()) === realpath($file)) {
+				return null;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Checks whether a Plates template exists in any of the directories.
+	 *
+	 * @param string $name The Plates name of the template, such as 'Stats/main'.
+	 * @return bool Whether the template exists.
+	 */
+	public function exists(string $name): bool
+	{
+		// Engine::exists() does not use the theme hierarchy, but Template::exists() does.
+		return isset($this->engine) && $this->engine->make($name)->exists();
+	}
+
+	/**
+	 * Gets the file that a Plates template will be rendered from.
+	 *
+	 * @param string $name The Plates name of the template, such as 'Stats/main'.
+	 * @return ?string The path to the file, or null if there is no such template.
+	 */
+	public function path(string $name): ?string
+	{
+		return $this->exists($name) ? $this->engine->make($name)->path() : null;
+	}
+
+	/**
+	 * Renders a Plates template.
+	 *
+	 * @param string $name The Plates name of the template, such as 'Stats/main'.
+	 * @param array $data Variables to make available to the template.
+	 * @return string The rendered template.
+	 */
+	public function render(string $name, array $data = []): string
+	{
+		return $this->engine->render($name, $data);
+	}
+
+	/**
+	 * Outputs a sub-template of any loaded template, whichever kind it is.
+	 *
+	 * @param string $name The name of the sub-template, such as 'button_strip'.
+	 * @param array $params Its parameters. A Plates template receives them as
+	 *    variables, so they must be named. A template_*() function receives
+	 *    them as arguments, named or in order.
+	 * @return bool Whether there was such a sub-template.
+	 */
+	public function renderSubTemplate(string $name, array $params = []): bool
+	{
+		$plates_template = $this->find($name);
+
+		if ($plates_template !== null) {
+			echo $this->render($plates_template, $params);
+
+			return true;
+		}
+
+		if (\is_callable('template_' . $name)) {
+			\call_user_func_array('template_' . $name, $this->argumentsFor('template_' . $name, $params));
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets what a sub-template of any loaded template outputs, as a string.
+	 *
+	 * Some template_*() functions return their HTML rather than output it,
+	 * for a caller that needs it as a value. What such a function returns
+	 * is included along with anything it outputs, so a caller gets the same
+	 * string whether the sub-template is a Plates template or a function.
+	 *
+	 * @param string $name The name of the sub-template, such as 'quickbuttons'.
+	 * @param array $params Its parameters, as for renderSubTemplate().
+	 * @throws \Error if there is no such sub-template.
+	 * @return string What it output, and what it returned if that was a string.
+	 */
+	public function fetchSubTemplate(string $name, array $params = []): string
+	{
+		$plates_template = $this->find($name);
+
+		if ($plates_template !== null) {
+			return $this->render($plates_template, $params);
+		}
+
+		if (!\is_callable('template_' . $name)) {
+			throw new \Error('Call to undefined sub-template ' . $name);
+		}
+
+		ob_start();
+
+		$returned = \call_user_func_array('template_' . $name, $this->argumentsFor('template_' . $name, $params));
+
+		return ob_get_clean() . (\is_string($returned) ? $returned : '');
+	}
+
+	/**
+	 * Checks whether any loaded template has a sub-template, of either kind.
+	 *
+	 * @param string $name The name of the sub-template, such as 'button_strip'.
+	 * @return bool Whether it does.
+	 */
+	public function hasSubTemplate(string $name): bool
+	{
+		return $this->find($name) !== null || \function_exists('template_' . $name);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	/**
+	 * Gets the engine for the current theme.
+	 *
+	 * @return self The engine, looking in the current theme's template
+	 *    directories.
+	 */
+	public static function get(): self
+	{
+		$dirs = Theme::$current->settings['template_dirs'] ?? [];
+
+		if (!isset(self::$instance)) {
+			self::$instance = new self($dirs);
+		} elseif (self::$instance->dirs !== array_values(array_unique($dirs))) {
+			self::$instance->setDirs($dirs);
+		}
+
+		return self::$instance;
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	/**
+	 * Gets the arguments to call a template_*() function with.
+	 *
+	 * Parameters are named for the sake of Plates templates, but a function
+	 * a mod or theme provides may call them something else. Named arguments
+	 * it does not know would be an error, so those are passed in order.
+	 *
+	 * @param string $function The name of the function.
+	 * @param array $params The parameters, named or in order.
+	 * @return array The arguments.
+	 */
+	protected function argumentsFor(string $function, array $params): array
+	{
+		if (array_is_list($params)) {
+			return $params;
+		}
+
+		$names = array_map(fn($param) => $param->getName(), (new \ReflectionFunction($function))->getParameters());
+
+		return array_diff(array_keys($params), $names) === [] ? $params : array_values($params);
+	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * Defines the template_*() functions that other templates call by name,
+	 * for a template that is now a Plates template.
+	 *
+	 * @param string $template The name of the template that was loaded.
+	 */
+	protected static function defineFunctions(string $template): void
+	{
+		include __DIR__ . '/TemplateFunctions.php';
+	}
+}
diff --git a/Sources/TemplateFunctions.php b/Sources/TemplateFunctions.php
new file mode 100644
index 00000000000..d0ceb319331
--- /dev/null
+++ b/Sources/TemplateFunctions.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Backward compatibility file.
+ *
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+/*
+ * The functions that templates call on each other by name.
+ *
+ * Mods and themes call template_button_strip(), template_show_list() and a few
+ * more directly, from templates of their own. Once the template that held one
+ * of them is a Plates template, the function is defined here instead, and
+ * renders the Plates template.
+ *
+ * TemplateEngine::addLoaded() includes this file each time it loads a Plates
+ * template, with $template set to its name, so that only that template's
+ * functions are defined, and only then. A function that already exists is
+ * left alone: a theme that still has the template as a *.template.php file
+ * has its own.
+ */
+
+use SMF\TemplateEngine;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+switch ($template) {
+	case 'index':
+		if (!function_exists('template_button_strip')) {
+			function template_button_strip($button_strip, $direction = '', $strip_options = [])
+			{
+				echo TemplateEngine::get()->render('index/button_strip', get_defined_vars());
+			}
+		}
+
+		if (!function_exists('template_quickbuttons')) {
+			function template_quickbuttons($list_items, $list_class = null, $output_method = 'echo')
+			{
+				$html = TemplateEngine::get()->render('index/quickbuttons', get_defined_vars());
+
+				// There are a few spots where the result needs to be returned.
+				if ($output_method != 'echo') {
+					return $html;
+				}
+
+				echo $html;
+			}
+		}
+
+		if (!function_exists('template_menu')) {
+			function template_menu()
+			{
+				echo TemplateEngine::get()->render('index/menu');
+			}
+		}
+
+		if (!function_exists('theme_linktree')) {
+			function theme_linktree($force_show = false)
+			{
+				echo TemplateEngine::get()->render('index/linktree', get_defined_vars());
+			}
+		}
+
+		break;
+
+	case 'GenericList':
+		if (!function_exists('template_show_list')) {
+			function template_show_list($list_id = null)
+			{
+				echo TemplateEngine::get()->render('GenericList/show_list', get_defined_vars());
+			}
+		}
+
+		break;
+
+	case 'GenericControls':
+		if (!function_exists('template_control_richedit')) {
+			function template_control_richedit(string $editor_id, bool|string|null $smiley_container = null, bool|string|null $bbc_container = null): void
+			{
+				echo TemplateEngine::get()->render('GenericControls/control_richedit', get_defined_vars());
+			}
+		}
+
+		if (!function_exists('template_control_richedit_buttons')) {
+			function template_control_richedit_buttons(string $editor_id): void
+			{
+				echo TemplateEngine::get()->render('GenericControls/control_richedit_buttons', get_defined_vars());
+			}
+		}
+
+		// Always returns null: a Plates template cannot say whether there is more to show one item at a time.
+		if (!function_exists('template_control_verification')) {
+			function template_control_verification(int|string $verify_id, string $display_type = 'all', bool $reset = false): ?bool
+			{
+				echo TemplateEngine::get()->render('GenericControls/control_verification', get_defined_vars());
+
+				return null;
+			}
+		}
+
+		break;
+
+	// An XML response has no index template, so nothing it shows can call these for real.
+	case 'Xml':
+		if (!function_exists('template_button_strip')) {
+			function template_button_strip($button_strip, $direction = 'top', $strip_options = []) {}
+		}
+
+		if (!function_exists('template_menu')) {
+			function template_menu() {}
+		}
+
+		if (!function_exists('theme_linktree')) {
+			function theme_linktree() {}
+		}
+
+		break;
+}
diff --git a/Sources/Theme.php b/Sources/Theme.php
index c2e35ed3ad8..23e124d542a 100644
--- a/Sources/Theme.php
+++ b/Sources/Theme.php
@@ -380,12 +380,35 @@ public static function loadEssential(bool $load_lang = true): void
 		Utils::$context['theme_loaded'] = true;
 	}
 
+	/**
+	 * Gets the file that holds a theme's own template_init().
+	 *
+	 * The admin panel reads a theme's variants out of it without running it.
+	 *
+	 * @param string $theme_dir The theme's directory.
+	 * @return ?string The file, or null if the theme has none of its own.
+	 */
+	public static function templateInitFile(string $theme_dir): ?string
+	{
+		foreach (['/index.template.php', '/' . TemplateEngine::DIRECTORY . '/index/init.php'] as $file) {
+			if (file_exists($theme_dir . $file)) {
+				return $theme_dir . $file;
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Loads a template - if the theme doesn't include it, uses the default.
 	 *
 	 *  - Loads a template file with the name template_name from the current,
 	 *    default, or base theme.
 	 *
+	 *  - A template written for Plates is a directory of that name in the
+	 *    theme's templates directory, which is not included here: its
+	 *    sub-templates are found by name when they are rendered.
+	 *
 	 *  - Detects a wrong default theme directory and tries to work around it.
 	 *
 	 * @uses self::templateInclude() to include the file.
@@ -413,18 +436,29 @@ public static function loadTemplate(string|bool $template_name, array|string $st
 		}
 
 		$loaded = false;
+		$engine = TemplateEngine::get();
 
+		// The first theme to have the template decides whether it is written for Plates.
 		foreach (self::$current->settings['template_dirs'] as $template_dir) {
+			if ($engine->isPlatesTemplate($template_dir, $template_name)) {
+				$loaded = true;
+				$engine->addLoaded($template_name);
+				$debug_source = basename($template_dir) . '/' . TemplateEngine::DIRECTORY . '/' . $template_name;
+				break;
+			}
+
 			if (file_exists($template_dir . '/' . $template_name . '.template.php')) {
 				$loaded = true;
 				self::templateInclude($template_dir . '/' . $template_name . '.template.php', true);
+				$engine->addLoaded($template_name, $template_dir . '/' . $template_name . '.template.php');
+				$debug_source = basename($template_dir) . '/' . $template_name . '.template.php';
 				break;
 			}
 		}
 
 		if ($loaded) {
 			if (DebugUtils::isDebugEnabled()) {
-				DebugUtils::addDebugSource('templates', basename($template_dir) . '/' . $template_name . '.template.php');
+				DebugUtils::addDebugSource('templates', $debug_source);
 			}
 
 			// If they have specified an initialization function for this template, go ahead and call it now.
@@ -496,11 +530,15 @@ public static function loadSubTemplates(): void
 	 * on the `$fatal` parameter.
 	 *
 	 * - Sub-template function names must follow the format `template_{name}`.
+	 * - A loaded Plates template renders the sub-template instead if it has a
+	 *   file named `{name}.php`. See TemplateEngine::find() for which one wins
+	 *   when both kinds have it.
 	 * - When debugging is enabled, administrators can see markers after each loaded sub-template.
 	 *
 	 * @param string|array $sub_template_name The name of the sub-template to load.
 	 *                                         If an array is provided, the first element is the name,
 	 *                                         and the second element is an array of parameters to pass to the sub-template.
+	 *                                         A Plates template receives them as variables named by the array's keys.
 	 * @param bool|string $fatal              Specifies error handling behavior:
 	 *                                        - `false` (default): Logs and handles the error.
 	 *                                        - `true`: Dies with an error message.
@@ -515,19 +553,10 @@ public static function loadSubTemplate(string|array $sub_template_name, bool|str
 			DebugUtils::addDebugSource('sub_templates', $template_name);
 		}
 
-		// Determine the template function name and any associated parameters.
-		if (\is_array($sub_template_name)) {
-			$theme_function = 'template_' . $sub_template_name[0];
-			$function_params = $sub_template_name[1] ?? [];
-		} else {
-			$theme_function = 'template_' . $sub_template_name;
-			$function_params = [];
-		}
+		$function_params = \is_array($sub_template_name) ? $sub_template_name[1] ?? [] : [];
 
-		// Attempt to call the sub-template function.
-		if (\is_callable($theme_function)) {
-			\call_user_func_array($theme_function, $function_params);
-		} else {
+		// Attempt to render the sub-template, whichever kind of template has it.
+		if (!TemplateEngine::get()->renderSubTemplate($template_name, $function_params)) {
 			// Handle errors based on the $fatal parameter.
 			if ($fatal === false) {
 				ErrorHandler::fatalLang(
diff --git a/Themes/default/Admin.template.php b/Themes/default/Admin.template.php
deleted file mode 100644
index bcb651fe190..00000000000
--- a/Themes/default/Admin.template.php
+++ /dev/null
@@ -1,1687 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Actions\Admin\Permissions;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * This is the administration center home.
- */
-function template_admin()
-{
-	// Is there an update available?
-	echo '
-						<div id="update_section"></div>';
-
-	echo '
-						<div id="admin_main_section">';
-
-	// Display the "live news" from simplemachines.org.
-	echo '
-							<div id="live_news" class="floatleft">
-								<div class="cat_bar">
-									<h3 class="catbg">
-										<a href="', Config::$scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('live', file: 'Admin'), '
-									</h3>
-								</div>
-								<div class="windowbg nopadding">
-									<div id="smfAnnouncements">', Lang::getTxt('smf_news_cant_connect', file: 'Admin'), '</div>
-								</div>
-							</div>';
-
-	// Show the user version information from their server.
-	echo '
-							<div id="support_info" class="floatright">
-								<div class="cat_bar">
-									<h3 class="catbg">
-										<a href="', Config::$scripturl, '?action=admin;area=credits">', Lang::getTxt('support_title', file: 'Admin'), '</a>
-									</h3>
-								</div>
-								<div class="windowbg nopadding">
-									<div id="version_details" class="padding">
-										<strong>', Lang::getTxt('support_versions', file: 'Admin'), '</strong>
-										<ul>
-											<li>', Lang::getTxt('support_versions_forum', ['version' => Utils::$context['forum_version']], file: 'Admin'), '</li>
-											<li>', Lang::getTxt('support_versions_current', ['version' => '??'], file: 'Admin'), '</li>
-											<li>', Utils::$context['can_admin'] ? '<a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=routine;activity=version">' . Lang::getTxt('version_check_more', file: 'Admin') . '</a>' : '', '</li>
-										</ul>';
-
-	// Display all the members who can administrate the forum.
-	echo '
-										<br>
-										', Lang::getTxt('administrators', ['list' => Lang::sentenceList(Utils::$context['administrators'])], file: 'Admin');
-
-	// If we have lots of admins... don't show them all.
-	if (!empty(Utils::$context['more_admins_link'])) {
-		echo '
-										(', Utils::$context['more_admins_link'], ')';
-	}
-
-	echo '
-									</div><!-- #version_details -->
-								</div><!-- .windowbg -->
-							</div><!-- #support_info -->
-						</div><!-- #admin_main_section -->';
-
-	foreach (Utils::$context[Utils::$context['admin_menu_name']]['sections'] as $area_id => $area) {
-		echo '
-						<fieldset id="group_', $area_id, '" class="windowbg admin_group">
-							<legend>', $area['title'], '</legend>';
-
-		foreach ($area['areas'] as $item_id => $item) {
-			// No point showing the 'home' page here, we're already on it!
-			if ($area_id == 'forum' && $item_id == 'index') {
-				continue;
-			}
-
-			$url = $item['url'] ?? Config::$scripturl . '?action=admin;area=' . $item_id . (!empty(Utils::$context[Utils::$context['admin_menu_name']]['extra_parameters']) ? Utils::$context[Utils::$context['admin_menu_name']]['extra_parameters'] : '');
-
-			if (!empty($item['icon_file'])) {
-				echo '
-							<a href="', $url, '" class="admin_group', !empty($item['inactive']) ? ' inactive' : '', '"><img class="large_admin_menu_icon_file" src="', $item['icon_file'], '" alt="">', $item['label'], '</a>';
-			} else {
-			echo '
-							<a href="', $url, '"><span class="large_', $item['icon_class'], !empty($item['inactive']) ? ' inactive' : '', '"></span>', $item['label'], '</a>';
-			}
-		}
-
-		echo '
-						</fieldset>';
-	}
-
-	// The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization.
-	if (empty(Config::$modSettings['disable_smf_js'])) {
-		echo '
-					<script src="', Config::$scripturl, '?action=viewsmfile;filename=current-version.js"></script>
-					<script src="', Config::$scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
-	}
-
-	// This sets the announcements and current versions themselves ;).
-	echo '
-					<script>
-						var oAdminIndex = new smf_AdminIndex({
-
-							bLoadAnnouncements: true,
-							sAnnouncementTemplate: ', Utils::escapeJavaScript('
-								<dl>
-									%content%
-								</dl>
-							'), ',
-							sAnnouncementMessageTemplate: ', Utils::escapeJavaScript('
-								<dt><a href="%href%">%subject%</a>%time%</dt>
-								<dd>
-									%message%
-								</dd>
-							'), ',
-							sAnnouncementContainerId: \'smfAnnouncements\',
-
-							bLoadVersions: true,
-							sSmfVersionContainerId: \'smfVersion\',
-							sYourVersionContainerId: \'yourVersion\',
-							sVersionOutdatedTemplate: ', Utils::escapeJavaScript('
-								<span class="alert">%currentVersion%</span>
-							'), ',
-
-							bLoadUpdateNotification: true,
-							sUpdateNotificationContainerId: \'update_section\',
-							sUpdateNotificationDefaultTitle: ', Utils::escapeJavaScript(Lang::getTxt('update_available', file: 'Admin')), ',
-							sUpdateNotificationDefaultMessage: ', Utils::escapeJavaScript(Lang::getTxt('update_message', file: 'Admin')), ',
-							sUpdateNotificationTemplate: ', Utils::escapeJavaScript('
-								<h3 id="update_title">
-									%title%
-								</h3>
-								<div id="update_message" class="smalltext">
-									%message%
-								</div>
-							'), ',
-							sUpdateNotificationLink: smf_scripturl + ', Utils::escapeJavaScript('?action=admin;area=packages;pgdownload;auto;package=%package%;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '
-						});
-					</script>';
-}
-
-/**
- * Show some support information and credits to those who helped make this.
- */
-function template_credits()
-{
-	// Show the user version information from their server.
-	echo '
-					<div class="roundframe noup">
-						<div class="title_bar">
-							<h3 class="titlebg">
-								', Lang::getTxt('support_title', file: 'Admin'), '
-							</h3>
-						</div>
-						<div class="padding">
-							<img src="', Theme::$current->settings['images_url'], '/smflogo.svg" class="floatright" alt="">
-							<strong>', Lang::getTxt('support_versions', file: 'Admin'), '</strong>
-							<ul>
-								<li>', Lang::getTxt('support_versions_forum', ['version' => Utils::$context['forum_version']], file: 'Admin'), Utils::$context['can_admin'] ? ' <a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=routine;activity=version">' . Lang::getTxt('version_check_more', file: 'Admin') . '</a>' : '', '</li>
-								<li>', Lang::getTxt('support_versions_current', ['version' => '??'], file: 'Admin'), '</li>
-							</ul>';
-
-	// Display all the variables we have server information for.
-	foreach (Utils::$context['current_versions'] as $version) {
-		echo '
-								', $version['title'], ':
-							<em>', $version['version'], '</em>';
-
-		// more details for this item, show them a link
-		if (Utils::$context['can_admin'] && isset($version['more'])) {
-			echo
-							' <a href="', Config::$scripturl, $version['more'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('version_check_more', file: 'Admin'), '</a>';
-		}
-		echo '
-							<br>';
-	}
-
-	echo '
-						</div><!-- .padding -->';
-
-	// Point the admin to common support resources.
-	echo '
-						<div id="support_resources" class="title_bar">
-							<h3 class="titlebg">
-								', Lang::getTxt('support_resources', file: 'Admin'), '
-							</h3>
-						</div>
-						<div class="padding">
-							<p>', Lang::getTxt('support_resources_p1', file: 'Admin'), '</p>
-							<p>', Lang::getTxt('support_resources_p2', file: 'Admin'), '</p>
-						</div>';
-
-	// The most important part - the credits :P.
-	echo '
-						<div id="credits_sections" class="title_bar">
-							<h3 class="titlebg">
-								', Lang::getTxt('admin_credits', file: 'Admin'), '
-							</h3>
-						</div>
-						<div id="support_credits_list" class="padding">';
-
-	foreach (Utils::$context['credits'] as $section) {
-		if (isset($section['pretext'])) {
-			echo '
-							<p>', $section['pretext'], '</p>
-							<hr>';
-		}
-
-		echo '
-							<dl>';
-
-		foreach ($section['groups'] as $group) {
-			if (isset($group['title'])) {
-				echo '
-								<dt>
-									<strong>', $group['title'], '</strong>
-								</dt>';
-			}
-
-			echo '
-								<dd>', implode(', ', $group['members']), '</dd>';
-		}
-
-		echo '
-							</dl>';
-
-		if (isset($section['posttext'])) {
-			echo '
-							<hr>
-							<p>', $section['posttext'], '</p>';
-		}
-	}
-
-	echo '
-						</div><!-- .padding -->
-					</div><!-- #support_credits -->';
-
-	// This makes all the support information available to the support script...
-	echo '
-					<script>
-						var smfSupportVersions = {};
-
-						smfSupportVersions.forum = "', Utils::$context['forum_version'], '";';
-
-	// Don't worry, none of this is logged, it's just used to give information that might be of use.
-	foreach (Utils::$context['current_versions'] as $variable => $version) {
-		echo '
-						smfSupportVersions.', $variable, ' = "', $version['version'], '";';
-	}
-
-	// Now we just have to include the script and wait ;).
-	echo '
-					</script>
-					<script src="', Config::$scripturl, '?action=viewsmfile;filename=current-version.js"></script>
-					<script src="', Config::$scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
-
-	// This sets the latest support stuff.
-	echo '
-					<script>
-						function smfCurrentVersion()
-						{
-							var smfVer, yourVer;
-
-							if (!window.smfVersion)
-								return;
-
-							smfVer = document.getElementById("smfVersion");
-							yourVer = document.getElementById("yourVersion");
-
-							setInnerHTML(smfVer, window.smfVersion);
-
-							var currentVersion = getInnerHTML(yourVer);
-							if (currentVersion != window.smfVersion)
-								setInnerHTML(yourVer, "<span class=\"alert\">" + currentVersion + "</span>");
-						}
-						addLoadEvent(smfCurrentVersion)
-					</script>';
-}
-
-/**
- * Displays information about file versions installed, and compares them to current version.
- */
-function template_view_versions()
-{
-	echo '
-						<div id="section_header" class="cat_bar">
-							<h3 class="catbg">
-								', Lang::getTxt('admin_version_check', file: 'Admin'), '
-							</h3>
-						</div>
-						<div class="information">', Lang::getTxt('version_check_desc', file: 'Admin'), '</div>
-						<div id="versions">
-							<table class="table_grid">
-								<thead>
-									<tr class="title_bar">
-										<th class="half_table">
-											<strong>', Lang::getTxt('admin_smffile', file: 'Admin'), '</strong>
-										</th>
-										<th class="quarter_table">
-											<strong>', Lang::getTxt('dvc_your', file: 'Admin'), '</strong>
-										</th>
-										<th class="quarter_table">
-											<strong>', Lang::getTxt('dvc_current', file: 'Admin'), '</strong>
-										</th>
-									</tr>
-								</thead>
-								<tbody>';
-
-	// The current version of the core SMF package.
-	echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', Lang::getTxt('admin_smfpackage', file: 'Admin'), '
-										</td>
-										<td class="quarter_table">
-											<em id="yourSMF">', Utils::$context['forum_version'], '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentSMF">??</em>
-										</td>
-									</tr>';
-
-	// Now list all the root file versions, starting with the overall version (if all match!).
-	echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Root-link">', Lang::getTxt('dvc_root', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourRoot">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentRoot">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Root" class="table_grid">
-								<tbody>';
-
-	// Loop through every source file displaying its version - using javascript.
-	foreach (Utils::$context['root_versions'] as $filename => $version) {
-		echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourRoot', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentRoot', $filename, '">??</em>
-										</td>
-									</tr>';
-	}
-
-	// Now list all the source file versions, starting with the overall version (if all match!).
-	echo '
-								</tbody>
-							</table>
-							<table id="Root" class="table_grid">
-								<tbody>
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Sources-link">', Lang::getTxt('dvc_sources', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourSources">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentSources">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Sources" class="table_grid">
-								<tbody>';
-
-	// Loop through every source file displaying its version - using javascript.
-	foreach (Utils::$context['file_versions'] as $filename => $version) {
-		echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourSources', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentSources', $filename, '">??</em>
-										</td>
-									</tr>';
-	}
-
-	// Default template files.
-	echo '
-								</tbody>
-							</table>
-
-							<table class="table_grid">
-								<tbody>
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Default-link">', Lang::getTxt('dvc_default', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourDefault">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentDefault">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Default" class="table_grid">
-								<tbody>';
-
-	foreach (Utils::$context['default_template_versions'] as $filename => $version) {
-		echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourDefault', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentDefault', $filename, '">??</em>
-										</td>
-									</tr>';
-	}
-
-	// Now the language files...
-	echo '
-								</tbody>
-							</table>
-
-							<table class="table_grid">
-								<tbody>
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Languages-link">', Lang::getTxt('dvc_languages', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourLanguages">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentLanguages">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Languages" class="table_grid">
-								<tbody>';
-
-	foreach (Utils::$context['default_language_versions'] as $language => $files) {
-		foreach ($files as $filename => $version) {
-			echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											<em>', $language, '</em>/', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourLanguage_', $language, '_', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentLanguage_', $language, '_', $filename, '">??</em>
-										</td>
-									</tr>';
-		}
-	}
-
-	echo '
-								</tbody>
-							</table>';
-
-	// Display the version information for the currently selected theme - if it is not the default one.
-	if (!empty(Utils::$context['template_versions'])) {
-		echo '
-							<table class="table_grid">
-								<tbody>
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Templates-link">', Lang::getTxt('dvc_templates', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourTemplates">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentTemplates">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Templates" class="table_grid">
-								<tbody>';
-
-		foreach (Utils::$context['template_versions'] as $filename => $version) {
-			echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourTemplates', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentTemplates', $filename, '">??</em>
-										</td>
-									</tr>';
-		}
-
-		echo '
-								</tbody>
-							</table>';
-	}
-
-	// Display the tasks files version.
-	if (!empty(Utils::$context['tasks_versions'])) {
-		echo '
-							<table class="table_grid">
-								<tbody>
-									<tr class="windowbg">
-										<td class="half_table">
-											<a href="#" id="Tasks-link">', Lang::getTxt('dvc_tasks', file: 'Admin'), '</a>
-										</td>
-										<td class="quarter_table">
-											<em id="yourTasks">??</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentTasks">??</em>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-
-							<table id="Tasks" class="table_grid">
-								<tbody>';
-
-		foreach (Utils::$context['tasks_versions'] as $filename => $version) {
-			echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											', $filename, '
-										</td>
-										<td class="quarter_table">
-											<em id="yourTasks', $filename, '">', $version, '</em>
-										</td>
-										<td class="quarter_table">
-											<em id="currentTasks', $filename, '">??</em>
-										</td>
-									</tr>';
-		}
-
-		echo '
-								</tbody>
-							</table>';
-	}
-
-	echo '
-						</div><!-- #versions -->';
-
-	/* Below is the hefty javascript for this. Upon opening the page it checks the current file versions with ones
-	   held at simplemachines.org and works out if they are up to date. If they aren't it colors that files number
-	   red. It also contains the function, swapOption, that toggles showing the detailed information for each of the
-	   file categories. (sources, languages, and templates.) */
-	echo '
-					<script src="', Config::$scripturl, '?action=viewsmfile;filename=detailed-version.js"></script>
-					<script>
-						var oViewVersions = new smf_ViewVersions({
-							aKnownLanguages: [
-								\'', implode('\',
-								\'', Utils::$context['default_known_languages']), '\'
-							],
-							oSectionContainerIds: {
-								Sources: \'Sources\',
-								Default: \'Default\',
-								Languages: \'Languages\',
-								Templates: \'Templates\',
-								Tasks: \'Tasks\'
-							}
-						});
-					</script>';
-
-}
-
-/**
- * Form for stopping people using naughty words, etc.
- */
-function template_edit_censored()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-					<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	// First section is for adding/removing words from the censored list.
-	echo '
-						<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=postsettings;sa=censor" method="post" accept-charset="UTF-8">
-							<div id="section_header" class="cat_bar">
-								<h3 class="catbg">
-									', Lang::getTxt('admin_censored_words', file: 'Admin'), '
-								</h3>
-							</div>
-							<div class="windowbg">
-								<p>', Lang::getTxt('admin_censored_where', file: 'Admin'), '</p>';
-
-	// Show text boxes for censoring [bad   ] => [good  ].
-	foreach (Utils::$context['censored_words'] as $vulgar => $proper) {
-		echo '
-								<div class="block">
-									<input type="text" name="censor_vulgar[]" value="', $vulgar, '" size="30"> =&gt; <input type="text" name="censor_proper[]" value="', $proper, '" size="30">
-								</div>';
-	}
-
-	// Now provide a way to censor more words.
-	echo '
-								<div class="block">
-									<input type="text" name="censor_vulgar[]" size="30"> =&gt; <input type="text" name="censor_proper[]" size="30">
-								</div>
-								<div id="moreCensoredWords"></div>
-								<div class="block hidden" id="moreCensoredWords_link">
-									<a class="button" href="#" onclick="addNewWord(); return false;">', Lang::getTxt('censor_clickadd', file: 'Admin'), '</a><br>
-								</div>
-								<script>
-									document.getElementById("moreCensoredWords_link").classList.remove(\'hidden\');
-								</script>
-								<hr>
-								<dl class="settings">
-									<dt>
-										<strong><label for="allow_no_censored">', Lang::getTxt('allow_no_censored', file: 'Themes'), '</label></strong>
-									</dt>
-									<dd>
-										<input type="checkbox" name="allow_no_censored" value="1" id="allow_no_censored"', empty(Config::$modSettings['allow_no_censored']) ? '' : ' checked', '>
-									</dd>
-									<dt>
-										<strong><label for="censorWholeWord_check">', Lang::getTxt('censor_whole_words', file: 'Admin'), '</label></strong>
-									</dt>
-									<dd>
-										<input type="checkbox" name="censorWholeWord" value="1" id="censorWholeWord_check"', empty(Config::$modSettings['censorWholeWord']) ? '' : ' checked', '>
-									</dd>
-									<dt>
-										<strong><label for="censorIgnoreCase_check">', Lang::getTxt('censor_case', file: 'Admin'), '</label></strong>
-									</dt>
-									<dd>
-										<input type="checkbox" name="censorIgnoreCase" value="1" id="censorIgnoreCase_check"', empty(Config::$modSettings['censorIgnoreCase']) ? '' : ' checked', '>
-									</dd>
-									<dt>
-										<a id="spoofdetector_censor_help" href="', Config::$scripturl, '?action=helpadmin;help=spoofdetector_censor" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-										<strong><label for="spoofdetector_censor_check">', Lang::getTxt('spoofdetector_censor', file: 'Admin'), '</label></strong>
-										<br>
-										<span class="smalltext">', Lang::getTxt('spoofdetector_censor_desc', file: 'Admin'), '</span>
-
-									</dt>
-									<dd>
-										<input type="checkbox" name="spoofdetector_censor" value="1" id="spoofdetector_censor_check"', empty(Config::$modSettings['spoofdetector_censor']) ? '' : ' checked', '>
-									</dd>
-								</dl>
-								<input type="submit" name="save_censor" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-							</div><!-- .windowbg -->';
-
-	// This table lets you test out your filters by typing in rude words and seeing what comes out.
-	echo '
-							<div class="cat_bar">
-								<h3 class="catbg">
-									', Lang::getTxt('censor_test', file: 'Admin'), '
-								</h3>
-							</div>
-							<div class="windowbg">
-								<p class="centertext">
-									<input type="text" name="censortest" value="', empty(Utils::$context['censor_test']) ? '' : Utils::$context['censor_test'], '">
-									<input type="submit" value="', Lang::getTxt('censor_test_save', file: 'Admin'), '" class="button">
-								</p>
-							</div>
-
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-							<input type="hidden" name="', Utils::$context['admin-censor_token_var'], '" value="', Utils::$context['admin-censor_token'], '">
-						</form>';
-}
-
-/**
- * This is the page shown when we've temporarily paused things such as during maintenance tasks, sending newsletters, etc.
- */
-function template_not_done()
-{
-	echo '
-						<div id="section_header" class="cat_bar">
-							<h3 class="catbg">
-								', Lang::getTxt('not_done_title', file: 'Admin'), '
-							</h3>
-						</div>
-						<div class="windowbg">
-							', Lang::getTxt('not_done_reason', file: 'Admin');
-
-	if (!empty(Utils::$context['continue_percent'])) {
-		echo '
-							<div class="progress_bar">
-								<span>', Utils::$context['continue_percent'], '%</span>
-								<div class="bar" style="width: ', Utils::$context['continue_percent'], '%;"></div>
-							</div>';
-	}
-
-	if (!empty(Utils::$context['substep_enabled'])) {
-		echo '
-							<div class="progress_bar progress_blue">
-								<span>', Utils::$context['substep_title'], ' (', Utils::$context['substep_continue_percent'], '%)</span>
-								<div class="bar" style="width: ', Utils::$context['substep_continue_percent'], '%;"></div>
-							</div>';
-	}
-
-	echo '
-							<form action="', Config::$scripturl, Utils::$context['continue_get_data'], '" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">';
-
-	// Do we have a token?
-	if (isset(Utils::$context['not_done_token'], Utils::$context[Utils::$context['not_done_token'] . '_token'],Utils::$context[Utils::$context['not_done_token'] . '_token_var'])) {
-		echo '
-							<input type="hidden" name="', Utils::$context[Utils::$context['not_done_token'] . '_token_var'], '" value="', Utils::$context[Utils::$context['not_done_token'] . '_token'], '">';
-	}
-
-	echo '
-								<input type="submit" name="cont" value="', Lang::getTxt('not_done_continue', file: 'Admin'), '" class="button">
-								', Utils::$context['continue_post_data'], '
-							</form>
-						</div><!-- .windowbg -->
-					<script>
-						doAutoSubmit(', Utils::$context['continue_countdown'], ', "', Lang::getTxt('not_done_continue', file: 'Admin'), '");
-					</script>';
-}
-
-/**
- * Template for showing settings (Of any kind really!)
- */
-function template_show_settings()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-					<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	} elseif (!empty(Utils::$context['saved_failed'])) {
-		echo '
-					<div class="errorbox">', Lang::getTxt('settings_not_saved', ['reason' => Utils::$context['saved_failed']], file: 'Admin'), '</div>';
-	}
-
-	if (!empty(Utils::$context['settings_pre_javascript'])) {
-		echo '
-					<script>', Utils::$context['settings_pre_javascript'], '</script>';
-	}
-
-	if (!empty(Utils::$context['settings_insert_above'])) {
-		echo Utils::$context['settings_insert_above'];
-	}
-
-	echo '
-						<form id="admin_form_wrapper" action="', Utils::$context['post_url'], '" method="post" accept-charset="UTF-8"', !empty(Utils::$context['force_form_onsubmit']) ? ' onsubmit="' . Utils::$context['force_form_onsubmit'] . '"' : '', '>';
-
-	// Is there a custom title?
-	if (isset(Utils::$context['settings_title'])) {
-		echo '
-							<div class="cat_bar">
-								<h3 class="catbg">', Utils::$context['settings_title'], '</h3>
-							</div>';
-	}
-
-	// Have we got a message to display?
-	if (!empty(Utils::$context['settings_message'])) {
-		$tag = !empty(Utils::$context['settings_message']['tag']) ? Utils::$context['settings_message']['tag'] : 'span';
-
-		echo '
-							<div class="information noup">';
-
-		if (is_array(Utils::$context['settings_message'])) {
-			echo '
-								<', $tag, !empty(Utils::$context['settings_message']['class']) ? ' class="' . Utils::$context['settings_message']['class'] . '"' : '', '>
-									', Utils::$context['settings_message']['label'], '
-								</', $tag, '>';
-		} else {
-		echo Utils::$context['settings_message'];
-		}
-
-		echo '
-							</div>';
-	}
-
-	// Filter out any redundant separators before we start the loop
-	Utils::$context['config_vars'] = array_filter(
-		Utils::$context['config_vars'],
-		function ($v) {
-			static $config_vars, $prev;
-
-			$at_start = is_null($config_vars);
-			$config_vars = $at_start ? Utils::$context['config_vars'] : $config_vars;
-
-			$next = next($config_vars);
-			$at_end = key($config_vars) === null;
-
-			if (!$at_start && !$at_end) {
-				$div_types = ['title', 'desc'];
-				$at_start = isset($prev['type']) && in_array($prev['type'], $div_types);
-				$at_end = isset($next['type']) && in_array($next['type'], $div_types);
-			}
-
-			$prev = $v;
-
-			return ($v === '' && ($at_start || $at_end || $v === $next)) ? false : true;
-		},
-	);
-
-	// Now actually loop through all the variables.
-	$is_open = false;
-
-	foreach (Utils::$context['config_vars'] as $config_var) {
-		// Is it a title or a description?
-		if (is_array($config_var) && ($config_var['type'] == 'title' || $config_var['type'] == 'desc')) {
-			// Not a list yet?
-			if ($is_open) {
-				$is_open = false;
-				echo '
-									</dl>
-							</div>';
-			}
-
-			// A title?
-			if ($config_var['type'] == 'title') {
-				echo '
-							<div class="cat_bar">
-								<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'catbg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>
-									', ($config_var['help'] ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : ''), '
-									', $config_var['label'], '
-								</h3>
-							</div>';
-			}
-			// A description?
-			else {
-				echo '
-							<div class="information noup">
-								', $config_var['label'], '
-							</div>';
-			}
-
-			continue;
-		}
-
-		// Not a list yet?
-		if (!$is_open) {
-			$is_open = true;
-			echo '
-							<div class="windowbg noup">
-								<dl class="settings">';
-		}
-
-		// Hang about? Are you pulling my leg - a callback?!
-		if (is_array($config_var) && $config_var['type'] == 'callback') {
-			if (function_exists('template_callback_' . $config_var['name'])) {
-				call_user_func('template_callback_' . $config_var['name']);
-			}
-
-			continue;
-		}
-
-		if (is_array($config_var)) {
-			// First off, is this a span like a message?
-			if (in_array($config_var['type'], ['message', 'warning'])) {
-				echo '
-									<dd', $config_var['type'] == 'warning' ? ' class="alert"' : '', (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : ''), '>
-										', $config_var['label'], '
-									</dd>';
-			}
-			// Otherwise it's an input box of some kind.
-			else {
-				echo '
-									<dt', is_array($config_var) && !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>';
-
-				// Some quick helpers...
-				$javascript = $config_var['javascript'];
-				$disabled = !empty($config_var['disabled']) ? ' disabled' : '';
-				$subtext = !empty($config_var['subtext']) ? '<br><span class="smalltext"> ' . $config_var['subtext'] . '</span>' : '';
-				$placeholder = !empty($config_var['placeholder']) ? ' placeholder="' . $config_var['placeholder'] . '"' : '';
-
-				// Various HTML5 input types that are basically enhanced textboxes
-				$text_types = ['color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'];
-
-				// Show the [?] button.
-				if ($config_var['help']) {
-					echo '
-										<a id="setting_', $config_var['name'], '_help" href="', Config::$scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ';
-				}
-
-				echo '
-										<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label', ($config_var['type'] == 'boards' || $config_var['type'] == 'permissions' ? '' : ' for="' . $config_var['name'] . '"'), '>', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . Lang::getTxt('admin_confirm_password', file: 'Admin') . '</em>' : ''), '</span>
-									</dt>
-									<dd', (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : ''), '>',
-										$config_var['preinput'];
-
-				// Show a check box.
-				if ($config_var['type'] == 'check') {
-					echo '
-										<input type="checkbox"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '"', ($config_var['value'] ? ' checked' : ''), ' value="1">';
-				}
-				// Escape (via htmlspecialchars.) the text box.
-				elseif ($config_var['type'] == 'password') {
-					echo '
-										<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;"><br>
-										<input type="password" disabled id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '>';
-				}
-				// Show a selection box.
-				elseif ($config_var['type'] == 'select') {
-					if ($config_var['name'] === 'default_timezone') {
-						template_timezone_select($config_var['name'], $config_var['value'] ?? '', (int) $disabled);
-					} else {
-						echo '
-										<select name="', $config_var['name'], '" id="', $config_var['name'], '" ', $javascript, $disabled, (!empty($config_var['multiple']) ? ' multiple' : ''), ' size="', $config_var['size'], '">';
-
-						foreach ($config_var['data'] as $option) {
-							echo '
-											<option value="', $option[0], '"', (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : ''), '>', $option[1], '</option>';
-						}
-
-						echo '
-										</select>';
-					}
-				}
-
-				// Show a color box
-				elseif ($config_var['type'] == 'color') {
-					echo '
-										<input name="', $config_var['name'], '" id="', $config_var['name'], '" data-coloris value="', $config_var['value'], '">';
-				}
-
-				// List of boards? This requires getBoardList() having been run and the results in Utils::$context['board_list'].
-				elseif ($config_var['type'] == 'boards') {
-					$first = true;
-					echo '
-										<a href="#" class="board_selector">[ ', Lang::getTxt('select_boards_from_list', file: 'ManageSettings'), ' ]</a>
-										<fieldset>
-											<legend class="board_selector">
-												<a href="#">', Lang::getTxt('select_boards_from_list', file: 'ManageSettings'), '</a>
-											</legend>';
-
-					foreach (Utils::$context['board_list'] as $id_cat => $cat) {
-						if (!$first) {
-							echo '
-											<hr>';
-						}
-						echo '
-											<strong>', $cat['name'], '</strong>
-											<ul>';
-
-						foreach ($cat['boards'] as $id_board => $brd) {
-							echo '
-												<li><label><input type="checkbox" name="', $config_var['name'], '[', $brd['id'], ']" value="1"', in_array($brd['id'], $config_var['value']) ? ' checked' : '', '> ', $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '', $brd['name'], '</label></li>';
-						}
-
-						echo '
-											</ul>';
-						$first = false;
-					}
-					echo '
-											<hr />
-											<input type="checkbox" onclick="invertAll(this, this.form, \'' . $config_var['name'] . '[\');">
-											<span>', Lang::getTxt('check_all', file: 'General'), '</span>
-										</fieldset>';
-				}
-				// Text area?
-				elseif ($config_var['type'] == 'large_text') {
-					echo '
-										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
-				}
-				// Permission group?
-				elseif ($config_var['type'] == 'permissions') {
-					Permissions::theme_inline_permissions($config_var['name']);
-				}
-
-				// BBC selection?
-				elseif ($config_var['type'] == 'bbc') {
-					echo '
-										<fieldset id="', $config_var['name'], '">
-											<legend>', Utils::$context['bbc_sections'][$config_var['name']]['title'], '</legend>
-											<ul>';
-
-					foreach (Utils::$context['bbc_sections'][$config_var['name']]['columns'] as $bbcColumn) {
-						foreach ($bbcColumn as $bbcTag) {
-							echo '
-												<li class="list_bbc floatleft">
-													<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', !in_array($bbcTag['tag'], Utils::$context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '', in_array($bbcTag['tag'], Utils::$context['bbc_sections'][$config_var['name']]['forced']) ? ' disabled' : '', '> <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' <a href="' . Config::$scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);" class="main_icons help"></a>' : '', '
-												</li>';
-						}
-					}
-					echo '					</ul>
-											<input type="checkbox" id="bbc_', $config_var['name'], '_select_all" onclick="invertAll(this, this.form, \'', $config_var['name'], '_enabledTags\');"', Utils::$context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '', '> <label for="bbc_', $config_var['name'], '_select_all"><em>', Lang::getTxt('enabled_bbc_select_all', file: 'Admin'), '</em></label>
-										</fieldset>';
-				}
-				// A simple message?
-				elseif ($config_var['type'] == 'var_message') {
-					echo '
-										<div', !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '', '>
-											', $config_var['var_message'], '
-										</div>';
-				}
-				// Assume it must be a text box
-				else {
-					// Figure out the exact type - use "number" for "float" and "int".
-					$type = in_array($config_var['type'], $text_types) ? $config_var['type'] : ($config_var['type'] == 'int' || $config_var['type'] == 'float' ? 'number' : 'text');
-
-					// Extra options for float/int values - how much to decrease/increase by, the min value and the max value
-					// The step - only set if incrementing by something other than 1 for int or 0.1 for float
-					$step = isset($config_var['step']) ? ' step="' . $config_var['step'] . '"' : ($config_var['type'] == 'float' ? ' step="0.1"' : '');
-
-					// Minimum allowed value for this setting. SMF forces a default of 0 if not specified in the settings
-					$min = isset($config_var['min']) ? ' min="' . $config_var['min'] . '"' : '';
-
-					// Maximum allowed value for this setting.
-					$max = isset($config_var['max']) ? ' max="' . $config_var['max'] . '"' : '';
-
-					// Some input fields allow multiple.
-					$multiple = $type === 'email' && (!empty($config_var['multiple']) ? ' multiple' : '');
-
-					echo '
-										<input type="', $type, '"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '" value="', $config_var['value'], '"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '', $min . $max . $step, $multiple, $placeholder, '>';
-				}
-
-				echo isset($config_var['postinput']) ? '
-											' . $config_var['postinput'] : '', '
-									</dd>';
-			}
-		} else {
-			// Just show a separator.
-			if ($config_var == '') {
-				echo '
-								</dl>
-								<hr>
-								<dl class="settings">';
-			} else {
-			echo '
-									<dt>
-										<strong>' . $config_var . '</strong>
-									</dt>
-									<dd></dd>';
-			}
-		}
-	}
-
-	if ($is_open) {
-		echo '
-								</dl>';
-	}
-
-	if (empty(Utils::$context['settings_save_dont_show'])) {
-		echo '
-								<input type="submit" value="', Lang::getTxt('save', file: 'General'), '"', (!empty(Utils::$context['save_disabled']) ? ' disabled' : ''), (!empty(Utils::$context['settings_save_onclick']) ? ' onclick="' . Utils::$context['settings_save_onclick'] . '"' : ''), ' class="button">';
-	}
-
-	if ($is_open) {
-		echo '
-							</div><!-- .windowbg -->';
-	}
-
-	// At least one token has to be used!
-	if (isset(Utils::$context['admin-ssc_token'])) {
-		echo '
-							<input type="hidden" name="', Utils::$context['admin-ssc_token_var'], '" value="', Utils::$context['admin-ssc_token'], '">';
-	}
-
-	if (isset(Utils::$context['admin-dbsc_token'])) {
-		echo '
-							<input type="hidden" name="', Utils::$context['admin-dbsc_token_var'], '" value="', Utils::$context['admin-dbsc_token'], '">';
-	}
-
-	if (isset(Utils::$context['admin-mp_token'])) {
-		echo '
-							<input type="hidden" name="', Utils::$context['admin-mp_token_var'], '" value="', Utils::$context['admin-mp_token'], '">';
-	}
-
-	echo '
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						</form>';
-
-	if (!empty(Utils::$context['settings_post_javascript'])) {
-		echo '
-					<script>
-						', Utils::$context['settings_post_javascript'], '
-					</script>';
-	}
-
-	if (!empty(Utils::$context['settings_insert_below'])) {
-		echo Utils::$context['settings_insert_below'];
-	}
-
-	// We may have added a board listing. If we did, we need to make it work.
-	Theme::addInlineJavascript('
-		$("legend.board_selector").closest("fieldset").hide();
-		$("a.board_selector").click(function(e) {
-			e.preventDefault();
-			$(this).hide().next("fieldset").show();
-		});
-		$("fieldset legend.board_selector a").click(function(e) {
-			e.preventDefault();
-			$(this).closest("fieldset").hide().prev("a").show();
-		});
-	', true);
-}
-
-/**
- * Template for showing custom profile fields.
- */
-function template_show_custom_profile()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-					<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	// Standard fields.
-	template_show_list('standard_profile_fields');
-
-	echo '
-					<script>
-						var iNumChecks = document.forms.standardProfileFields.length;
-						for (var i = 0; i < iNumChecks; i++)
-							if (document.forms.standardProfileFields[i].id.indexOf(\'reg_\') == 0)
-								document.forms.standardProfileFields[i].disabled = document.forms.standardProfileFields[i].disabled || !document.getElementById(\'active_\' + document.forms.standardProfileFields[i].id.substr(4)).checked;
-					</script>
-					<br>';
-
-	// Custom fields.
-	template_show_list('custom_profile_fields');
-}
-
-/**
- * Template for editing a custom profile field
- */
-function template_edit_profile_field()
-{
-	// All the javascript for this page - quite a bit in script.js!
-	echo '
-					<script>
-						var startOptID = ', count(Utils::$context['field']['options']), ';
-					</script>';
-
-	// any errors messages to show?
-	if (isset($_GET['msg'])) {
-		if (Lang::txtExists('custom_option_' . $_GET['msg'], file: 'Errors')) {
-			echo '
-					<div class="errorbox">',
-						Lang::getTxt('custom_option_' . $_GET['msg'], file: 'Errors'), '
-					</div>';
-		}
-	}
-
-	echo '
-						<form action="', Config::$scripturl, '?action=admin;area=featuresettings;sa=profileedit;fid=', Utils::$context['fid'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-							<div id="section_header" class="cat_bar">
-								<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-							</div>
-							<div class="windowbg">
-								<fieldset>
-									<legend>', Lang::getTxt('custom_edit_general', file: 'ManageSettings'), '</legend>
-
-									<dl class="settings">
-										<dt>
-											<a id="field_name_help" href="', Config::$scripturl, '?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-											<strong><label for="field_name">', Lang::getTxt('custom_edit_name', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<input type="text" name="field_name" id="field_name" value="', Utils::$context['field']['name'], '" size="20" maxlength="40">
-										</dd>
-										<dt>
-											<a id="field_desc_help" href="', Config::$scripturl, '?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);" class="help">
-												<span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span>
-											</a>
-											<strong><label for="field_desc">', Lang::getTxt('custom_edit_desc', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<textarea name="field_desc" id="field_desc" rows="3" cols="40">', Utils::$context['field']['desc'], '</textarea>
-										</dd>
-										<dt>
-											<strong><label for="profile_area">', Lang::getTxt('custom_edit_profile', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_profile_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<select name="profile_area" id="profile_area">
-												<option value="none"', Utils::$context['field']['profile_area'] == 'none' ? ' selected' : '', '>', Lang::getTxt('custom_edit_profile_none', file: 'ManageSettings'), '</option>
-												<option value="account"', Utils::$context['field']['profile_area'] == 'account' ? ' selected' : '', '>', Lang::getTxt('account', file: 'General'), '</option>
-												<option value="forumprofile"', Utils::$context['field']['profile_area'] == 'forumprofile' ? ' selected' : '', '>', Lang::getTxt('forumprofile', file: 'General'), '</option>
-												<option value="theme"', Utils::$context['field']['profile_area'] == 'theme' ? ' selected' : '', '>', Lang::getTxt('theme', file: 'General'), '</option>
-											</select>
-										</dd>
-										<dt>
-											<a id="field_reg_require" href="', Config::$scripturl, '?action=helpadmin;help=field_reg_require" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-											<strong><label for="reg">', Lang::getTxt('custom_edit_registration', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<select name="reg" id="reg">
-												<option value="0"', Utils::$context['field']['reg'] == 0 ? ' selected' : '', '>', Lang::getTxt('custom_edit_registration_disable', file: 'ManageSettings'), '</option>
-												<option value="1"', Utils::$context['field']['reg'] == 1 ? ' selected' : '', '>', Lang::getTxt('custom_edit_registration_allow', file: 'ManageSettings'), '</option>
-												<option value="2"', Utils::$context['field']['reg'] == 2 ? ' selected' : '', '>', Lang::getTxt('custom_edit_registration_require', file: 'ManageSettings'), '</option>
-											</select>
-										</dd>
-										<dt>
-											<strong><label for="display">', Lang::getTxt('custom_edit_display', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<input type="checkbox" name="display" id="display"', Utils::$context['field']['display'] ? ' checked' : '', '>
-										</dd>
-										<dt>
-											<strong><label for="mlist">', Lang::getTxt('custom_edit_mlist', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<input type="checkbox" name="mlist" id="show_mlist"', Utils::$context['field']['mlist'] ? ' checked' : '', '>
-										</dd>
-										<dt>
-											<strong><label for="placement">', Lang::getTxt('custom_edit_placement', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<select name="placement" id="placement">';
-
-	foreach (Utils::$context['cust_profile_fields_placement'] as $order => $name) {
-		echo '
-												<option value="', $order, '"', Utils::$context['field']['placement'] == $order ? ' selected' : '', '>', Lang::getTxt('custom_profile_placement_' . $name, file: 'ManageSettings'), '</option>';
-	}
-
-	echo '
-											</select>
-										</dd>
-										<dt>
-											<a id="field_show_enclosed" href="', Config::$scripturl, '?action=helpadmin;help=field_show_enclosed" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-											<strong><label for="enclose">', Lang::getTxt('custom_edit_enclose', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_enclose_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<textarea name="enclose" id="enclose" rows="10" cols="50">', @Utils::$context['field']['enclose'], '</textarea>
-										</dd>
-									</dl>
-								</fieldset>
-								<fieldset>
-									<legend>', Lang::getTxt('custom_edit_input', file: 'ManageSettings'), '</legend>
-									<dl class="settings">
-										<dt>
-											<strong><label for="field_type">', Lang::getTxt('custom_edit_picktype', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<select name="field_type" id="field_type" onchange="updateInputBoxes();">';
-
-	foreach (['text', 'textarea', 'select', 'radio', 'check'] as $field_type) {
-		echo '
-												<option value="', $field_type, '"', Utils::$context['field']['type'] == $field_type ? ' selected' : '', '>', Lang::getTxt('custom_profile_type_' . $field_type, file: 'ManageSettings'), '</option>';
-	}
-
-	echo '
-											</select>
-										</dd>
-										<dt id="max_length_dt">
-											<strong><label for="max_length_dd">', Lang::getTxt('custom_edit_max_length', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_max_length_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<input type="text" name="max_length" id="max_length_dd" value="', Utils::$context['field']['max_length'], '" size="7" maxlength="6">
-										</dd>
-										<dt id="dimension_dt">
-											<strong><label for="dimension_dd">', Lang::getTxt('custom_edit_dimension', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd id="dimension_dd">
-											<strong>', Lang::getTxt('custom_edit_dimension_row', file: 'ManageSettings'), '</strong> <input type="text" name="rows" value="', Utils::$context['field']['rows'], '" size="5" maxlength="3">
-											<strong>', Lang::getTxt('custom_edit_dimension_col', file: 'ManageSettings'), '</strong> <input type="text" name="cols" value="', Utils::$context['field']['cols'], '" size="5" maxlength="3">
-										</dd>
-										<dt id="bbc_dt">
-											<strong><label for="bbc_dd">', Lang::getTxt('custom_edit_bbc', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<input type="checkbox" name="bbc" id="bbc_dd"', Utils::$context['field']['bbc'] ? ' checked' : '', '>
-										</dd>
-										<dt id="options_dt">
-											<a href="', Config::$scripturl, '?action=helpadmin;help=customoptions" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-											<strong><label for="options_dd">', Lang::getTxt('custom_edit_options', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_options_desc', file: 'ManageSettings'), '</span>
-											<br>
-											<span>', Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd id="options_dd">';
-
-	foreach (Utils::$context['field']['options'] as $k => $option) {
-		echo '
-											', $k == 0 ? '' : '<br>', '<input type="radio" name="default_select" value="', $k, '"', Utils::$context['field']['default_select'] == $option ? ' checked' : '', '><input type="text" name="select_option[', $k, ']" value="', $option, '">';
-	}
-
-	echo '
-											<span id="addopt"></span>
-											[<a href="" onclick="addOption(); return false;">', Lang::getTxt('custom_edit_options_more', file: 'ManageSettings'), '</a>]
-										</dd>
-										<dt id="default_dt">
-											<strong><label for="default_dd">', Lang::getTxt('custom_edit_default', file: 'ManageSettings'), '</label></strong>
-										</dt>
-										<dd>
-											<input type="checkbox" name="default_check" id="default_dd"', Utils::$context['field']['default_check'] ? ' checked' : '', '>
-										</dd>
-									</dl>
-								</fieldset>
-								<fieldset>
-									<legend>', Lang::getTxt('custom_edit_advanced', file: 'ManageSettings'), '</legend>
-									<dl class="settings">
-										<dt id="mask_dt">
-											<a id="custom_mask" href="', Config::$scripturl, '?action=helpadmin;help=custom_mask" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-											<strong><label for="mask">', Lang::getTxt('custom_edit_mask', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_mask_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<select name="mask" id="mask" onchange="updateInputBoxes();">
-												<option value="nohtml"', Utils::$context['field']['mask'] == 'nohtml' ? ' selected' : '', '>', Lang::getTxt('custom_edit_mask_nohtml', file: 'ManageSettings'), '</option>
-												<option value="email"', Utils::$context['field']['mask'] == 'email' ? ' selected' : '', '>', Lang::getTxt('custom_edit_mask_email', file: 'ManageSettings'), '</option>
-												<option value="number"', Utils::$context['field']['mask'] == 'number' ? ' selected' : '', '>', Lang::getTxt('custom_edit_mask_number', file: 'ManageSettings'), '</option>
-												<option value="regex"', str_starts_with(Utils::$context['field']['mask'], 'regex') ? ' selected' : '', '>', Lang::getTxt('custom_edit_mask_regex', file: 'ManageSettings'), '</option>
-											</select>
-											<br>
-											<span id="regex_div">
-												<input type="text" name="regex" value="', Utils::$context['field']['regex'], '" size="30">
-											</span>
-										</dd>
-										<dt>
-											<strong><label for="private">', Lang::getTxt('custom_edit_privacy', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_privacy_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<select name="private" id="private" onchange="updateInputBoxes();">
-												<option value="0"', Utils::$context['field']['private'] == 0 ? ' selected' : '', '>', Lang::getTxt('custom_edit_privacy_all', file: 'ManageSettings'), '</option>
-												<option value="1"', Utils::$context['field']['private'] == 1 ? ' selected' : '', '>', Lang::getTxt('custom_edit_privacy_see', file: 'ManageSettings'), '</option>
-												<option value="2"', Utils::$context['field']['private'] == 2 ? ' selected' : '', '>', Lang::getTxt('custom_edit_privacy_owner', file: 'ManageSettings'), '</option>
-												<option value="3"', Utils::$context['field']['private'] == 3 ? ' selected' : '', '>', Lang::getTxt('custom_edit_privacy_none', file: 'ManageSettings'), '</option>
-											</select>
-										</dd>
-										<dt id="can_search_dt">
-											<strong><label for="can_search_dd">', Lang::getTxt('custom_edit_can_search', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_can_search_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<input type="checkbox" name="can_search" id="can_search_dd"', Utils::$context['field']['can_search'] ? ' checked' : '', '>
-										</dd>
-										<dt>
-											<strong><label for="can_search_check">', Lang::getTxt('custom_edit_active', file: 'ManageSettings'), '</label></strong><br>
-											<span class="smalltext">', Lang::getTxt('custom_edit_active_desc', file: 'ManageSettings'), '</span>
-										</dt>
-										<dd>
-											<input type="checkbox" name="active" id="can_search_check"', Utils::$context['field']['active'] ? ' checked' : '', '>
-										</dd>
-									</dl>
-								</fieldset>
-								<input type="submit" name="save" value="', Lang::getTxt('save', file: 'General'), '" class="button">';
-
-	if (Utils::$context['fid']) {
-		echo '
-								<input type="submit" name="delete" value="', Lang::getTxt('delete', file: 'General'), '" data-confirm="', Lang::getTxt('custom_edit_delete_sure', file: 'ManageSettings'), '" class="button you_sure">';
-	}
-
-	echo '
-							</div><!-- .windowbg -->
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-							<input type="hidden" name="', Utils::$context['admin-ecp_token_var'], '" value="', Utils::$context['admin-ecp_token'], '">
-						</form>';
-
-	// Get the javascript bits right!
-	echo '
-					<script>
-						updateInputBoxes();
-					</script>';
-}
-
-/**
- * Results page for an admin search.
- */
-function template_admin_search_results()
-{
-	echo '
-						<div id="section_header" class="cat_bar">
-							<h3 class="catbg">
-								<span id="quick_search_results">
-									', Lang::getTxt('admin_search_results_desc', Utils::$context, file: 'Admin'), '
-								</span>
-							</h3>
-							', template_admin_quick_search(), '
-						</div><!-- #section_header -->
-						<div class="windowbg generic_list_wrapper">';
-
-	if (empty(Utils::$context['search_results'])) {
-		echo '
-							<p class="centertext">
-								<strong>', Lang::getTxt('admin_search_results_none', file: 'Admin'), '</strong>
-							</p>';
-	} else {
-		echo '
-							<ol class="search_results">';
-
-		foreach (Utils::$context['search_results'] as $result) {
-			// Is it a result from the online manual?
-			if (Utils::$context['search_type'] == 'online') {
-				echo '
-								<li>
-									<p>
-										<a href="', Utils::$context['doc_scripturl'], str_replace(' ', '_', $result['title']), '" target="_blank" rel="noopener"><strong>', $result['title'], '</strong></a>
-									</p>
-									<p class="double_height">
-										', $result['snippet'], '
-									</p>
-								</li>';
-			}
-			// Otherwise it's... not!
-			else {
-				echo '
-								<li>
-									<a href="', $result['url'], '"><strong>', $result['name'], '</strong></a> [', Lang::txtExists('admin_search_section_' . $result['type'], file: 'Admin') ? Lang::getTxt('admin_search_section_' . $result['type'], file: 'Admin') : $result['type'], ']';
-
-				if ($result['help']) {
-					echo '
-									<p class="double_height">', $result['help'], '</p>';
-				}
-
-				echo '
-								</li>';
-			}
-		}
-		echo '
-							</ol>';
-	}
-
-	echo '
-						</div><!-- .generic_list_wrapper -->';
-}
-
-/**
- * This little beauty shows questions and answer from the captcha type feature.
- */
-function template_callback_question_answer_list()
-{
-	foreach (Utils::$context['languages'] as $lang_id => $lang) {
-		$lang_id = strtr($lang_id, ['-utf8' => '']);
-		$lang['name'] = strtr($lang['name'], ['-utf8' => '']);
-
-		echo '
-						<dt id="qa_dt_', $lang_id, '" class="qa_link">
-							<a href="javascript:void(0);">[ ', $lang['name'], ' ]</a>
-						</dt>
-						<fieldset id="qa_fs_', $lang_id, '" class="qa_fieldset">
-							<legend><a href="javascript:void(0);">', $lang['name'], '</a></legend>
-							<dl class="settings">
-								<dt>
-									<strong>', Lang::getTxt('setup_verification_question', file: 'ManageSettings'), '</strong>
-								</dt>
-								<dd>
-									<strong>', Lang::getTxt('setup_verification_answer', file: 'ManageSettings'), '</strong>
-								</dd>';
-
-		if (!empty(Utils::$context['qa_by_lang'][$lang_id])) {
-			foreach (Utils::$context['qa_by_lang'][$lang_id] as $q_id) {
-				$question = Utils::$context['question_answers'][$q_id];
-
-				echo '
-								<dt>
-									<input type="text" name="question[', $lang_id, '][', $q_id, ']" value="', $question['question'], '" size="50" class="verification_question">
-								</dt>
-								<dd>';
-
-				foreach ($question['answers'] as $answer) {
-					echo '
-									<input type="text" name="answer[', $lang_id, '][', $q_id, '][]" value="', $answer, '" size="50" class="verification_answer">';
-				}
-
-				echo '
-									<div class="qa_add_answer"><a href="javascript:void(0);">[ ', Lang::getTxt('setup_verification_add_answer', file: 'ManageSettings'), ' ]</a></div>
-								</dd>';
-			}
-		}
-
-		echo '
-								<dt class="qa_add_question"><a href="javascript:void(0);">[ ', Lang::getTxt('setup_verification_add_more', file: 'ManageSettings'), ' ]</a></dt>
-							</dl>
-						</fieldset>';
-	}
-}
-
-/**
- * Repairing boards.
- */
-function template_repair_boards()
-{
-	echo '
-						<div id="section_header" class="cat_bar">
-							<h3 class="catbg">',
-								Utils::$context['error_search'] ? Lang::getTxt('errors_list', file: 'Admin') : Lang::getTxt('errors_fixing', file: 'Admin'), '
-							</h3>
-						</div>
-						<div class="windowbg">';
-
-	// Are we actually fixing them, or is this just a prompt?
-	if (Utils::$context['error_search']) {
-		if (!empty(Utils::$context['to_fix'])) {
-			echo '
-							', Lang::getTxt('errors_found', file: 'Admin'), '
-							<ul>';
-
-			foreach (Utils::$context['repair_errors'] as $error) {
-				echo '
-								<li>
-									', $error, '
-								</li>';
-			}
-
-			echo '
-							</ul>
-							<p>
-								', Lang::getTxt('errors_fix', file: 'Admin'), '
-							</p>
-							<p class="padding">
-								<strong><a href="', Config::$scripturl, '?action=admin;area=repairboards;fixErrors;', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';', Utils::$context['admin-repairboards_token_var'], '=', Utils::$context['admin-repairboards_token'], '">', Lang::getTxt('yes', file: 'General'), '</a> - <a href="', Config::$scripturl, '?action=admin;area=maintain">', Lang::getTxt('no', file: 'General'), '</a></strong>
-							</p>';
-		} else {
-		echo '
-							<p>', Lang::getTxt('maintain_no_errors', file: 'Admin'), '</p>
-							<p class="padding">
-								<a href="', Config::$scripturl, '?action=admin;area=maintain;sa=routine">', Lang::getTxt('maintain_return', file: 'ManageMaintenance'), '</a>
-							</p>';
-		}
-	} else {
-		if (!empty(Utils::$context['redirect_to_recount'])) {
-			echo '
-							<p>
-								', Lang::getTxt('errors_do_recount', file: 'Admin'), '
-							</p>
-							<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=routine;activity=recount" id="recount_form" method="post">
-								<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-								<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-								<input type="submit" name="recount" id="recount_now" value="', Lang::getTxt('errors_recount_now', file: 'Admin'), '">
-							</form>';
-		} else {
-			echo '
-							<p>', Lang::getTxt('errors_fixed', file: 'Admin'), '</p>
-							<p class="padding">
-								<a href="', Config::$scripturl, '?action=admin;area=maintain;sa=routine">', Lang::getTxt('maintain_return', file: 'ManageMaintenance'), '</a>
-							</p>';
-		}
-	}
-
-	echo '
-						</div><!-- .windowbg -->';
-
-	if (!empty(Utils::$context['redirect_to_recount'])) {
-		echo '
-					<script>
-						doAutoSubmit(5, "', Utils::escapeJavaScript(Lang::getTxt('errors_recount_now', file: 'Admin')), '", "recount_form", "recount");
-					</script>';
-	}
-}
-
-/**
- * Retrieves info from the php_info function, scrubs and preps it for display
- */
-function template_php_info()
-{
-	echo '
-					<div id="admin_form_wrapper">
-						<div id="section_header" class="cat_bar">
-							<h3 class="catbg">
-								', Lang::getTxt('phpinfo_settings', file: 'Admin'), '
-							</h3>
-						</div>';
-
-	// for each php info area
-	foreach (Utils::$context['pinfo'] as $area => $php_area) {
-		echo '
-						<table id="', str_replace(' ', '_', $area), '" class="table_grid">
-							<thead>
-								<tr class="title_bar">
-									<th class="equal_table" scope="col"></th>
-									<th class="centercol equal_table" scope="col"><strong>', $area, '</strong></th>
-									<th class="equal_table" scope="col"></th>
-								</tr>
-							</thead>
-							<tbody>';
-
-		$localmaster = true;
-
-		// and for each setting in this category
-		foreach ($php_area as $key => $setting) {
-			// start of a local / master setting (3 col)
-			if (is_array($setting)) {
-				if ($localmaster) {
-					// heading row for the settings section of this category's settings
-					echo '
-								<tr class="title_bar">
-									<td class="equal_table"><strong>', Lang::getTxt('phpinfo_itemsettings', file: 'Admin'), '</strong></td>
-									<td class="equal_table"><strong>', Lang::getTxt('phpinfo_localsettings', file: 'Admin'), '</strong></td>
-									<td class="equal_table"><strong>', Lang::getTxt('phpinfo_defaultsettings', file: 'Admin'), '</strong></td>
-								</tr>';
-
-					$localmaster = false;
-				}
-
-				echo '
-								<tr class="windowbg">
-									<td class="equal_table">', $key, '</td>';
-
-				foreach ($setting as $key_lm => $value) {
-					echo '
-									<td class="equal_table">', $value, '</td>';
-				}
-
-				echo '
-								</tr>';
-			}
-			// just a single setting (2 col)
-			else {
-				echo '
-								<tr class="windowbg">
-									<td class="equal_table">', $key, '</td>
-									<td colspan="2" class="word_break">', str_replace(',', ', ', $setting), '</td>
-								</tr>';
-			}
-		}
-		echo '
-							</tbody>
-						</table>
-						<br>';
-	}
-
-	echo '
-					</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * Content shown above the clean cache button
- */
-function template_clean_cache_button_above() {}
-
-/**
- * Content shown below the clean cache button?
- */
-function template_clean_cache_button_below()
-{
-	echo '
-					<div class="cat_bar">
-						<h3 class="catbg">', Lang::getTxt('maintain_cache', file: 'ManageMaintenance'), '</h3>
-					</div>
-					<div class="windowbg">
-						<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=routine;activity=cleancache" method="post" accept-charset="UTF-8">
-							<p>', Lang::getTxt('maintain_cache_info', file: 'ManageMaintenance'), '</p>
-							<span><input type="submit" value="', Lang::getTxt('maintain_run_now', file: 'ManageMaintenance'), '" class="button"></span>
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-							<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-						</form>
-					</div>';
-}
-
-/**
- * This shows the admin search form
- */
-function template_admin_quick_search()
-{
-	if (User::$me->is_admin) {
-		echo '
-								<form action="' . Config::$scripturl . '?action=admin;area=search" method="post" accept-charset="UTF-8" class="admin_search">
-									<span class="main_icons filter centericon"></span>
-									<input type="search" name="search_term" placeholder="', Lang::getTxt('admin_search', file: 'Admin'), '"', isset(Utils::$context['search_term']) ? ' value="' . Utils::$context['search_term'] . '"' : '','>
-									<select name="search_type">
-										<option value="internal"', (empty(Utils::$context['admin_preferences']['sb']) || Utils::$context['admin_preferences']['sb'] == 'internal' ? ' selected' : ''), '>', Lang::getTxt('admin_search_type_internal', file: 'Admin'), '</option>
-										<option value="member"', (!empty(Utils::$context['admin_preferences']['sb']) && Utils::$context['admin_preferences']['sb'] == 'member' ? ' selected' : ''), '>', Lang::getTxt('admin_search_type_member', file: 'Admin'), '</option>
-										<option value="online"', (!empty(Utils::$context['admin_preferences']['sb']) && Utils::$context['admin_preferences']['sb'] == 'online' ? ' selected' : ''), '>', Lang::getTxt('admin_search_type_online', file: 'Admin'), '</option>
-									</select>
-									<input type="submit" name="search_go" id="search_go" value="', Lang::getTxt('admin_search_go', file: 'Admin'), '" class="button">
-								</form>';
-	}
-}
diff --git a/Themes/default/Agreement.template.php b/Themes/default/Agreement.template.php
deleted file mode 100644
index f32261ce513..00000000000
--- a/Themes/default/Agreement.template.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Time;
-use SMF\Utils;
-
-// The main sub template - show the agreement and/or privacy policy
-function template_main()
-{
-	if (!empty(Utils::$context['accept_doc'])) {
-		echo '
-	<form action="', Config::$scripturl, '?action=acceptagreement;doc=', Utils::$context['accept_doc'], '" method="post">';
-	}
-
-	if (!empty(Utils::$context['agreement'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt(!empty(Utils::$context['can_accept_agreement']) ? 'agreement_updated' : 'registration_agreement', file: 'General+Agreement'), '</h3>
-		</div>';
-
-		if (!empty(Utils::$context['can_accept_agreement'])) {
-			echo '
-		<div class="information noup">
-			', Lang::getTxt('agreement_updated_desc', file: 'Agreement'), '
-		</div>';
-		} elseif (!empty(Utils::$context['agreement_accepted_date'])) {
-			echo '
-		<div class="information noup">
-			', Lang::getTxt('agreement_accepted', ['date' => Time::create('@' . Utils::$context['agreement_accepted_date'])->format(null, false)], file: 'Agreement'), '
-		</div>';
-		}
-
-		echo '
-		<div class="windowbg noup">
-			', Utils::adjustHeadingLevels(Utils::$context['agreement'], 3), '
-		</div>';
-	}
-
-	if (!empty(Utils::$context['privacy_policy'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('privacy_policy' . (!empty(Utils::$context['can_accept_privacy_policy']) ? '_updated' : ''), file: 'General+Agreement'), '</h3>
-		</div>';
-
-		if (!empty(Utils::$context['can_accept_privacy_policy'])) {
-			echo '
-		<div class="information noup">
-			', Lang::getTxt('privacy_policy_updated_desc', file: 'Agreement'), '
-		</div>';
-		} elseif (!empty(Utils::$context['privacy_policy_accepted_date'])) {
-			echo '
-		<div class="information noup">
-			', Lang::getTxt('privacy_policy_accepted', ['date' => Time::create('@' . Utils::$context['privacy_policy_accepted_date'])->format(null, false)], file: 'Agreement'), '
-		</div>';
-		}
-
-		echo '
-		<div class="windowbg noup">
-			', Utils::adjustHeadingLevels(Utils::$context['privacy_policy'], 3), '
-		</div>';
-	}
-
-	if (!empty(Utils::$context['accept_doc'])) {
-		echo '
-		<div id="confirm_buttons">';
-
-		if (!empty(Utils::$context['document_has_visible_changes'])) {
-			echo '
-			<a class="button" href="', Config::$scripturl, '?action=agreement', (!isset($_GET['diff']) ? ';diff' : ''), '">', Lang::getTxt((!isset($_GET['diff']) ? 'diff' : 'nodiff'), file: 'Agreement'), '</a>';
-		}
-
-		echo '
-			<input type="submit" value="', Lang::getTxt('agree', file: 'Agreement'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</div>
-	</form>';
-	}
-}
diff --git a/Themes/default/BoardIndex.template.php b/Themes/default/BoardIndex.template.php
deleted file mode 100644
index 43f5d6c8331..00000000000
--- a/Themes/default/BoardIndex.template.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Time;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * This shows the newsfader
- */
-function template_newsfader()
-{
-	// Show the news fader?  (assuming there are things to show...)
-	if (!empty(Theme::$current->settings['show_newsfader']) && !empty(Utils::$context['news_lines'])) {
-		echo '
-		<ul id="smf_slider" class="roundframe">';
-
-		foreach (Utils::$context['news_lines'] as $news) {
-			echo '
-			<li>', $news, '</li>';
-		}
-
-		echo '
-		</ul>
-		<script>
-			jQuery("#smf_slider").slippry({
-				pause: ', Theme::$current->settings['newsfader_time'], ',
-				adaptiveHeight: 0,
-				captions: 0,
-				controls: 0,
-			});
-		</script>';
-	}
-}
-
-/**
- * This actually displays the board index
- */
-function template_boardindex()
-{
-	echo '
-	<div id="boardindex_table" class="boardindex_table">';
-
-	/* Each category in categories is made up of:
-	id, href, link, name, is_collapsed (is it collapsed?), can_collapse (is it okay if it is?),
-	new (is it new?), collapse_href (href to collapse/expand), collapse_image (up/down image),
-	and boards. (see below.) */
-	foreach (Utils::$context['categories'] as $category) {
-		// If there's no parent boards we can see, avoid showing an empty category (unless its collapsed)
-		if (empty($category['boards']) && !$category['is_collapsed']) {
-			continue;
-		}
-
-		echo '
-		<div class="main_container">
-			<div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '', '" id="category_', $category['id'], '">
-				<h3 class="catbg">
-					', $category['link'], '
-				</h3>';
-
-		// If this category even can collapse, show a link to collapse it.
-		if ($category['can_collapse']) {
-			echo '
-				<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', '" data-collapsed="', (int) $category['is_collapsed'], '" title="', Lang::getTxt(!$category['is_collapsed'] ? 'hide_category' : 'show_category', file: 'General'), '" style="display: none;"></span>';
-		}
-
-		echo !empty($category['description']) ? '
-				<div class="desc">' . $category['description'] . '</div>' : '', '
-			</div>
-			<div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="' . $category['css_class'] . '"') : ''), $category['is_collapsed'] ? ' style="display: none;"' : '', '>';
-
-		template_bi_board_list($category['boards']);
-
-		echo '
-			</div><!-- #category_[id]_boards -->
-		</div><!-- .main_container -->';
-	}
-
-	echo '
-	</div><!-- #boardindex_table -->';
-
-	// Show the mark all as read button?
-	if (!User::$me->is_guest && !empty(Utils::$context['categories'])) {
-		echo '
-	<div class="mark_read">
-		', template_button_strip(Utils::$context['mark_read_button'], 'right'), '
-	</div>';
-	}
-}
-
-/**
- * Outputs a list of boards, each one drawn by the template_bi_* helpers below.
- *
- * The board index calls this once per category, and the message index calls it
- * for the child boards of the board being viewed. Both used to carry their own
- * copy of this loop.
- *
- * Each board has: new (is it new?), id, name, description, moderators (see
- * below), link_moderators (just a list.), children (see below.), link_children
- * (easier to use.), children_new (are they new?), topics (# of), posts (# of),
- * link, href, and last_post. (see below.)
- *
- * @param array $boards The boards to draw, in the order they go in.
- */
-function template_bi_board_list(array $boards): void
-{
-	foreach ($boards as $board) {
-		echo '
-				<div id="board_', $board['id'], '" class="up_contain ', (!empty($board['css_class']) ? $board['css_class'] : ''), '">
-					<div class="board_icon">
-						', function_exists('template_bi_' . $board['type'] . '_icon') ? call_user_func('template_bi_' . $board['type'] . '_icon', $board) : template_bi_board_icon($board), '
-					</div>
-					<div class="info">
-						', function_exists('template_bi_' . $board['type'] . '_info') ? call_user_func('template_bi_' . $board['type'] . '_info', $board) : template_bi_board_info($board), '
-					</div><!-- .info -->';
-
-		// Show some basic information about the number of posts, etc.
-		echo '
-					<div class="board_stats">
-						', function_exists('template_bi_' . $board['type'] . '_stats') ? call_user_func('template_bi_' . $board['type'] . '_stats', $board) : template_bi_board_stats($board), '
-					</div>';
-
-		// Show the last post if there is one.
-		echo '
-					<div class="lastpost">
-						', function_exists('template_bi_' . $board['type'] . '_lastpost') ? call_user_func('template_bi_' . $board['type'] . '_lastpost', $board) : template_bi_board_lastpost($board), '
-					</div>';
-
-		// Won't somebody think of the children!
-		if (function_exists('template_bi_' . $board['type'] . '_children')) {
-			call_user_func('template_bi_' . $board['type'] . '_children', $board);
-		} else {
-			template_bi_board_children($board);
-		}
-
-		echo '
-				</div><!-- #board_[id] -->';
-	}
-}
-
-/**
- * Outputs the board icon for a standard board.
- *
- * @param array $board Current board information.
- */
-function template_bi_board_icon($board)
-{
-	echo '
-		<a href="', (User::$me->is_guest ? $board['href'] : Config::$scripturl . '?action=unread;board=' . $board['id'] . '.0;children'), '" class="board_', $board['board_class'], '"', !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '', '></a>';
-}
-
-/**
- * Outputs the board icon for a redirect.
- *
- * @param array $board Current board information.
- */
-function template_bi_redirect_icon($board)
-{
-	echo '
-		<a href="', $board['href'], '" class="board_', $board['board_class'], '"', !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '', '></a>';
-}
-
-/**
- * Outputs the board info for a standard board or redirect.
- *
- * @param array $board Current board information.
- */
-function template_bi_board_info($board)
-{
-	echo '
-		<a class="subject mobile_subject" href="', $board['href'], '" id="b', $board['id'], '">
-			', $board['name'], '
-		</a>';
-
-	// Has it outstanding posts for approval?
-	if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
-		echo '
-		<a href="', Config::$scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" title="', Lang::getTxt('unapproved_posts', ['unapproved_topics' => $board['unapproved_topics'], 'unapproved_posts' => $board['unapproved_posts']], file: 'General'), '" class="moderation_link amt">!</a>';
-	}
-
-	echo '
-		<div class="board_description">', $board['description'], '</div>';
-
-	// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
-	if (!empty($board['link_moderators'])) {
-		echo '
-		<p class="moderators">', Lang::getTxt('moderators_list', ['num' => count($board['link_moderators']), 'list' => Lang::sentenceList($board['link_moderators'])], file: 'General'), '</p>';
-	}
-}
-
-/**
- * Outputs the board stats for a standard board.
- *
- * @param array $board Current board information.
- */
-function template_bi_board_stats($board)
-{
-	echo '
-		<p>
-			', Lang::getTxt('number_of_posts', [$board->posts], file: 'General'), '<br>', Lang::getTxt('number_of_topics', [$board->topics], file: 'General'), '
-		</p>';
-}
-
-/**
- * Outputs the board stats for a redirect.
- *
- * @param array $board Current board information.
- */
-function template_bi_redirect_stats($board)
-{
-	echo '
-		<p>
-			', Lang::getTxt('number_of_redirects', [$board->posts], file: 'General'), '
-		</p>';
-}
-
-/**
- * Outputs the board lastposts for a standard board or a redirect.
- * When on a mobile device, this may be hidden if no last post exists.
- *
- * @param array $board Current board information.
- */
-function template_bi_board_lastpost($board)
-{
-	if (!empty($board['last_post']['id'])) {
-		echo '
-			<p>', $board['last_post']['last_post_message'], '</p>';
-	}
-}
-
-/**
- * Outputs the board children for a standard board.
- *
- * @param array $board Current board information.
- */
-function template_bi_board_children($board)
-{
-	// Show the "Child Boards: ". (there's a link_children but we're going to bold the new ones...)
-	if (!empty($board['children'])) {
-		// Sort the links into an array with new boards bold so it can be imploded.
-		$children = [];
-
-		/* Each child in each board's children has:
-			id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
-		foreach ($board['children'] as $child) {
-			if (!$child['is_redirect']) {
-				$child['link'] = '' . ($child['new'] ? '<a href="' . Config::$scripturl . '?action=unread;board=' . $child['id'] . '" title="' . Lang::getTxt('new_posts_stats', ['posts' => $child['posts'], 'topics' => $child['topics']], file: 'General') . '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a> ' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . Lang::getTxt($child['new'] ? 'new_posts_stats' : 'old_posts_stats', ['posts' => $child['posts'], 'topics' => $child['topics']], file: 'General') . '">' . $child['name'] . '</a>';
-			} else {
-			$child['link'] = '<a href="' . $child['href'] . '" title="' . Lang::getTxt('number_of_redirects', [$child['posts']], file: 'General') . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>';
-			}
-
-			// Has it posts awaiting approval?
-			if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])) {
-				$child['link'] .= ' <a href="' . Config::$scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" title="' . Lang::getTxt('unapproved_posts', $child, file: 'General') . '" class="moderation_link amt">!</a>';
-			}
-
-			$children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>';
-		}
-
-		echo '
-			<div id="board_', $board['id'], '_children" class="children">
-				<p>',
-				Lang::getTxt(
-					'sub_boards_list',
-					[
-						'id' => 'child_list_' . $board['id'],
-						'num' => count($children),
-						'list' => implode(' ', $children),
-					],
-					file: 'General',
-				),
-				'</p>
-			</div>';
-	}
-}
-
-/**
- * Displays the info center
- */
-function template_info_center()
-{
-	if (empty(Utils::$context['info_center'])) {
-		return;
-	}
-
-	// Here's where the "Info Center" starts...
-	echo '
-	<div class="roundframe" id="info_center">
-		<div class="title_bar">
-			<h3 class="titlebg">
-				<a href="#" id="upshrink_link">', Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General'), '</a>
-			</h3>
-			<span class="toggle_up" id="upshrink_ic" title="', Lang::getTxt('hide_infocenter', file: 'General'), '" style="display: none;"></span>
-		</div>
-		<div id="upshrink_stats"', empty(Theme::$current->options['collapse_header_ic']) ? '' : ' style="display: none;"', '>';
-
-	foreach (Utils::$context['info_center'] as $block) {
-		$func = 'template_ic_block_' . $block['tpl'];
-		$func();
-	}
-
-	echo '
-		</div><!-- #upshrink_stats -->
-	</div><!-- #info_center -->';
-
-	// Info center collapse object.
-	echo '
-	<script>
-		var oInfoCenterToggle = new smc_Toggle({
-			bToggleEnabled: true,
-			bCurrentlyCollapsed: ', empty(Theme::$current->options['collapse_header_ic']) ? 'false' : 'true', ',
-			aSwappableContainers: [
-				\'upshrink_stats\'
-			],
-			aSwapImages: [
-				{
-					sId: \'upshrink_ic\',
-					altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide_infocenter', file: 'General')), ',
-					altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show_infocenter', file: 'General')), '
-				}
-			],
-			aSwapLinks: [
-				{
-					sId: \'upshrink_link\',
-					msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General')), ',
-					msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General')), '
-				}
-			],
-			oThemeOptions: {
-				bUseThemeSettings: ', User::$me->is_guest ? 'false' : 'true', ',
-				sOptionName: \'collapse_header_ic\',
-				sSessionId: smf_session_id,
-				sSessionVar: smf_session_var,
-			},
-			oCookieOptions: {
-				bUseCookie: ', User::$me->is_guest ? 'true' : 'false', ',
-				sCookieName: \'upshrinkIC\'
-			}
-		});
-	</script>';
-}
-
-/**
- * The recent posts section of the info center
- */
-function template_ic_block_recent()
-{
-	// This is the "Recent Posts" bar.
-	echo '
-			<div class="sub_bar">
-				<h4 class="subbg">
-					<a href="', Config::$scripturl, '?action=recent"><span class="main_icons recent_posts"></span> ', Lang::getTxt('recent_posts', file: 'General'), '</a>
-				</h4>
-			</div>
-			<div id="recent_posts_content">';
-
-	// Only show one post.
-	if (Theme::$current->settings['number_recent_posts'] == 1) {
-		// latest_post has link, href, time, subject, short_subject (shortened with...), and topic. (its id.)
-		echo '
-				<p id="infocenter_onepost" class="inline">
-					<a href="', Config::$scripturl, '?action=recent">', Lang::getTxt('recent_view', file: 'General'), '</a> ', Lang::getTxt('is_recent_updated', ['link' => '&quot;' . Utils::$context['latest_post']['link'] . '&quot;'], file: 'General'), ' (', Utils::$context['latest_post']['time'], ')<br>
-				</p>';
-	}
-	// Show lots of posts.
-	elseif (!empty(Utils::$context['latest_posts'])) {
-		echo '
-				<table id="ic_recentposts">
-					<tr class="windowbg">
-						<th class="recentpost">', Lang::getTxt('message', file: 'General'), '</th>
-						<th class="recentposter">', Lang::getTxt('author', file: 'General'), '</th>
-						<th class="recentboard">', Lang::getTxt('board', file: 'General'), '</th>
-						<th class="recenttime">', Lang::getTxt('date', file: 'General'), '</th>
-					</tr>';
-
-		/* Each post in latest_posts has:
-			board (with an id, name, and link.), topic (the topic's id.), member (with id, name, and link.),
-			subject, short_subject (shortened with...), time, link, and href. */
-		foreach (Utils::$context['latest_posts'] as $post) {
-			echo '
-					<tr class="windowbg">
-						<td class="recentpost"><strong>', $post['link'], '</strong></td>
-						<td class="recentposter">', $post['member']['link'], '</td>
-						<td class="recentboard">', $post['board']['link'], '</td>
-						<td class="recenttime">', $post['time'], '</td>
-					</tr>';
-		}
-		echo '
-				</table>';
-	}
-	echo '
-			</div><!-- #recent_posts_content -->';
-}
-
-/**
- * The calendar section of the info center
- */
-function template_ic_block_calendar()
-{
-	// Show information about events, birthdays, and holidays on the calendar.
-	echo '
-			<div class="sub_bar">
-				<h4 class="subbg">
-					<a href="', Config::$scripturl, '?action=calendar' . '"><span class="main_icons calendar"></span> ', Lang::getTxt(Utils::$context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming', file: 'Calendar'), '</a>
-				</h4>
-			</div>';
-
-	// Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P
-	if (!empty(Utils::$context['calendar_holidays'])) {
-		$holidays = [];
-
-		foreach (Utils::$context['calendar_holidays'] as $holiday) {
-			$holidays[] = $holiday->title . (!empty($holiday->location) ? ' (' . $holiday->location . ')' : '');
-		}
-
-		echo '
-			<p class="inline holiday">
-				<span class="label">', Lang::getTxt('calendar_prompt', file: 'Calendar'), '</span> ', implode(', ', $holidays), '
-			</p>';
-	}
-
-	// People's birthdays. Like mine. And yours, I guess. Kidding.
-	if (!empty(Utils::$context['calendar_birthdays'])) {
-		echo '
-			<p class="inline">
-				<span class="birthday">', Lang::getTxt(Utils::$context['calendar_only_today'] ? 'birthdays' : 'birthdays_upcoming', file: 'Calendar'), '</span>';
-
-		// Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?)
-		foreach (Utils::$context['calendar_birthdays'] as $bday) {
-			echo '
-				<a href="', Config::$scripturl, '?action=profile;u=', $bday->id, '">', $bday->is_today ? '<strong class="fix_rtl_names">' : '', $bday->name, $bday->is_today ? '</strong>' : '', isset($bday->age) ? ' (' . $bday->age . ')' : '', '</a>', $bday->is_last ? '' : ', ';
-		}
-
-		echo '
-			</p>';
-	}
-
-	// Events like community get-togethers.
-	if (!empty(Utils::$context['calendar_events'])) {
-		echo '
-			<p class="inline">
-				<span class="event">', Lang::getTxt(Utils::$context['calendar_only_today'] ? 'events' : 'events_upcoming', file: 'Calendar'), '</span> ';
-
-		// Each event in calendar_events should have:
-		//		title, href, is_last, can_edit (are they allowed?), modify_href, and is_today.
-		foreach (Utils::$context['calendar_events'] as $event) {
-			echo '
-				', $event->can_edit ? '<a href="' . $event->modify_href . '" title="' . Lang::getTxt('calendar_edit', file: 'Calendar') . '"><span class="main_icons calendar_modify"></span></a> ' : '', $event->href == '' ? '' : '<a href="' . $event->href . '">', $event->is_today ? '<strong>' . $event->title . '</strong>' : $event->title, $event->href == '' ? '' : '</a>', $event->is_last ? '<br>' : ', ';
-		}
-
-		echo '
-			</p>';
-	}
-}
-
-/**
- * The stats section of the info center
- */
-function template_ic_block_stats()
-{
-	// Show statistical style information...
-	echo '
-			<div class="sub_bar">
-				<h4 class="subbg">
-					', Utils::$context['show_stats'] ? '<a href="' . Config::$scripturl . '?action=stats" title="' . Lang::getTxt('more_stats', file: 'General') . '">' : '', '<span class="main_icons stats"></span> ', Lang::getTxt('forum_stats', file: 'General'), Utils::$context['show_stats'] ? '</a>' : '', '
-				</h4>
-			</div>
-			<p class="inline">
-				', Utils::$context['common_stats']['boardindex_total_posts'], !empty(Theme::$current->settings['show_latest_member']) ? ' - ' . Lang::getTxt('latest_member', file: 'General') . ': <strong> ' . Utils::$context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
-				', (!empty(Utils::$context['latest_post']) ? Lang::getTxt('latest_post', file: 'General') . ': <strong>&quot;' . Utils::$context['latest_post']['link'] . '&quot;</strong>  (' . Utils::$context['latest_post']['time'] . ')<br>' : ''), '
-				<a href="', Config::$scripturl, '?action=recent">', Lang::getTxt('recent_view', file: 'General'), '</a>
-			</p>';
-}
-
-/**
- * The who's online section of the info center
- */
-function template_ic_block_online()
-{
-	// "Users online" - in order of activity.
-	echo '
-			<div class="sub_bar">
-				<h4 class="subbg">
-					', Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '', '<span class="main_icons people"></span> ', Lang::getTxt('online_users', file: 'General'), '', Utils::$context['show_who'] ? '</a>' : '', '
-				</h4>
-			</div>
-			<p class="inline">
-				', Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '', '<strong>', Lang::getTxt('online', file: 'General'), ': </strong>', empty(Config::$modSettings['no_guest_logging']) ? Lang::getTxt('number_of_guests', [Utils::$context['num_guests']], file: 'General') . ', ' : '', Lang::getTxt('number_of_members', [Utils::$context['num_users_online']], file: 'General');
-
-	// Handle hidden users and buddies.
-	$bracketList = [];
-
-	if (Utils::$context['show_buddies']) {
-		$bracketList[] = Lang::getTxt('number_of_buddies', [Utils::$context['num_buddies']], file: 'General');
-	}
-
-	if (!empty(Utils::$context['num_spiders'])) {
-		$bracketList[] = Lang::getTxt('number_of_spiders', [Utils::$context['num_spiders']], file: 'General');
-	}
-
-	if (!empty(Utils::$context['num_users_hidden'])) {
-		$bracketList[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['num_users_hidden']], file: 'General');
-	}
-
-	$bracketList = array_filter($bracketList, 'strlen');
-
-	if (!empty($bracketList)) {
-		echo ' (' . Lang::sentenceList($bracketList) . ')';
-	}
-
-	echo Utils::$context['show_who'] ? '</a>' : '', '
-
-				&nbsp;-&nbsp;', Lang::getTxt('most_online_today', file: 'General'), ': <strong>', Lang::numberFormat(Config::$modSettings['mostOnlineToday']), '</strong>&nbsp;-&nbsp;
-				', Lang::getTxt('most_online_ever', file: 'General'), ': ', Lang::numberFormat(Config::$modSettings['mostOnline']), ' (', Time::create('@' . Config::$modSettings['mostDate'])->format(), ')<br>';
-
-	// Assuming there ARE users online... each user in users_online has an id, username, name, group, href, and link.
-	if (!empty(Utils::$context['users_online'])) {
-		echo '
-				', Lang::getTxt('users_active', ['minutes' => Config::$modSettings['lastActive'], 'list' => Lang::sentenceList(Utils::$context['list_users_online'])], file: 'General');
-
-		// Showing membergroups?
-		if (!empty(Theme::$current->settings['show_group_key']) && !empty(Utils::$context['membergroups'])) {
-			echo '
-				<span class="membergroups">' . implode(', ', Utils::$context['membergroups']) . '</span>';
-		}
-	}
-
-	echo '
-			</p>';
-}
diff --git a/Themes/default/Calendar.template.php b/Themes/default/Calendar.template.php
deleted file mode 100644
index beca8746527..00000000000
--- a/Themes/default/Calendar.template.php
+++ /dev/null
@@ -1,1030 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Our main calendar template, which encapsulates weeks and months.
- */
-function template_main()
-{
-	// The main calendar wrapper.
-	echo '
-		<div id="calendar">';
-
-	// Show the mini-blocks if they're enabled.
-	if (empty(Utils::$context['blocks_disabled'])) {
-		echo '
-			<div id="month_grid">
-				', template_show_month_grid('prev', true), '
-				', template_show_month_grid('current', true), '
-				', template_show_month_grid('next', true), '
-			</div>';
-	}
-
-	// What view are we showing?
-	if (Utils::$context['calendar_view'] == 'viewlist') {
-		echo '
-			<div id="main_grid">
-				', template_show_upcoming_list('main'), '
-			</div>';
-	} elseif (Utils::$context['calendar_view'] == 'viewweek') {
-		echo '
-			<div id="main_grid">
-				', template_show_week_grid('main'), '
-			</div>';
-	} else {
-	echo '
-			<div id="main_grid">
-				', template_show_month_grid('main'), '
-			</div>';
-	}
-
-	// Close our wrapper.
-	echo '
-		</div><!-- #calendar -->';
-}
-
-/**
- * Display a list of upcoming events, birthdays, and holidays.
- *
- * @param string $grid_name The grid name
- * @return void|bool Returns false if the grid doesn't exist.
- */
-function template_show_upcoming_list($grid_name)
-{
-	// Bail out if we have nothing to work with
-	if (!isset(Utils::$context['calendar_grid_' . $grid_name])) {
-		return false;
-	}
-
-	// Protect programmer sanity
-	$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
-
-	// Do we want a title?
-	if (empty($calendar_data['disable_title'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg centertext largetext">
-					<a href="', Config::$scripturl, '?action=calendar;viewlist;year=', $calendar_data['start_year'], ';month=', $calendar_data['start_month'], ';day=', $calendar_data['start_day'], '">', Lang::getTxt('calendar_upcoming', file: 'Calendar'), '</a>
-				</h3>
-			</div>';
-	}
-
-	// Give the user some controls to work with
-	template_calendar_top($calendar_data);
-
-	// Output something just so people know it's not broken
-	if (empty($calendar_data['events']) && empty($calendar_data['birthdays']) && empty($calendar_data['holidays'])) {
-		echo '
-			<div class="descbox">', Lang::getTxt('calendar_empty', file: 'Calendar'), '</div>';
-	}
-
-	// First, list any events
-	if (!empty($calendar_data['events'])) {
-		echo '
-			<div>
-				<div class="title_bar">
-					<h3 class="titlebg">', str_replace(':', '', Lang::getTxt('events', file: 'Calendar')), '</h3>
-				</div>
-				<ul>';
-
-		$first_shown = [];
-
-		foreach ($calendar_data['events'] as $date => $date_events) {
-			foreach ($date_events as $event) {
-				echo '
-					<li class="windowbg">
-						<strong class="event_title">', $event->link, '</strong>';
-
-				if ($event->can_edit) {
-					echo ' <a href="' . $event->modify_href . '"><span class="main_icons calendar_modify" title="', Lang::getTxt('calendar_edit', file: 'Calendar'), '"></span></a>';
-				}
-
-				if ($event->can_export) {
-					echo ' <a href="' . $event->export_href . '"><span class="main_icons calendar_export" title="', Lang::getTxt('calendar_export', file: 'Calendar'), '"></span></a>';
-				}
-
-				echo '
-						<br>';
-
-				if (!empty($event->allday)) {
-					echo '<time datetime="' . $event->start->iso_gmdate . '">', trim($event->start->date_local), '</time>', ($event->start->date_local < $event->last_date_local) ? ' &ndash; <time datetime="' . $event->last_iso_gmdate . '">' . trim($event->last_date_local) . '</time>' : '';
-				} else {
-					// Display event info relative to user's local timezone
-					echo '<time datetime="' . $event->start->iso_gmdate . '">', trim($event->start->date_local), ', ', trim($event->start->time_local), '</time> &ndash; <time datetime="' . $event->end->iso_gmdate . '">';
-
-					if ($event->start->date_local != $event->end->date_local) {
-						echo trim($event->end->date_local) . ', ';
-					}
-
-					echo trim($event->end->time_local);
-
-					// Display event info relative to original timezone
-					if ($event->start->date_local . $event->start->time_local != $event->start->date_orig . $event->start->time_orig) {
-						echo '</time> (<time datetime="' . $event->start->iso_gmdate . '">';
-
-						if ($event->start->date_orig != $event->start->date_local || $event->end->date_orig != $event->end->date_local || $event->start->date_orig != $event->end->date_orig) {
-							echo trim($event->start->date_orig), ', ';
-						}
-
-						echo trim($event->start->time_orig), '</time> &ndash; <time datetime="' . $event->end->iso_gmdate . '">';
-
-						if ($event->start->date_orig != $event->end->date_orig) {
-							echo trim($event->end->date_orig) . ', ';
-						}
-
-						echo trim($event->end->time_orig), ' ', $event->tz_abbrev, '</time>)';
-					}
-					// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-					else {
-					echo ' ', $event->tz_abbrev, '</time>';
-					}
-				}
-
-				if (!empty($event->location)) {
-					echo '<br>', $event->location;
-				}
-
-				// If the first occurrence is not visible on the current page,
-				// we mention it in the RRULE description.
-				if ($event->is_first) {
-					$first_shown[] = $event->id_event;
-				}
-
-				$rrule_description = $event->getParentEvent()->recurrence_iterator->getRRule()->getDescription($event, !in_array($event->id_event, $first_shown));
-
-				if (!empty($rrule_description)) {
-					echo '
-						<br>', $rrule_description;
-				}
-
-				echo '
-					</li>';
-			}
-		}
-
-		echo '
-				</ul>
-			</div>';
-	}
-
-	// Next, list any birthdays
-	if (!empty($calendar_data['birthdays'])) {
-		echo '
-			<div>
-				<div class="title_bar">
-					<h3 class="titlebg">', str_replace(':', '', Lang::getTxt('birthdays', file: 'Calendar')), '</h3>
-				</div>
-				<div class="windowbg">';
-
-		foreach ($calendar_data['birthdays'] as $date) {
-			echo '
-					<p class="inline">
-						<strong>', $date['date_local'], '</strong>: ';
-
-			unset($date['date_local']);
-
-			$birthdays = [];
-
-			foreach ($date as $bday) {
-				$birthdays[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $bday->member . '">' . $bday->name . (isset($bday->age) ? ' (' . $bday->age . ')' : '') . '</a>';
-			}
-
-			echo implode(', ', $birthdays);
-
-			echo '
-					</p>';
-		}
-
-		echo '
-				</div><!-- .windowbg -->
-			</div>';
-	}
-
-	// Finally, list any holidays
-	if (!empty($calendar_data['holidays'])) {
-		echo '
-			<div>
-				<div class="title_bar">
-					<h3 class="titlebg">', str_replace(':', '', Lang::getTxt('calendar_prompt', file: 'Calendar')), '</h3>
-				</div>
-				<div class="windowbg">
-					<p class="inline holidays">';
-
-		foreach ($calendar_data['holidays'] as $date) {
-			echo '
-						<span>
-							<strong>', $date['date_local'], '</strong>: ';
-
-			unset($date['date_local']);
-
-			$holidays = [];
-
-			foreach ($date as $holiday) {
-				$holidays[] = $holiday->title . (!empty($holiday->location) ? ' (' . $holiday->location . ')' : '');
-			}
-
-			echo implode(', ', $holidays);
-
-			echo '.
-						</span>';
-		}
-
-		echo '
-					</p>
-				</div><!-- .windowbg -->
-			</div>';
-	}
-}
-
-/**
- * Display a monthly calendar grid.
- *
- * @param string $grid_name The grid name
- * @param bool $is_mini Is this a mini grid?
- * @return void|bool Returns false if the grid doesn't exist.
- */
-function template_show_month_grid($grid_name, $is_mini = false)
-{
-	// If the grid doesn't exist, no point in proceeding.
-	if (!isset(Utils::$context['calendar_grid_' . $grid_name])) {
-		return false;
-	}
-
-	// A handy little pointer variable.
-	$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
-
-	// Some conditions for whether or not we should show the week links *here*.
-	if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false))) {
-		$show_week_links = true;
-	} else {
-	$show_week_links = false;
-	}
-
-	// Assuming that we've not disabled it, show the title block!
-	if (empty($calendar_data['disable_title'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg centertext largetext">';
-
-		// Previous Link: If we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
-			echo '
-					<span class="floatleft">
-						<a href="', $calendar_data['previous_calendar']['href'], '">&#171;</a>
-					</span>';
-		}
-
-		// Next Link: if we're showing prev / next and it's not a mini-calendar.
-		if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false) {
-			echo '
-					<span class="floatright">
-						<a href="', $calendar_data['next_calendar']['href'], '">&#187;</a>
-					</span>';
-		}
-
-		// Arguably the most exciting part, the title!
-		echo '
-					<a href="', Config::$scripturl, '?action=calendar;', Utils::$context['calendar_view'], ';year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $calendar_data['current_day'], '">', Lang::getTxt('months_titles', file: 'General')[$calendar_data['current_month']], ' ', $calendar_data['current_year'], '</a>
-				</h3>
-			</div><!-- .cat_bar -->';
-	}
-
-	// Show the controls on main grids
-	if ($is_mini === false) {
-		template_calendar_top($calendar_data);
-	}
-
-	// Finally, the main calendar table.
-	echo '
-			<table class="calendar_table">';
-
-	// Show each day of the week.
-	if (empty($calendar_data['disable_day_titles'])) {
-		echo '
-				<tr>';
-
-		// If we're showing week links, there's an extra column ahead of the week links, so let's think ahead and be prepared!
-		if ($show_week_links === true) {
-			echo '
-					<th></th>';
-		}
-
-		// Now, loop through each actual day of the week.
-		foreach ($calendar_data['week_days'] as $day) {
-			echo '
-					<th class="days" scope="col">', Lang::getTxt([!empty($calendar_data['short_day_titles']) || $is_mini === true ? 'days_short' : 'days', $day], file: 'General'), '</th>';
-		}
-
-		echo '
-				</tr>';
-	}
-
-	// Our looping begins on a per-week basis.
-	foreach ($calendar_data['weeks'] as $week) {
-		// Some useful looping variables.
-		$current_month_started = false;
-		$count = 1;
-		$final_count = 1;
-
-		echo '
-				<tr class="days_wrapper">';
-
-		// This is where we add the actual week link, if enabled on this location.
-		if ($show_week_links === true) {
-			echo '
-					<td class="windowbg weeks">
-						<a href="', Config::$scripturl, '?action=calendar;viewweek;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $week['days'][0]['day'], '" title="', Lang::getTxt('calendar_view_week', file: 'Calendar'), '">&#187;</a>
-					</td>';
-		}
-
-		// Now loop through each day in the week we're on.
-		foreach ($week['days'] as $day) {
-			// What classes should each day inherit? Day is default.
-			$classes = ['days'];
-
-			if (!empty($day['day'])) {
-				$classes[] = !empty($day['is_today']) ? 'calendar_today' : 'windowbg';
-
-				// Additional classes are given for events, holidays, and birthdays.
-				foreach (['events', 'holidays', 'birthdays'] as $event_type) {
-					if (!empty($day[$event_type])) {
-						$classes[] = $event_type;
-					}
-				}
-			} else {
-				$classes[] = 'disabled';
-			}
-
-			// Now, implode the classes for each day.
-			echo '
-					<td class="', implode(' ', $classes), '">';
-
-			// If it's within this current month, go ahead and begin.
-			if (!empty($day['day'])) {
-				// If it's the first day of this month and not a mini-calendar, we'll add the month title - whether short or full.
-				$title_prefix = !empty($day['is_first_of_month']) && Utils::$context['current_month'] == $calendar_data['current_month'] && $is_mini === false ? Lang::getTxt([!empty($calendar_data['short_month_titles']) ? 'months_short' : 'months_titles', $calendar_data['current_month']], file: 'General') . ' ' : '';
-
-				// The actual day number - be it a link, or just plain old text!
-				if (!empty(Config::$modSettings['cal_daysaslink']) && Utils::$context['can_post']) {
-					echo '
-						<a href="', Config::$scripturl, '?action=calendar;sa=post;year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				} elseif ($is_mini) {
-					echo '
-						<a href="', Config::$scripturl, '?action=calendar;', Utils::$context['calendar_view'], ';year=', $calendar_data['current_year'], ';month=', $calendar_data['current_month'], ';day=', $day['day'], '"><span class="day_text">', $title_prefix, $day['day'], '</span></a>';
-				} else {
-				echo '
-						<span class="day_text">', $title_prefix, $day['day'], '</span>';
-				}
-
-				// A lot of stuff, we're not showing on mini-calendars to conserve space.
-				if ($is_mini === false) {
-					// Holidays are always fun, let's show them!
-					if (!empty($day['holidays'])) {
-						echo '
-						<div class="smalltext holiday">
-							<span class="label">', Lang::getTxt('calendar_prompt', file: 'Calendar'), '</span> ';
-					}
-
-						$holidays = [];
-
-						foreach ($day['holidays'] as $holiday) {
-							echo '<span class="holiday_wrapper">';
-
-							$holiday_string = $holiday->title;
-
-							if (empty($holiday->allday) && !empty($holiday->start_time_local) && $holiday->start_date == $day['date']) {
-								$holiday_string .= ' <span class="event_time">' . trim(str_replace(':00 ', ' ', $holiday->start_time_local)) . '</span>';
-							}
-
-							if (!empty($holiday->location)) {
-								$holiday_string .= ' <span class="event_location">' . $holiday->location . '</span>';
-							}
-
-							$holidays[] = $holiday_string;
-						}
-
-						echo implode('<span>, <span class="holiday_wrapper">', $holidays);
-
-						echo '</span>
-						</div>';
-
-					// Happy Birthday Dear Member!
-					if (!empty($day['birthdays'])) {
-						echo '
-						<div class="smalltext">
-							<span class="birthday">', Lang::getTxt('birthdays', file: 'Calendar'), '</span> ';
-
-						/* Each of the birthdays has:
-							id, name (person), age (if they have one set?), and is_last. (last in list?) */
-						$use_js_hide = empty(Utils::$context['show_all_birthdays']) && count($day['birthdays']) > 15;
-						$birthday_count = 0;
-
-						foreach ($day['birthdays'] as $bday) {
-							echo '<a href="', Config::$scripturl, '?action=profile;u=', $bday->member, '"><span class="fix_rtl_names">', $bday->name, '</span>', isset($bday->age) ? ' (' . $bday->age . ')' : '', '</a>', $bday->is_last || ($count == 10 && $use_js_hide) ? '' : ', ';
-
-							// 9...10! Let's stop there.
-							if ($birthday_count == 10 && $use_js_hide) {
-								// !!TODO - Inline CSS and JavaScript should be moved.
-								echo '<span class="hidelink" id="bdhidelink_', $day['day'], '">...<br><a href="', Config::$scripturl, '?action=calendar;month=', $calendar_data['current_month'], ';year=', $calendar_data['current_year'], ';showbd" onclick="document.getElementById(\'bdhide_', $day['day'], '\').classList.remove(\'hidden\'); document.getElementById(\'bdhidelink_', $day['day'], '\').classList.add(\'hidden\'); return false;">(', Lang::getTxt('calendar_click_all', file: 'Calendar'), ')</a></span><span id="bdhide_', $day['day'], '" class="hidden">, ';
-							}
-
-							++$birthday_count;
-						}
-
-						if ($use_js_hide) {
-							echo '
-							</span>';
-						}
-
-						echo '
-						</div><!-- .smalltext -->';
-					}
-
-					// Any special posted events?
-					if (!empty($day['events'])) {
-						// Sort events by start time (all day events will be listed first)
-						uasort(
-							$day['events'],
-							function ($a, $b) {
-								if ($a['start_timestamp'] == $b['start_timestamp']) {
-									return 0;
-								}
-
-								return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
-							},
-						);
-
-						echo '
-						<div class="smalltext lefttext">
-							<span class="event">', Lang::getTxt('events', file: 'Calendar'), '</span><br>';
-
-						/* The events are made up of:
-							title, href, is_last, can_edit (are they allowed to?), and modify_href. */
-						foreach ($day['events'] as $event) {
-							$event_icons_needed = ($event->can_edit || $event->can_export) ? true : false;
-
-							echo '
-							<div class="event_wrapper', $event->start->date == $day['date'] ? ' event_starts_today' : '', $event->end->date == $day['date'] ? ' event_ends_today' : '', $event->allday == true ? ' allday' : '', $event->is_selected ? ' sel_event' : '', '">
-								', $event->link, '<br>
-								<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
-
-							if (!empty($event->allday)) {
-								echo Lang::getTxt('calendar_allday', file: 'Calendar');
-							} elseif (!empty($event->start->time_local) && $event->start->date == $day['date']) {
-								echo trim(str_replace(':00 ', ' ', $event->start->time_local));
-							} elseif (!empty($event->end->time_local) && $event->end->date == $day['date']) {
-								echo strtolower(Lang::getTxt('ends', file: 'General')), ' ', trim(str_replace(':00 ', ' ', $event->end->time_local));
-							}
-
-							echo '
-								</span>';
-
-							if (!empty($event->location)) {
-								echo '
-								<br>
-								<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event->location . '</span>';
-							}
-
-							if ($event->can_edit || $event->can_export) {
-								echo '
-								<span class="modify_event_links">';
-
-								// If they can edit the event, show an icon they can click on....
-								if ($event->can_edit) {
-									echo '
-									<a class="modify_event" href="', $event->modify_href, '">
-										<span class="main_icons calendar_modify" title="', Lang::getTxt('calendar_edit', file: 'Calendar'), '"></span>
-									</a>';
-								}
-
-								// Exporting!
-								if ($event->can_export) {
-									echo '
-									<a class="modify_event" href="', $event->export_href, '">
-										<span class="main_icons calendar_export" title="', Lang::getTxt('calendar_export', file: 'Calendar'), '"></span>
-									</a>';
-								}
-
-								echo '
-								</span><br class="clear">';
-							}
-
-							echo '
-							</div><!-- .event_wrapper -->';
-						}
-
-						echo '
-						</div><!-- .smalltext -->';
-					}
-				}
-				$current_month_started = $count;
-			}
-			// Otherwise, assuming it's not a mini-calendar, we can show previous / next month days!
-			elseif ($is_mini === false) {
-				if (empty($current_month_started) && !empty(Utils::$context['calendar_grid_prev'])) {
-					echo '<a href="', Config::$scripturl, '?action=calendar;viewmonth;year=', Utils::$context['calendar_grid_prev']['current_year'], ';month=', Utils::$context['calendar_grid_prev']['current_month'], '">', Utils::$context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- + 1, '</a>';
-				} elseif (!empty($current_month_started) && !empty(Utils::$context['calendar_grid_next'])) {
-					echo '<a href="', Config::$scripturl, '?action=calendar;viewmonth;year=', Utils::$context['calendar_grid_next']['current_year'], ';month=', Utils::$context['calendar_grid_next']['current_month'], '">', $current_month_started + 1 == $count ? Lang::getTxt([!empty($calendar_data['short_month_titles']) ? 'months_short' : 'months_titles', Utils::$context['calendar_grid_next']['current_month']], file: 'General') . ' ' : '', $final_count++, '</a>';
-				}
-			}
-
-			// Close this day and increase var count.
-			echo '
-					</td>';
-
-			++$count;
-		}
-
-		echo '
-				</tr>';
-	}
-
-	// The end of our main table.
-	echo '
-			</table>';
-}
-
-/**
- * Shows a weekly grid
- *
- * @param string $grid_name The name of the grid
- * @return void|bool Returns false if the grid doesn't exist
- */
-function template_show_week_grid($grid_name)
-{
-	// We might have no reason to proceed, if the variable isn't there.
-	if (!isset(Utils::$context['calendar_grid_' . $grid_name])) {
-		return false;
-	}
-
-	// Handy pointer.
-	$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
-
-	// At the very least, we have one month. Possibly two, though.
-	$iteration = 1;
-
-	foreach ($calendar_data['months'] as $month_data) {
-		// For our first iteration, we'll add a nice header!
-		if ($iteration == 1) {
-			echo '
-				<div class="cat_bar">
-					<h3 class="catbg centertext largetext">';
-
-			// Previous Week Link...
-			if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
-				echo '
-						<span class="floatleft">
-							<a href="', $calendar_data['previous_week']['href'], '">&#171;</a>
-						</span>';
-			}
-
-			// Next Week Link...
-			if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])) {
-				echo '
-						<span class="floatright">
-							<a href="', $calendar_data['next_week']['href'], '">&#187;</a>
-						</span>';
-			}
-
-			// "Week beginning <date>"
-			if (!empty($calendar_data['week_title'])) {
-				echo $calendar_data['week_title'];
-			}
-
-			echo '
-					</h3>
-				</div><!-- .cat_bar -->';
-
-			// Show the controls
-			template_calendar_top($calendar_data);
-		}
-
-		// Our actual month...
-		echo '
-				<div class="week_month_title">
-					<a href="', Config::$scripturl, '?action=calendar;viewmonth;month=', $month_data['current_month'], '">
-						', Lang::getTxt(['months_titles', $month_data['current_month']], file: 'General'), '
-					</a>
-				</div>';
-
-		// The main table grid for $this week.
-		echo '
-				<table class="table_grid calendar_week">
-					<tr>
-						<th class="days" scope="col">', Lang::getTxt('calendar_day', file: 'Calendar'), '</th>';
-
-		if (!empty($calendar_data['show_events'])) {
-			echo '
-						<th class="days" scope="col">', Lang::getTxt('events', file: 'Calendar'), '</th>';
-		}
-
-		if (!empty($calendar_data['show_holidays'])) {
-			echo '
-						<th class="days" scope="col">', Lang::getTxt('calendar_prompt', file: 'Calendar'), '</th>';
-		}
-
-		if (!empty($calendar_data['show_birthdays'])) {
-			echo '
-						<th class="days" scope="col">', Lang::getTxt('birthdays', file: 'Calendar'), '</th>';
-		}
-		echo '
-					</tr>';
-
-		// Each day of the week.
-		foreach ($month_data['days'] as $day) {
-			// How should we be highlighted or otherwise not...?
-			$classes = ['days'];
-			$classes[] = !empty($day['is_today']) ? 'calendar_today' : 'windowbg';
-
-			echo '
-					<tr class="days_wrapper">
-						<td class="', implode(' ', $classes), ' act_day">';
-
-			// Should the day number be a link?
-			if (!empty(Config::$modSettings['cal_daysaslink']) && Utils::$context['can_post']) {
-				echo '
-							<a href="', Config::$scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt(['days', $day['day_of_week']], file: 'General'), ' - ', $day['day'], '</a>';
-			} else {
-			echo Lang::getTxt(['days', $day['day_of_week']], file: 'General'), ' - ', $day['day'];
-			}
-
-			echo '
-						</td>';
-
-			if (!empty($calendar_data['show_events'])) {
-				echo '
-						<td class="', implode(' ', $classes), '', empty($day['events']) ? (' disabled' . (Utils::$context['can_post'] ? ' week_post' : '')) : ' events', ' event_col" data-css-prefix="' . Lang::getTxt('events', file: 'Calendar') . ' ', (empty($day['events']) && empty(Utils::$context['can_post'])) ? Lang::getTxt('none', file: 'General') : '', '">';
-
-				// Show any events...
-				if (!empty($day['events'])) {
-					// Sort events by start time (all day events will be listed first)
-					uasort(
-						$day['events'],
-						function ($a, $b) {
-							if ($a['start_timestamp'] == $b['start_timestamp']) {
-								return 0;
-							}
-
-							return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
-						},
-					);
-
-					foreach ($day['events'] as $event) {
-						echo '
-								<div class="event_wrapper">';
-
-						$event_icons_needed = ($event->can_edit || $event->can_export) ? true : false;
-
-						echo $event->link, '<br>
-									<span class="event_time', empty($event_icons_needed) ? ' floatright' : '', '">';
-
-						if (!empty($event->start->time_local)) {
-							echo trim($event->start->time_local), !empty($event->end->time_local) ? ' &ndash; ' . trim($event->end->time_local) : '';
-						} else {
-						echo Lang::getTxt('calendar_allday', file: 'Calendar');
-						}
-
-						echo '
-									</span>';
-
-						if (!empty($event->location)) {
-							echo '<br>
-									<span class="event_location', empty($event_icons_needed) ? ' floatright' : '', '">' . $event->location . '</span>';
-						}
-
-						if (!empty($event_icons_needed)) {
-							echo ' <span class="modify_event_links">';
-
-							// If they can edit the event, show a star they can click on....
-							if (!empty($event->can_edit)) {
-								echo '
-										<a class="modify_event" href="', $event->modify_href, '">
-											<span class="main_icons calendar_modify" title="', Lang::getTxt('calendar_edit', file: 'Calendar'), '"></span>
-										</a>';
-							}
-
-							// Can we export? Sweet.
-							if (!empty($event->can_export)) {
-								echo '
-										<a class="modify_event" href="', $event->export_href, '">
-											<span class="main_icons calendar_export" title="', Lang::getTxt('calendar_export', file: 'Calendar'), '"></span>
-										</a>';
-							}
-
-							echo '
-									</span><br class="clear">';
-						}
-
-						echo '
-								</div><!-- .event_wrapper -->';
-					}
-
-					if (!empty(Utils::$context['can_post'])) {
-						echo '
-								<div class="week_add_event">
-									<a href="', Config::$scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('calendar_post_event', file: 'Calendar'), '</a>
-								</div>
-								<br class="clear">';
-					}
-				} else {
-					if (!empty(Utils::$context['can_post'])) {
-						echo '
-								<div class="week_add_event">
-									<a href="', Config::$scripturl, '?action=calendar;sa=post;month=', $month_data['current_month'], ';year=', $month_data['current_year'], ';day=', $day['day'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('calendar_post_event', file: 'Calendar'), '</a>
-								</div>';
-					}
-				}
-				echo '
-							</td>';
-			}
-
-			if (!empty($calendar_data['show_holidays'])) {
-				echo '
-						<td class="', implode(' ', $classes), !empty($day['holidays']) ? ' holidays' : ' disabled', ' holiday_col" data-css-prefix="' . Lang::getTxt('calendar_prompt', file: 'Calendar') . ' ">';
-
-				// Show any holidays!
-				if (!empty($day['holidays'])) {
-					echo '
-							<div class="holiday_wrapper">';
-
-					$holidays = [];
-
-					foreach ($day['holidays'] as $holiday) {
-						$holiday_string = $holiday->title;
-
-						if (empty($holiday->allday) && !empty($holiday->start_time_local) && $holiday->start_date == $day['date']) {
-							$holiday_string .= ' <span class="event_time">' . trim(str_replace(':00 ', ' ', $holiday->start_time_local)) . '</span>';
-						}
-
-						if (!empty($holiday->location)) {
-							$holiday_string .= ' <span class="event_location">' . $holiday->location . '</span>';
-						}
-
-						$holidays[] = $holiday_string;
-					}
-
-					echo implode('
-							</div>
-							<div class="holiday_wrapper">', $holidays);
-
-					echo '
-							</div>';
-				}
-
-				echo '
-						</td>';
-			}
-
-			if (!empty($calendar_data['show_birthdays'])) {
-				echo '
-						<td class="', implode(' ', $classes), '', !empty($day['birthdays']) ? ' birthdays' : ' disabled', ' birthday_col" data-css-prefix="' . Lang::getTxt('birthdays', file: 'Calendar') . ' ">';
-
-				// Show any birthdays...
-				if (!empty($day['birthdays'])) {
-					foreach ($day['birthdays'] as $member) {
-						echo '
-								<a href="', Config::$scripturl, '?action=profile;u=', $member['id'], '">', $member['name'], '</a>
-								', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '
-								', $member['is_last'] ? '' : '<br>';
-					}
-				}
-				echo '
-						</td>';
-			}
-			echo '
-					</tr>';
-		}
-
-		// Increase iteration for loop counting.
-		++$iteration;
-
-		echo '
-				</table>';
-	}
-}
-
-/**
- * Calendar controls under the title
- *
- * Creates the view selector (list, month, week), the date selector (either a
- * select menu or a date range chooser, depending on the circumstances), and the
- * "Post Event" button.
- *
- * @param array $calendar_data The data for the calendar grid that this is for
- */
-function template_calendar_top($calendar_data)
-{
-	echo '
-		<div class="calendar_top roundframe', empty($calendar_data['disable_title']) ? ' noup' : '', '">
-			<div id="calendar_viewselector" class="buttonrow floatleft">
-				<a href="', Config::$scripturl, '?action=calendar;viewlist;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewlist' ? ' active' : '', '">', Lang::getTxt('calendar_list', file: 'Calendar'), '</a>
-				<a href="', Config::$scripturl, '?action=calendar;viewmonth;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewmonth' ? ' active' : '', '">', Lang::getTxt('calendar_month', file: 'Calendar'), '</a>
-				<a href="', Config::$scripturl, '?action=calendar;viewweek;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewweek' ? ' active' : '', '">', Lang::getTxt('calendar_week', file: 'Calendar'), '</a>
-			</div>
-			', template_button_strip(Utils::$context['calendar_buttons'], 'right');
-
-	echo '
-			<form action="', Config::$scripturl, '?action=calendar;', Utils::$context['calendar_view'], '" id="', !empty($calendar_data['end_date']) ? 'calendar_range' : 'calendar_navigation', '" method="post" accept-charset="UTF-8">
-				<input type="date" name="start_date" id="start_date" value="', $calendar_data['iso_start_date'], '" class="date_input start" data-type="date">';
-
-	if (!empty($calendar_data['end_date'])) {
-		echo '
-				<span>', Utils::strtolower(Lang::getTxt('to', file: 'General')), '</span>
-				<input type="date" name="end_date" id="end_date" value="', $calendar_data['iso_end_date'], '" class="date_input end" data-type="date">';
-	}
-
-	echo '
-				<input type="submit" class="button" style="float:none" id="view_button" value="', Lang::getTxt('view', file: 'General'), '">
-			</form>
-		</div><!-- .calendar_top -->';
-}
-
-/**
- * Template for posting a calendar event.
- */
-function template_event_post()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=calendar;sa=post" method="post" name="postevent" accept-charset="UTF-8" onsubmit="submitonce(this);">';
-
-	if (!empty(Utils::$context['event']->new)) {
-		echo '
-			<input type="hidden" name="eventid" value="', Utils::$context['event']->id, '">
-			<input type="hidden" name="recurrenceid" value="', Utils::$context['event']->selected_occurrence->id, '">';
-	}
-
-	// Start the main table.
-	echo '
-			<div id="post_event">
-				<div class="cat_bar">
-					<h3 class="catbg">
-						', Utils::$context['page_title'], '
-					</h3>
-				</div>';
-
-	if (!empty(Utils::$context['post_error']['messages'])) {
-		echo '
-				<div class="errorbox">
-					<dl class="event_error">
-						<dt>
-							', Utils::$context['error_type'] == 'serious' ? '<strong>' . Lang::getTxt('error_while_submitting', file: 'General') . '</strong>' : '', '
-						</dt>
-						<dt class="error">
-							', implode('<br>', Utils::$context['post_error']['messages']), '
-						</dt>
-					</dl>
-				</div>';
-	}
-
-	echo '
-				<div class="roundframe noup">';
-
-	template_event_options();
-
-	echo '
-					<div class="buttonlist">
-						<input type="submit" value="', Lang::getTxt(empty(Utils::$context['event']->new) ? 'save' : 'post', file: 'General'), '" class="button floatright">';
-
-	if (!Utils::$context['event']->new) {
-		echo '
-						<input type="submit" name="deleteevent" value="', Lang::getTxt('calendar_repeat_delete_label', file: 'Calendar'), '" class="button floatright you_sure" data-confirm="', Lang::getTxt(Utils::$context['event']->selected_occurrence->is_first ? 'calendar_confirm_delete' : 'calendar_confirm_occurrence_delete', file: 'Calendar'), '">';
-
-		if (!Utils::$context['event']->selected_occurrence->is_first) {
-			echo '
-						<a href="', Utils::$context['event']->modify_href, '" class="button floatright">', Lang::getTxt('calendar_repeat_adjustment_edit_first', file: 'Calendar'), '</a>';
-		}
-	}
-
-	echo '
-					</div>
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				</div><!-- .roundframe -->
-			</div><!-- #post_event -->
-		</form>';
-}
-
-/**
- * Displays a clock
- */
-function template_bcd()
-{
-	template_geek_clock('bcd', 'BCD Clock');
-
-	echo '
-			<div class="centertext">
-				<a href="', Config::$scripturl, '?action=clock;rb" class="button">Are you hardcore?</a>
-			</div>
-		</div><!-- .roundframe -->';
-}
-
-/**
- * Displays the hours, minutes and seconds for our clock
- */
-function template_hms()
-{
-	template_geek_clock('hms', 'Binary Clock');
-
-	echo '
-			<div class="centertext">
-				<a href="', Config::$scripturl, '?action=clock" class="button">Too tough for you?</a>
-			</div>
-		</div><!-- .roundframe -->';
-}
-
-/**
- * Displays a binary clock
- */
-function template_omfg()
-{
-	template_geek_clock('omfg', 'OMFG Binary Clock');
-
-	echo '
-		</div><!-- .roundframe -->';
-}
-
-/**
- * Displays the time
- */
-function template_thetime()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">The time you requested</h3>
-		</div>
-		<div class="roundframe noup">
-			<ul id="geek_time">';
-
-	// Unlike the clocks, this one never changes, so which lamps are lit is
-	// settled here rather than in calendar.js.
-	foreach (Utils::$context['clockicons'] as $v) {
-		echo '
-				<li>
-					<ul>';
-
-		foreach ($v as $lit) {
-			echo '
-						<li', $lit ? ' class="lit"' : '', '></li>';
-		}
-
-		echo '
-					</ul>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- .roundframe -->';
-}
-
-/**
- * Draws the lamps of one of the geek clocks.
- *
- * The lamps start out unlit and carry the unit and the bit they stand for.
- * calendar.js lights the right ones twice a second, so nothing echoed here goes
- * stale the moment the page has finished loading. Leaves the .roundframe open
- * for the caller to add its own footer to.
- *
- * @param string $style Which clock this is. calendar.js reads the digits to show from it.
- * @param string $title Heading to put above the clock.
- */
-function template_geek_clock(string $style, string $title): void
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', $title, '</h3>
-		</div>
-		<div class="roundframe noup">
-			<ul id="geek_clock" class="', $style, '">';
-
-	foreach (Utils::$context['clockicons'] as $unit => $bits) {
-		echo '
-				<li>
-					<ul>';
-
-		foreach ($bits as $bit) {
-			echo '
-						<li data-unit="', $unit, '" data-bit="', $bit, '"></li>';
-		}
-
-		echo '
-					</ul>
-				</li>';
-	}
-
-	echo '
-			</ul>';
-}
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
deleted file mode 100644
index ba571c916cf..00000000000
--- a/Themes/default/Display.template.php
+++ /dev/null
@@ -1,1033 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Time;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * This template handles displaying a topic
- */
-function template_main()
-{
-	// Let them know, if their report was a success!
-	if (Utils::$context['report_sent']) {
-		echo '
-		<div class="infobox">
-			', Lang::getTxt('report_sent', file: 'General'), '
-		</div>';
-	}
-
-	// Let them know why their message became unapproved.
-	if (Utils::$context['becomesUnapproved']) {
-		echo '
-		<div class="noticebox">
-			', Lang::getTxt('post_becomes_unapproved', file: 'General'), '
-		</div>';
-	}
-
-	// Show new topic info here?
-	echo '
-		<div id="display_head" class="information">
-			<h2 class="display_title">
-				<span id="top_subject">', Utils::$context['subject'], '</span>', (Utils::$context['is_locked']) ? ' <span class="main_icons lock"></span>' : '', (Utils::$context['is_sticky']) ? ' <span class="main_icons sticky"></span>' : '', '
-			</h2>
-			<p>', Lang::getTxt('started_by_member_time', ['member' => Utils::$context['topic_poster_name'], 'time' => Utils::$context['topic_started_time']], file: 'General'), '</p>';
-
-	// Next - Prev
-	echo '
-			<span class="nextlinks floatright">', Utils::$context['previous_next'], '</span>';
-
-	if (!empty(Theme::$current->settings['display_who_viewing'])) {
-		// Show just numbers...?
-		if (Theme::$current->settings['display_who_viewing'] == 1 || empty(Utils::$context['view_members_list'])) {
-			// Count the ones this member is allowed to see. Any hidden ones get
-			// their own mention below, so counting those here as well would say
-			// the same people twice.
-			$list_of_viewers = [
-				Lang::getTxt('number_of_members', [count(Utils::$context['view_members_list'])], file: 'General'),
-			];
-		}
-		// Or show the actual people viewing the topic?
-		else {
-			$list_of_viewers = Utils::$context['view_members_list'];
-		}
-
-		if (!empty(Utils::$context['view_num_hidden']) && !Utils::$context['can_moderate_forum']) {
-			$list_of_viewers[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['view_num_hidden']], file: 'General');
-		}
-
-		// Now show how many guests are here too.
-		if (!empty(Utils::$context['view_num_guests'])) {
-			$list_of_viewers[] = Lang::getTxt('guest_plural', [Utils::$context['view_num_guests']], file: 'General');
-		}
-
-		echo '
-			<p>
-				', Lang::getTxt(
-			'who_viewing_topic',
-			[
-				'list_of_viewers' => Lang::sentenceList(array_values($list_of_viewers)),
-				'num_viewing' => count(Utils::$context['view_members_list'] ?? []) + (int) (Utils::$context['view_num_guests'] ?? 0) + (int) (Utils::$context['view_num_hidden'] ?? 0),
-			],
-			file: 'General',
-		), '
-			</p>';
-	}
-
-	// Show the anchor for the top and for the first message. If the first message is new, say so.
-	echo '
-		</div><!-- #display_head -->
-		', Utils::$context['first_new_message'] ? '<a id="new"></a>' : '';
-
-	// Is this topic also a poll?
-	if (Utils::$context['is_poll']) {
-		echo '
-		<div id="poll">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="main_icons poll"></span>', Utils::$context['poll']['is_locked'] ? '<span class="main_icons lock"></span>' : '', ' ', Utils::$context['poll']['question'], '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<div id="poll_options">';
-
-		// Are they not allowed to vote but allowed to view the options?
-		if (Utils::$context['poll']['show_results'] || !Utils::$context['allow_vote']) {
-			echo '
-					<dl class="options">';
-
-			// Show each option with its corresponding percentage bar.
-			foreach (Utils::$context['poll']['options'] as $option) {
-				echo '
-						<dt class="', $option['voted_this'] ? ' voted' : '', '">', $option['option'], '</dt>
-						<dd class="statsbar generic_bar', $option['voted_this'] ? ' voted' : '', '">';
-
-				if (Utils::$context['allow_results_view']) {
-					echo '
-							', $option['bar_ndt'], '
-							<span class="percentage">', $option['votes'], ' (', $option['percent'], '%)</span>';
-				}
-
-				echo '
-						</dd>';
-			}
-
-			echo '
-					</dl>';
-
-			if (Utils::$context['allow_results_view']) {
-				echo '
-					<p>', Lang::getTxt('poll_total_voters', [Utils::$context['poll']['total_votes']], file: 'General'), '</p>';
-			}
-		}
-		// They are allowed to vote! Go to it!
-		else {
-			echo '
-					<form action="', Config::$scripturl, '?action=vote;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8">';
-
-			// Show a warning if they are allowed more than one option.
-			if (Utils::$context['poll']['allowed_warning']) {
-				echo '
-						<p class="smallpadding">', Utils::$context['poll']['allowed_warning'], '</p>';
-			}
-
-			echo '
-						<ul class="options">';
-
-			// Show each option with its button - a radio likely.
-			foreach (Utils::$context['poll']['options'] as $option) {
-				echo '
-							<li>', $option['vote_button'], ' <label for="options-', $option['id'], '">', $option['option'], '</label></li>';
-			}
-
-			echo '
-						</ul>
-						<div class="submitbutton">
-							<input type="submit" value="', Lang::getTxt('poll_vote', file: 'General'), '" class="button">
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						</div>
-					</form>';
-		}
-
-		// Is the clock ticking?
-		if (!empty(Utils::$context['poll']['expire_time'])) {
-			echo '
-					<p><strong>', Lang::getTxt(Utils::$context['poll']['is_expired'] ? 'poll_expired_on' : 'poll_expires_on', file: 'General'), ':</strong> ', Utils::$context['poll']['expire_time'], '</p>';
-		}
-
-		echo '
-				</div><!-- #poll_options -->
-			</div><!-- .windowbg -->
-		</div><!-- #poll -->
-		<div id="pollmoderation">';
-
-		template_button_strip(Utils::$context['poll_buttons']);
-
-		echo '
-		</div>';
-	}
-
-	// Does this topic have some events linked to it?
-	if (!empty(Utils::$context['linked_calendar_events'])) {
-		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('calendar_linked_events', file: 'Calendar'), '</h3>
-		</div>';
-
-		template_linked_events();
-	}
-
-	// Show the page index... "Pages: [1]".
-	echo '
-		<div class="pagesection top">
-			', template_button_strip(Utils::$context['normal_buttons'], 'right'), '
-			', Utils::$context['menu_separator'], '
-			<div class="pagelinks floatleft">
-				<a href="#bot" class="button">', Lang::getTxt('go_down', file: 'General'), '</a>
-				', Utils::$context['page_index'], '
-			</div>';
-
-	// Mobile action - moderation buttons (top)
-	if (!empty(Utils::$context['normal_buttons'])) {
-		echo '
-		<div class="mobile_buttons floatright">
-			<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-			', !empty(Utils::$context['mod_buttons']) ? '<a class="button mobile_mod">' . Lang::getTxt('mobile_moderation', file: 'General') . '</a>' : '', '
-		</div>';
-	}
-
-	echo '
-		</div>';
-
-	// Show the topic information - icon, subject, etc.
-	echo '
-		<div id="forumposts">
-			<form action="', Config::$scripturl, '?action=quickmod2;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">';
-
-	Utils::$context['ignoredMsgs'] = [];
-	Utils::$context['removableMessageIDs'] = [];
-
-	// Get all the messages...
-	while ($message = Utils::$context['get_message']()) {
-		template_single_post($message);
-	}
-
-	echo '
-			</form>
-		</div><!-- #forumposts -->';
-
-	// Show the page index... "Pages: [1]".
-	echo '
-		<div class="pagesection">
-			', template_button_strip(Utils::$context['normal_buttons'], 'right'), '
-			', Utils::$context['menu_separator'], '
-			<div class="pagelinks floatleft">
-				<a href="#main_content_section" class="button" id="bot">', Lang::getTxt('go_up', file: 'General'), '</a>
-				', Utils::$context['page_index'], '
-			</div>';
-
-	// Mobile action - moderation buttons (bottom)
-	if (!empty(Utils::$context['normal_buttons'])) {
-		echo '
-		<div class="mobile_buttons floatright">
-			<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-			', !empty(Utils::$context['mod_buttons']) ? '<a class="button mobile_mod">' . Lang::getTxt('mobile_moderation', file: 'General') . '</a>' : '', '
-		</div>';
-	}
-
-	echo '
-		</div>';
-
-	// Show the lower breadcrumbs.
-	theme_linktree();
-
-	// Moderation buttons
-	echo '
-		<div id="moderationbuttons">
-			', template_button_strip(Utils::$context['mod_buttons'], 'bottom', ['id' => 'moderationbuttons_strip']), '
-		</div>';
-
-	// Show the jumpto box, or actually...let Javascript do it.
-	echo '
-		<div id="display_jump_to"></div>';
-
-	// Show quickreply
-	if (Utils::$context['can_reply']) {
-		template_quickreply();
-	}
-
-	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
-	echo '
-		<div id="mobile_action" class="popup_container">
-			<div class="popup_window description">
-				<div class="popup_heading">
-					', Lang::getTxt('mobile_action', file: 'General'), '
-					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-				</div>
-				', template_button_strip(Utils::$context['normal_buttons']), '
-			</div>
-		</div>';
-
-	// Show the moderation button & pop (if there is anything to show)
-	if (!empty(Utils::$context['mod_buttons'])) {
-		echo '
-		<div id="mobile_moderation" class="popup_container">
-			<div class="popup_window description">
-				<div class="popup_heading">
-					', Lang::getTxt('mobile_moderation', file: 'General'), '
-					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-				</div>
-				<div id="moderationbuttons_mobile">
-					', template_button_strip(Utils::$context['mod_buttons'], 'bottom', ['id' => 'moderationbuttons_strip_mobile']), '
-				</div>
-			</div>
-		</div>';
-	}
-
-	echo '
-		<script>
-			window.addEventListener("DOMContentLoaded", function() {';
-
-	if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && Utils::$context['can_remove_post']) {
-		echo '
-				const strips = [
-					{ id: "moderationbuttons", display: "moderationbuttons_strip", varName: "oInTopicModeration" },
-					{ id: "moderationbuttons_mobile", display: "moderationbuttons_strip_mobile", varName: "oInTopicModerationMobile" }
-				];
-
-				for (let i = 0; i < strips.length; i++) {
-					const strip = strips[i];
-					window[strip.varName] = new InTopicModeration({
-						sCheckboxContainerMask: "in_topic_mod_check_",
-						aMessageIds: ["', implode('", "', Utils::$context['removableMessageIDs']), '"],
-						sSessionId: smf_session_id,
-						sSessionVar: smf_session_var,
-						sButtonStrip: strip.id,
-						sButtonStripDisplay: strip.display,
-						bUseImageButton: false,
-						bCanRemove: ', Utils::$context['can_remove_post'] ? 'true' : 'false', ',
-						sRemoveButtonLabel: "', Lang::getTxt('quickmod_delete_selected', file: 'General'), '",
-						sRemoveButtonImage: "delete_selected.png",
-						sRemoveButtonConfirm: "', Lang::getTxt('quickmod_confirm', file: 'General'), '",
-						bCanRestore: ', Utils::$context['can_restore_msg'] ? 'true' : 'false', ',
-						sRestoreButtonLabel: "', Lang::getTxt('quick_mod_restore', file: 'General'), '",
-						sRestoreButtonImage: "restore_selected.png",
-						sRestoreButtonConfirm: "', Lang::getTxt('quickmod_confirm', file: 'General'), '",
-						bCanSplit: ', Utils::$context['can_split'] ? 'true' : 'false', ',
-						sSplitButtonLabel: "', Lang::getTxt('quickmod_split_selected', file: 'General'), '",
-						sSplitButtonImage: "split_selected.png",
-						sSplitButtonConfirm: "', Lang::getTxt('quickmod_confirm', file: 'General'), '",
-						sFormId: "quickModForm"
-					});
-				}';
-	}
-
-	echo '
-				new QuickModify({
-					sScriptUrl: smf_scripturl,
-					sFormName: \'quickModForm\',
-					sClassName: \'quick_edit\',
-					bShowModify: ', Config::$modSettings['show_modify'] ? 'true' : 'false', ',
-					iTopicId: ', Utils::$context['current_topic'], ',
-					sSaveButtonText: ', Utils::escapeJavaScript(Lang::getTxt('save', file: 'General')), ',
-					sCancelButtonText: ', Utils::escapeJavaScript(Lang::getTxt('modify_cancel', file: 'General')), ',
-					sEditReasonText: ', Utils::escapeJavaScript(Lang::getTxt('reason_for_edit', file: 'General')) . ',
-					sErrorBorderStyle: ', Utils::escapeJavaScript('1px solid red'), '
-				});
-
-				new JumpTo({
-					sContainerId: "display_jump_to",
-					sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">', Utils::$context['jump_to']['label'], '<" + "/label> %dropdown_list%",
-					iCurBoardId: ', Utils::$context['current_board'], ',
-					iCurBoardChildLevel: ', Utils::$context['jump_to']['child_level'], ',
-					sCurBoardName: "', Utils::$context['jump_to']['board_name'], '",
-					sBoardChildLevelIndicator: "==",
-					sBoardPrefix: "=> ",
-					sCatSeparator: "-----------------------------",
-					sCatPrefix: "",
-					sGoButtonLabel: "', Lang::getTxt('go', file: 'General'), '"
-				});
-
-				new IconList({
-					sIconIdPrefix: "msg_icon_",
-					sScriptUrl: smf_scripturl,
-					bShowModify: ', !empty(Config::$modSettings['show_modify']) ? 'true' : 'false', ',
-					iBoardId: ', Utils::$context['current_board'], ',
-					iTopicId: ', Utils::$context['current_topic'], ',
-					sSessionId: smf_session_id,
-					sSessionVar: smf_session_var,
-					sLabelIconList: "', Lang::getTxt('message_icon', file: 'General'), '"
-				});';
-
-	if (!empty(Utils::$context['ignoredMsgs'])) {
-		echo '
-				ignore_toggles([', implode(', ', Utils::$context['ignoredMsgs']), '], ', Utils::escapeJavaScript(Lang::getTxt('show_ignore_user_post', file: 'General')), ');';
-	}
-
-	echo '
-			});
-		</script>';
-}
-
-/**
- * Template for displaying a single post.
- *
- * @param array $message An array of information about the message to display. Should have 'id' and 'member'. Can also have 'first_new', 'is_ignored' and 'css_class'.
- */
-function template_single_post($message)
-{
-	$ignoring = false;
-
-	if ($message['can_remove']) {
-		Utils::$context['removableMessageIDs'][] = $message['id'];
-	}
-
-	// Are we ignoring this message?
-	if (!empty($message['is_ignored'])) {
-		$ignoring = true;
-		Utils::$context['ignoredMsgs'][] = $message['id'];
-	}
-
-	// Show a "new" anchor if this message is new.
-	if (!empty($message['first_new']) && $message['id'] != Utils::$context['first_message']) {
-		echo '
-				<a id="new"></a>';
-	}
-
-	// Inform the reader if this message bumped an old topic.
-	if (!empty($message['bump_notice'])) {
-		echo '
-				' . $message['bump_notice'];
-	}
-
-	// Show the message.
-	echo '
-				<div class="', $message['css_class'], '" id="msg' . $message['id'] . '">
-					<div class="post_wrapper">';
-
-	// Show information about the poster of this message.
-	echo '
-						<div class="poster">';
-
-	// Are there any custom fields above the member name?
-	if (!empty($message['custom_fields']['above_member'])) {
-		echo '
-							<div class="custom_fields_above_member">
-								<ul class="nolist">';
-
-		foreach ($message['custom_fields']['above_member'] as $custom) {
-			echo '
-									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-								</ul>
-							</div>';
-	}
-
-	echo '
-							<h4>';
-
-	// Show online and offline buttons?
-	if (!empty(Config::$modSettings['onlineEnable']) && !$message['member']['is_guest']) {
-		echo '
-								', Utils::$context['can_send_pm'] ? '<a href="' . $message['member']['online']['href'] . '" title="' . $message['member']['online']['label'] . '">' : '', '<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>', Utils::$context['can_send_pm'] ? '</a>' : '';
-	}
-
-	// Custom fields BEFORE the username?
-	if (!empty($message['custom_fields']['before_member'])) {
-		foreach ($message['custom_fields']['before_member'] as $custom) {
-			echo '
-								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
-		}
-	}
-
-	// Show a link to the member's profile.
-	echo '
-								', $message['member']['link'];
-
-	// Custom fields AFTER the username?
-	if (!empty($message['custom_fields']['after_member'])) {
-		foreach ($message['custom_fields']['after_member'] as $custom) {
-			echo '
-								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
-		}
-	}
-
-	// Begin display of user info
-	echo '
-							</h4>
-							<ul class="user_info">';
-
-	// Show the member's custom title, if they have one.
-	if (!empty($message['member']['title'])) {
-		echo '
-								<li class="title">', $message['member']['title'], '</li>';
-	}
-
-	// Show the member's primary group (like 'Administrator') if they have one.
-	if (!empty($message['member']['group'])) {
-		echo '
-								<li class="membergroup">', $message['member']['group'], '</li>';
-	}
-
-	// Show the user's avatar.
-	if (!empty(Config::$modSettings['show_user_images']) && empty(Theme::$current->options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
-		echo '
-								<li class="avatar">
-									<a href="', $message['member']['href'], '">', $message['member']['avatar']['image'], '</a>
-								</li>';
-	}
-
-	// Are there any custom fields below the avatar?
-	if (!empty($message['custom_fields']['below_avatar'])) {
-		foreach ($message['custom_fields']['below_avatar'] as $custom) {
-			echo '
-								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-	}
-
-	// Don't show these things for guests.
-	if (!$message['member']['is_guest']) {
-		// Show the post group icons
-		echo '
-								<li class="icons">', $message['member']['group_icons'], '</li>';
-
-		// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-		if ((empty(Config::$modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group'])) {
-			echo '
-								<li class="postgroup">', $message['member']['post_group'], '</li>';
-		}
-
-		// Show how many posts they have made.
-		if (!isset(Utils::$context['disabled_fields']['posts'])) {
-			echo '
-								<li class="postcount">', Lang::getTxt('member_postcount_num', [$message['member']['posts']], file: 'General'), '</li>';
-		}
-
-		// Show their personal text?
-		if (!empty(Config::$modSettings['show_blurb']) && !empty($message['member']['blurb'])) {
-			echo '
-								<li class="blurb">', $message['member']['blurb'], '</li>';
-		}
-
-		// Any custom fields to show as icons?
-		if (!empty($message['custom_fields']['icons'])) {
-			echo '
-								<li class="im_icons">
-									<ol>';
-
-			foreach ($message['custom_fields']['icons'] as $custom) {
-				echo '
-										<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-			}
-
-			echo '
-									</ol>
-								</li>';
-		}
-
-		// Show the website and email address buttons.
-		if ($message['member']['show_profile_buttons']) {
-			echo '
-								<li class="profile">
-									<ol class="profile_icons">';
-
-			// Don't show an icon if they haven't specified a website.
-			if (!empty($message['member']['website']['url']) && !isset(Utils::$context['disabled_fields']['website'])) {
-				echo '
-										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" rel="noopener"><span class="main_icons www centericon" title="' . $message['member']['website']['title'] . '"></span></a></li>';
-			}
-
-			// Since we know this person isn't a guest, you *can* message them.
-			if (Utils::$context['can_send_pm']) {
-				echo '
-										<li><a href="', Config::$scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General'), '"><span class="main_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') . '"></span> </a></li>';
-			}
-
-			// Show the email if necessary
-			if (!empty($message['member']['email']) && $message['member']['show_email']) {
-				echo '
-										<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow"><span class="main_icons mail centericon" title="' . Lang::getTxt('email', file: 'General') . '"></span></a></li>';
-			}
-
-			echo '
-									</ol>
-								</li><!-- .profile -->';
-		}
-
-		// Any custom fields for standard placement?
-		if (!empty($message['custom_fields']['standard'])) {
-			foreach ($message['custom_fields']['standard'] as $custom) {
-				echo '
-								<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
-			}
-		}
-	}
-	// Otherwise, show the guest's email.
-	elseif (!empty($message['member']['email']) && $message['member']['show_email']) {
-		echo '
-								<li class="email">
-									<a href="mailto:' . $message['member']['email'] . '" rel="nofollow"><span class="main_icons mail centericon" title="' . Lang::getTxt('email', file: 'General') . '"></span></a>
-								</li>';
-	}
-
-	// Show the IP to this user for this post - because you can moderate?
-	if (!empty(Utils::$context['can_moderate_forum']) && !empty($message['member']['ip'])) {
-		echo '
-								<li class="poster_ip">
-									<a href="', Config::$scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '" data-hover="', $message['member']['ip'], '" class="show_on_hover"><span>', Lang::getTxt('show_ip', file: 'General'), '</span></a> <a href="', Config::$scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
-								</li>';
-	}
-
-	// Or, should we show it because this is you?
-	elseif ($message['can_see_ip']) {
-		echo '
-								<li class="poster_ip">
-									<a href="', Config::$scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help show_on_hover" data-hover="', $message['member']['ip'], '"><span>', Lang::getTxt('show_ip', file: 'General'), '</span></a>
-								</li>';
-	}
-
-	// Okay, are you at least logged in? Then we can show something about why IPs are logged...
-	elseif (!User::$me->is_guest) {
-		echo '
-								<li class="poster_ip">
-									<a href="', Config::$scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', Lang::getTxt('logged', file: 'General'), '</a>
-								</li>';
-	}
-
-	// Otherwise, you see NOTHING!
-	else {
-	echo '
-								<li class="poster_ip">', Lang::getTxt('logged', file: 'General'), '</li>';
-	}
-
-	// Are we showing the warning status?
-	// Don't show these things for guests.
-	if (!$message['member']['is_guest'] && $message['member']['can_see_warning']) {
-		echo '
-								<li class="warning">
-									', Utils::$context['can_issue_warning'] ? '<a href="' . Config::$scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="main_icons warning_', $message['member']['warning_status'], '"></span> ', Utils::$context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', Lang::getTxt('warn_' . $message['member']['warning_status'], file: 'General'), '</span>
-								</li>';
-	}
-
-	// Are there any custom fields to show at the bottom of the poster info?
-	if (!empty($message['custom_fields']['bottom_poster'])) {
-		foreach ($message['custom_fields']['bottom_poster'] as $custom) {
-			echo '
-								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-	}
-
-	// Poster info ends.
-	echo '
-							</ul>
-						</div><!-- .poster -->
-						<div class="postarea">
-							<div class="keyinfo">';
-
-	// Some people don't want subject... The div is still required or quick edit breaks.
-	echo '
-								<div id="subject_', $message['id'], '" class="subject_title', (empty(Config::$modSettings['subject_toggle']) ? ' subject_hidden' : ''), '">
-									', $message['link'], '
-								</div>';
-
-	echo '
-								', !empty($message['counter']) ? '<span class="page_number floatright">#' . $message['counter'] . '</span>' : '', '
-								<div class="postinfo">
-									<span class="messageicon" ', ($message['icon_url'] === Theme::$current->settings['images_url'] . '/post/xx.png' && !$message['can_modify']) ? ' style="position: absolute; z-index: -1;"' : '', '>
-										<img src="', $message['icon_url'] . '" alt=""', $message['can_modify'] ? ' id="msg_icon_' . $message['id'] . '"' : '', '>
-									</span>
-									<a href="', $message['href'], '" rel="nofollow" title="', !empty($message['counter']) ? Lang::getTxt('reply_number', [$message['counter']], file: 'General') : '', $message['subject'], '" class="smalltext">', $message['time'], '</a>
-									<span class="spacer"></span>';
-
-	// Show "<< Last Edit: Time by Person >>" if this post was edited. But we need the div even if it wasn't modified!
-	// Because we insert into it through AJAX and we don't want to stop themers moving it around if they so wish so they can put it where they want it.
-	echo '
-									<' . (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history']) ? 'a href="" onclick="return false;"' : 'span') . ' class="smalltext modified floatright', !empty(Config::$modSettings['show_modify']) && !empty($message['modified']['last_edit_text']) ? ' mvisible' : '', '" id="modified_', $message['id'], '">';
-
-	if (!empty(Config::$modSettings['show_modify']) && !empty($message['modified']['last_edit_text'])) {
-		echo
-										$message['modified']['last_edit_text'];
-	}
-
-	echo '
-									</' . (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history']) ? 'a' : 'span') . '>';
-
-	if (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history'])) {
-		echo '
-									<div id="edit_history_list_' . $message['id'] . '" class="edit_history_list">
-										<div class="edit_history_count">
-											' . Lang::getTxt('edit_history_count', [count($message['edit_history'])]) . '
-										</div>
-										<ol>';
-
-		foreach ($message['edit_history'] as $diff) {
-			$last_edit_text = Lang::getTxt(
-				'edit_history_linktext' . ($diff->reason !== '' ? '_reason' : ''),
-				[
-					'time' => (new Time($diff->time1))->setTimezone(User::$me->timezone)->format(),
-					'member' => $diff->name === '' ? '(' . Lang::getTxt('unknown') . ')' : $diff->name,
-					'reason' => $diff->reason,
-				],
-			);
-
-			echo '
-											<li>
-												<a href="' . Config::$scripturl . '?action=edithistory;msg=' . $message['id'] . ';hash=' . $diff->label1 . '" onclick="return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript($last_edit_text) . ', \'history\');">' . $last_edit_text . '</a>
-											</li>';
-		}
-
-		echo '
-										</ol>
-									</div>';
-	}
-
-	echo '
-								</div>
-								<div id="msg_', $message['id'], '_quick_mod"', $ignoring ? ' style="display:none;"' : '', '></div>
-							</div><!-- .keyinfo -->';
-
-	// Ignoring this user? Hide the post.
-	if ($ignoring) {
-		echo '
-							<div id="msg_', $message['id'], '_ignored_prompt" class="noticebox">
-								', Lang::getTxt('ignoring_user', file: 'General'), '
-								<a href="#" id="msg_', $message['id'], '_ignored_link" style="display: none;">', Lang::getTxt('show_ignore_user_post', file: 'General'), '</a>
-							</div>';
-	}
-
-	// Show the post itself, finally!
-	echo '
-							<div class="post">';
-
-	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == User::$me->id) {
-		echo '
-								<div class="noticebox">
-									', Lang::getTxt('post_awaiting_approval', file: 'General'), '
-								</div>';
-	}
-	echo '
-								<div class="inner" data-msgid="', $message['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>
-									', Utils::adjustHeadingLevels($message['body'], 4), '
-								</div>
-							</div><!-- .post -->';
-
-	// Assuming there are attachments...
-	if (!empty($message['attachment'])) {
-		$last_approved_state = 1;
-		// Don't output the div unless we actually have something to show...
-		$div_output = false;
-
-		foreach ($message['attachment'] as $attachment) {
-			// Do we want this attachment to not be showed here?
-			if ($attachment['is_approved'] && !empty(Config::$modSettings['dont_show_attach_under_post']) && !empty(Utils::$context['show_attach_under_post'][$attachment['id']])) {
-				continue;
-			}
-
-			if (!$div_output) {
-				$div_output = true;
-
-				echo '
-							<div id="msg_', $message['id'], '_footer" class="attachments"', $ignoring ? ' style="display:none;"' : '', '>';
-			}
-
-			// Show a special box for unapproved attachments...
-			if ($attachment['is_approved'] != $last_approved_state) {
-				$last_approved_state = 0;
-				echo '
-								<fieldset>
-									<legend>
-										', Lang::getTxt('attach_awaiting_approve', file: 'General');
-
-				if (Utils::$context['can_approve']) {
-					echo '
-										&nbsp;[<a href="', Config::$scripturl, '?action=attachapprove;sa=all;mid=', $message['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('approve_all', file: 'General'), '</a>]';
-				}
-
-				echo '
-									</legend>';
-			}
-
-			echo '
-									<div class="attached">';
-
-			if ($attachment['is_image'] && !empty(Config::$modSettings['attachmentShowImages'])) {
-				echo '
-										<div class="attachments_top">';
-
-				if ($attachment['thumbnail']['has_thumb']) {
-					echo '
-											<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="atc_img"></a>';
-				} else {
-				echo '
-											<img src="' . $attachment['href'] . ';image" alt="" loading="lazy" class="atc_img">';
-				}
-
-				echo '
-										</div><!-- .attachments_top -->';
-			}
-
-			echo '
-										<div class="attachments_bot">
-											<a href="' . $attachment['href'] . '"><img src="' . Theme::$current->settings['images_url'] . '/icons/clip.png" class="centericon" alt="*">&nbsp;' . $attachment['name'] . '</a> ';
-
-			if (!$attachment['is_approved'] && Utils::$context['can_approve']) {
-				echo '
-											[<a href="', Config::$scripturl, '?action=attachapprove;sa=approve;aid=', $attachment['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('approve', file: 'General'), '</a>] [<a href="', Config::$scripturl, '?action=attachapprove;sa=reject;aid=', $attachment['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('delete', file: 'General'), '</a>] ';
-			}
-			echo '
-											<br>', $attachment['formatted_size'], ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . '<br>' . Lang::getTxt('attach_viewed', [$attachment['downloads']], file: 'General') : '<br>' . Lang::getTxt('attach_downloaded', [$attachment['downloads']], file: 'General')), '
-										</div><!-- .attachments_bot -->';
-
-			echo '
-									</div><!-- .attached -->';
-		}
-
-		// If we had unapproved attachments clean up.
-		if ($last_approved_state == 0) {
-			echo '
-								</fieldset>';
-		}
-
-		// Only do this if we output a div above - otherwise it'll break things
-		if ($div_output) {
-			echo '
-							</div><!-- #msg_[id]_footer -->';
-		}
-	}
-
-	echo '
-							<div class="under_message">';
-
-	// What about likes?
-	if (!empty(Config::$modSettings['enable_likes'])) {
-		echo '
-								<ul class="floatleft">';
-
-		if (!empty($message['likes']['can_like'])) {
-			echo '
-									<li class="smflikebutton" id="msg_', $message['id'], '_likes"', $ignoring ? ' style="display:none;"' : '', '>
-										<a href="', Config::$scripturl, '?action=likes;ltype=msg;sa=like;like=', $message['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="msg_like"><span class="main_icons ', $message['likes']['you'] ? 'unlike' : 'like', '"></span> ', Lang::getTxt($message['likes']['you'] ? 'unlike' : 'like', file: 'General'), '</a>
-									</li>';
-		}
-
-		if (!empty($message['likes']['count'])) {
-			Utils::$context['some_likes'] = true;
-			$count = $message['likes']['count'];
-			$base = 'likes_count';
-
-			if ($message['likes']['you']) {
-				$base = 'you_' . $base;
-				$count--;
-			}
-
-			$like_text = Lang::getTxt($base, ['url' => Config::$scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'num' => $count], file: 'General');
-
-			// Remove link if no cookies; session reference won't work
-			// Also, don't show link to guests
-			if (empty($_COOKIE) || User::$me->is_guest) {
-				$like_text = preg_replace('~</?a\b[^>]*>~', '', $like_text);
-			}
-
-			echo '
-									<li class="like_count smalltext">
-										', $like_text, '
-									</li>';
-		}
-
-		echo '
-								</ul>';
-	}
-
-	// Show the quickbuttons, for various operations on posts.
-	template_quickbuttons($message['quickbuttons'], 'post');
-
-	echo '
-							</div><!-- .under_message -->
-						</div><!-- .postarea -->
-						<div class="moderatorbar">';
-
-	// Are there any custom profile fields for above the signature?
-	if (!empty($message['custom_fields']['above_signature'])) {
-		echo '
-							<div class="custom_fields_above_signature">
-								<ul class="nolist">';
-
-		foreach ($message['custom_fields']['above_signature'] as $custom) {
-			echo '
-									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-								</ul>
-							</div>';
-	}
-
-	// Show the member's signature?
-	if (!empty($message['member']['signature']) && empty(Theme::$current->options['show_no_signatures']) && Utils::$context['signature_enabled']) {
-		echo '
-							<div class="signature" id="msg_', $message['id'], '_signature"', $ignoring ? ' style="display:none;"' : '', '>
-								', $message['member']['signature'], '
-							</div>';
-	}
-
-	// Are there any custom profile fields for below the signature?
-	if (!empty($message['custom_fields']['below_signature'])) {
-		echo '
-							<div class="custom_fields_below_signature">
-								<ul class="nolist">';
-
-		foreach ($message['custom_fields']['below_signature'] as $custom) {
-			echo '
-									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-								</ul>
-							</div>';
-	}
-
-	echo '
-						</div><!-- .moderatorbar -->
-					</div><!-- .post_wrapper -->
-				</div><!-- $message[css_class] -->
-				<hr class="post_separator">';
-}
-
-/**
- * The template for displaying the quick reply box.
- */
-function template_quickreply()
-{
-	echo '
-		<a id="quickreply_anchor"></a>
-		<div class="tborder" id="quickreply">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('quick_reply', file: 'General'), '
-				</h3>
-			</div>
-			<div id="quickreply_options">
-				<div class="roundframe">';
-
-	// Is the topic locked?
-	if (Utils::$context['is_locked']) {
-		echo '
-					<p class="alert smalltext">', Lang::getTxt('quick_reply_warning', file: 'General'), '</p>';
-	}
-
-	// Show a warning if the topic is old
-	if (!empty(Utils::$context['oldTopicError'])) {
-		echo '
-					<p class="alert smalltext">', Lang::getTxt('error_old_topic', [Config::$modSettings['oldTopicDays']], file: 'General'), '</p>';
-	}
-
-	// Does the post need approval?
-	if (!Utils::$context['can_reply_approved']) {
-		echo '
-					<p><em>', Lang::getTxt('wait_for_approval', file: 'General'), '</em></p>';
-	}
-
-	echo '
-					<form action="', Config::$scripturl, '?board=', Utils::$context['current_board'], ';action=post2" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" onsubmit="submitonce(this);">
-						<input type="hidden" name="topic" value="', Utils::$context['current_topic'], '">
-						<input type="hidden" name="subject" value="', Utils::$context['response_prefix'], Utils::$context['subject'], '">
-						<input type="hidden" name="icon" value="xx">
-						<input type="hidden" name="from_qr" value="1">
-						<input type="hidden" name="notify" value="', Utils::$context['is_marked_notify'] || !empty(Theme::$current->options['auto_notify']) ? '1' : '0', '">
-						<input type="hidden" name="not_approved" value="', !Utils::$context['can_reply_approved'], '">
-						<input type="hidden" name="goback" value="', empty(Theme::$current->options['return_to_post']) ? '0' : '1', '">
-						<input type="hidden" name="last_msg" value="', Utils::$context['topic_last_message'], '">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="seqnum" value="', Utils::$context['form_sequence_number'], '">';
-
-	// Guests just need more.
-	if (User::$me->is_guest) {
-		echo '
-						<dl id="post_header">
-							<dt>
-								', Lang::getTxt('name', file: 'General'), '
-							</dt>
-							<dd>
-								<input type="text" name="guestname" size="25" value="', Utils::$context['name'], '" required>
-							</dd>';
-
-		if (empty(Config::$modSettings['guest_post_no_email'])) {
-			echo '
-							<dt>
-								', Lang::getTxt('email', file: 'General'), '
-							</dt>
-							<dd>
-								<input type="email" name="email" size="25" value="', Utils::$context['email'], '" required>
-							</dd>';
-		}
-
-		echo '
-						</dl>';
-	}
-
-	template_control_richedit('quickReply', true, true);
-
-	// Is visual verification enabled?
-	if (Utils::$context['require_verification']) {
-		echo '
-						<div class="post_verification">
-							<strong>', Lang::getTxt('verification', file: 'General'), '</strong>
-							', template_control_verification(Utils::$context['visual_verification_id'], 'all'), '
-						</div>';
-	}
-
-	// Finally, the submit buttons.
-	echo '
-						<span id="post_confirm_buttons">
-							', template_control_richedit_buttons('quickReply'), '
-						</span>';
-	echo '
-					</form>
-				</div><!-- .roundframe -->
-			</div><!-- #quickreply_options -->
-		</div><!-- #quickreply -->
-		<br class="clear">';
-
-	if (Utils::$context['show_spellchecking']) {
-		echo '
-		<form action="', Config::$scripturl, '?action=spellcheck" method="post" accept-charset="UTF-8" name="spell_form" id="spell_form" target="spellWindow">
-			<input type="hidden" name="spellstring" value="">
-		</form>';
-	}
-
-	echo '
-		<script>
-			window.addEventListener("DOMContentLoaded", function() {
-				new QuickReply({
-					bDefaultCollapsed: false,
-					iTopicId: ', Utils::$context['current_topic'], ',
-					iStart: ', Utils::$context['start'], ',
-					sScriptUrl: smf_scripturl,
-					sImagesUrl: smf_images_url,
-					sContainerId: "quickreply_options",
-					sImageId: "quickReplyExpand",
-					sClassCollapsed: "toggle_up",
-					sClassExpanded: "toggle_down",
-					sJumpAnchor: "quickreply_anchor",
-					bIsFull: true
-				});
-			});
-			var oEditorID = "', Utils::$context['post_box_name'], '";
-		</script>';
-}
diff --git a/Themes/default/Errors.template.php b/Themes/default/Errors.template.php
deleted file mode 100644
index 9296e34a3db..00000000000
--- a/Themes/default/Errors.template.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-// @todo
-/*	This template file contains only the sub template fatal_error. It is
-	shown when an error occurs, and should show at least a back button and
-	Utils::$context['error_message'].
-*/
-
-/**
- * THis displays a fatal error message
- */
-function template_fatal_error()
-{
-	if (!empty(Utils::$context['simple_action'])) {
-		echo '
-	<strong>
-		', Utils::$context['error_title'], '
-	</strong><br>
-	<div ', Utils::$context['error_code'], 'class="padding">
-		', Utils::$context['error_message'], '
-	</div>';
-	} else {
-		echo '
-	<div id="fatal_error">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Utils::$context['error_title'], '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<div ', Utils::$context['error_code'], 'class="padding">
-				', Utils::$context['error_message'], '
-			</div>
-		</div>
-	</div>';
-
-		// Show a back button
-		echo '
-	<div class="centertext">
-		<a class="button floatnone" href="', Utils::$context['error_link'], '">', Lang::getTxt('back', file: 'General'), '</a>
-	</div>';
-	}
-}
-
-/**
- * This template handles the error log in the admin center.
- */
-function template_error_log()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';start=', Utils::$context['start'], Utils::$context['has_filter'] ? Utils::$context['filter']['href'] : '', '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="', Config::$scripturl, '?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('errorlog', file: 'General'), '
-				</h3>
-			</div>
-			<div class="information flow_hidden">
-				<div class="additional_row">';
-
-	// No errors, so just show a message and be done with it.
-	if (empty(Utils::$context['errors'])) {
-		echo '
-					', Lang::getTxt('errorlog_no_entries', file: 'Admin'), '
-				</div>
-			</div>
-		</form>';
-
-		return;
-	}
-
-	if (Utils::$context['has_filter']) {
-		echo '
-				<div class="infobox">
-					', Lang::getTxt('applying_filter', ['type' => Utils::$context['filter']['entity'], 'value' => Utils::$context['filter']['value']['html']], file: 'ManageMaintenance'), '
-				</div>';
-	}
-
-	echo '
-				<div class="floatright">
-					<input type="submit" name="removeSelection" value="', Lang::getTxt('remove_selection', file: 'ManageMaintenance'), '" data-confirm="', Lang::getTxt('remove_selection_confirm', file: 'ManageMaintenance'), '" class="button you_sure">
-					<input type="submit" name="delall" value="', (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results', file: 'ManageMaintenance') : Lang::getTxt('remove_all', file: 'Admin')), '" data-confirm="', (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results_confirm', file: 'ManageMaintenance') : Lang::getTxt('sure_about_errorlog_remove', file: 'ManageMaintenance')), '" class="button you_sure">
-					', (Utils::$context['has_filter'] ? '<a href="' . Config::$scripturl . '?action=admin;area=logs;sa=errorlog' . (Utils::$context['sort_direction'] == 'down' ? ';desc' : '') . '" class="button">' . Lang::getTxt('clear_filter', file: 'ManageMaintenance') . '</a>' : ''), '
-				</div>';
-
-	$error_types = [];
-
-	foreach (Utils::$context['error_types'] as $type => $details) {
-		$error_types[] = ($details['is_selected'] ? '<span class="main_icons right_arrow"></span> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : 'style="font-weight: normal;"') . ' title="' . $details['description'] . '">' . ($details['error_type'] === 'critical' ? '<span class="error">' . $details['label'] . '</span>' : $details['label']) . '</a>';
-	}
-
-	echo '
-				', Lang::getTxt('apply_filter_of_type', ['list' => implode(' | ', $error_types)], file: 'ManageMaintenance'), '
-				</div>
-			</div>
-			<div class="pagesection">
-				<div class="pagelinks">
-					', Utils::$context['page_index'], '
-				</div>
-				<div class="floatright" style="padding: 0 12px">
-					<label for="check_all"><strong>', Lang::getTxt('check_all', file: 'General'), '</strong></label>
-					<input type="checkbox" id="check_all" onclick="invertAll(this, this.form, \'delete[]\');">
-				</div>
-			</div>';
-
-	// We have some errors, must be some mods installed :P
-	foreach (Utils::$context['errors'] as $error) {
-		echo '
-			<div class="windowbg word_break">
-				<div class="counter" style="padding: 0 10px 10px 0">', $error['id'], '</div>
-				<div class="topic_details">
-					<span class="floatright">
-						<input type="checkbox" name="delete[]" value="', $error['id'], '">
-					</span>
-					<h5>
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? '' : ';desc', Utils::$context['has_filter'] ? Utils::$context['filter']['href'] : '', '" title="', Lang::getTxt('reverse_direction', file: 'ManageMaintenance'), '"><span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span></a> ', $error['time'], '
-					</h5>
-					<hr class="clear">
-				</div>
-				<div>
-					<div class="half_content">
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=id_member;value=', $error['member']['id'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_member', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a>
-						<strong>', $error['member']['link'], '</strong>';
-
-		if (!empty($error['member']['ip'])) {
-			echo '
-						<br>
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=ip;value=', $error['member']['ip'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_ip', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a>
-						<strong><a href="', Config::$scripturl, '?action=trackip;searchip=', $error['member']['ip'], '">', $error['member']['ip'], '</a></strong>';
-		}
-
-		if (!empty($error['member']['session'])) {
-			echo '
-						<br>
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=session;value=', $error['member']['session'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_session', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a> <a class="bbc_link" href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=session;value=', $error['member']['session'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_session', file: 'ManageMaintenance')]), '">', $error['member']['session'], '</a>';
-		}
-
-		echo '
-						<br>
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=url;value=', $error['url']['href'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_url', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a>
-						<a href="', $error['url']['html'], '" class="bbc_link word_break">', $error['url']['html'], '</a>';
-
-		if (!empty($error['file'])) {
-			echo '
-						<br>
-						<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=file;value=', $error['file']['search'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_file', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a> ', Lang::getTxt('error_file_and_line', ['file' => '<a class="bbc_link" href="' . $error['file']['href'] . '" onclick="return reqWin(this.href, 600, 480, false);">' . $error['file']['file'] . '</a>', 'line' => $error['file']['line']], file: 'ManageMaintenance');
-		}
-
-		echo '
-					</div>
-					<div class="half_content">
-						<strong class="floatright">
-							<span class="main_icons details"></span> <a class="bbc_link" href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog;backtrace=', $error['id'], '" onclick="return reqWin(this.href, 600, 480, false);">', Lang::getTxt('backtrace_title', file: 'ManageMaintenance'), '</a>
-						</strong>
-					</div>
-				</div>
-				<div class="post">
-					<br class="clear">
-					<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=error_type;value=', $error['error_type']['type'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_type', file: 'ManageMaintenance')]), '"><span class="main_icons filter"></span></a>', Lang::getTxt('error_type_name', ['type' => $error['error_type']['type'] === 'critical' ? '<span class="error">' . $error['error_type']['name'] . '</span>' : $error['error_type']['name']], file: 'ManageMaintenance'), '<br>
-					<a href="', Config::$scripturl, '?action=admin;area=logs;sa=errorlog', Utils::$context['sort_direction'] == 'down' ? ';desc' : '', ';filter=message;value=', $error['message']['href'], '" title="', Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_message', file: 'ManageMaintenance')]), '"><span class="main_icons filter floatleft"></span></a>
-					<div class="codeheader">' . Lang::getTxt('error_message', file: 'ManageMaintenance') . '</div><pre data-select-txt="' . Lang::getTxt('code_select', file: 'General') . '" data-shrink-txt="' . Lang::getTxt('code_shrink', file: 'General') . '" data-expand-txt="' . Lang::getTxt('code_expand', file: 'General') . '" class="bbc_code" style="white-space: pre-line; overflow-y: auto"><code>', $error['message']['html'], '</code></pre>
-				</div>
-			</div>';
-	}
-
-	echo '
-			<div class="pagesection">
-				<div class="pagelinks">
-					', Utils::$context['page_index'], '
-				</div>
-				<div class="floatright">
-					<input type="submit" name="removeSelection" value="', Lang::getTxt('remove_selection', file: 'ManageMaintenance'), '" data-confirm="', Lang::getTxt('remove_selection_confirm', file: 'ManageMaintenance'), '" class="button you_sure">
-					<input type="submit" name="delall" value="', (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results', file: 'ManageMaintenance') : Lang::getTxt('remove_all', file: 'Admin')), '" data-confirm="', (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results_confirm', file: 'ManageMaintenance') : Lang::getTxt('sure_about_errorlog_remove', file: 'ManageMaintenance')), '" class="button you_sure">
-				</div>
-			</div>';
-
-	if (Utils::$context['sort_direction'] == 'down') {
-		echo '
-			<input type="hidden" name="desc" value="1">';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-el_token_var'], '" value="', Utils::$context['admin-el_token'], '">
-		</form>';
-}
-
-/**
- * This template shows a snippet of code from a file and highlights which line caused the error.
- */
-function template_show_file()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Utils::$context['file_data']['file'], '</title>
-		', Theme::template_css(), '
-	</head>
-	<body>
-		<table class="errorfile_table">';
-
-	foreach (Utils::$context['file_data']['contents'] as $index => $line) {
-		$line_num = $index + Utils::$context['file_data']['min'];
-		$is_target = $line_num == Utils::$context['file_data']['target'];
-
-		echo '
-			<tr>
-				<td class="file_line', $is_target ? ' current">==&gt;' : '">', $line_num, ':</td>
-				<td ', $is_target ? 'class="current"' : '', '>', $line, '</td>
-			</tr>';
-	}
-	echo '
-		</table>
-	</body>
-</html>';
-}
-
-/**
- * This template handles showing attachment-related errors
- */
-function template_attachment_errors()
-{
-	echo '
-	<div>
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Utils::$context['error_title'], '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<div class="padding">
-				<div class="noticebox">',
-					Utils::$context['error_message'], '
-				</div>';
-
-	if (!empty(Utils::$context['back_link'])) {
-		echo '
-				<a class="button" href="', Config::$scripturl, Utils::$context['back_link'], '">', Lang::getTxt('back', file: 'General'), '</a>';
-	}
-
-	echo '
-				<span style="float: right; margin:.5em;"></span>
-				<a class="button" href="', Config::$scripturl, Utils::$context['redirect_link'], '">', Lang::getTxt('continue', file: 'General'), '</a>
-			</div>
-		</div>
-	</div>';
-}
-
-/**
- * This template shows a backtrace of the given error
- */
-function template_show_backtrace()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Lang::getTxt('backtrace_title', file: 'ManageMaintenance'), '</title>';
-
-	Theme::template_css();
-
-	echo '
-	</head>
-	<body class="padding">';
-
-	if (!empty(Utils::$context['error_info'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('error', file: 'ManageMaintenance'), '
-				</h3>
-			</div>
-			<div class="windowbg" id="backtrace">
-				<table class="table_grid">
-					<tbody>';
-
-		if (!empty(Utils::$context['error_info']['error_type'])) {
-			echo '
-						<tr class="title_bar">
-							<td><strong>', Lang::getTxt('error_type', file: 'ManageMaintenance'), '</strong></td>
-						</tr>
-						<tr class="windowbg">
-							<td>', ucfirst(Utils::$context['error_info']['error_type']), '</td>
-						</tr>';
-		}
-
-		if (!empty(Utils::$context['error_info']['message'])) {
-			echo '
-						<tr class="title_bar">
-							<td><strong>', Lang::getTxt('error_message', file: 'ManageMaintenance'), '</strong></td>
-						</tr>
-						<tr class="windowbg lefttext">
-							<td><code class="bbc_code" style="white-space: pre-line; overflow-y: auto">', Utils::$context['error_info']['message'], '</code></td>
-						</tr>';
-		}
-
-		if (!empty(Utils::$context['error_info']['file'])) {
-			echo '
-						<tr class="title_bar">
-							<td><strong>', Lang::getTxt('file', file: 'General'), '</strong></td>
-						</tr>
-						<tr class="windowbg">
-							<td>', Utils::$context['error_info']['file'], '</td>
-						</tr>';
-		}
-
-		if (!empty(Utils::$context['error_info']['line'])) {
-			echo '
-						<tr class="title_bar">
-							<td><strong>', Lang::getTxt('line', file: 'General'), '</strong></td>
-						</tr>
-						<tr class="windowbg">
-							<td>', Utils::$context['error_info']['line'], '</td>
-						</tr>';
-		}
-
-		if (!empty(Utils::$context['error_info']['url'])) {
-			echo '
-						<tr class="title_bar">
-							<td><strong>', Lang::getTxt('error_url', file: 'ManageMaintenance'), '</strong></td>
-						</tr>
-						<tr class="windowbg word_break">
-							<td>', Utils::$context['error_info']['url'], '</td>
-						</tr>';
-		}
-
-		echo '
-					</tbody>
-				</table>
-			</div>';
-	}
-
-	if (!empty(Utils::$context['error_info']['backtrace'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('backtrace_title', file: 'ManageMaintenance'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<ul class="padding">';
-
-		foreach (Utils::$context['error_info']['backtrace'] as $key => $value) {
-			//Check for existing
-			if (!property_exists($value, 'file') || empty($value->file)) {
-				$value->file = Lang::getTxt('unknown', file: 'General');
-			}
-
-			if (!property_exists($value, 'line') || empty($value->line)) {
-				$value->line = -1;
-			}
-
-			echo '
-					<li class="backtrace">',
-					Lang::getTxt(
-						'backtrace_info' . ($value->file == Lang::getTxt('unknown', file: 'General') && $value->line == -1 ? '_internal_function' : ''),
-						[
-							$key,
-							(!empty($value->class) ? $value->class . $value->type : '') . $value->function,
-							$value->file,
-							$value->line,
-							base64_encode($value->file),
-							Config::$scripturl,
-						],
-						file: 'ManageMaintenance',
-					),
-					'</li>';
-		}
-
-		echo '
-				</ul>
-			</div>';
-	}
-
-	echo '
-	</body>
-</html>';
-}
diff --git a/Themes/default/EventEditor.template.php b/Themes/default/EventEditor.template.php
deleted file mode 100644
index 5f5e30b9a74..00000000000
--- a/Themes/default/EventEditor.template.php
+++ /dev/null
@@ -1,734 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Calendar\Event;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Topic;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * Template for the event options fieldset that is used when creating an event.
- *
- * Used by Calendar.template.php and Post.template.php
- */
-function template_event_options()
-{
-	echo '
-				<fieldset id="event_options">
-					<legend>', Lang::getTxt('calendar_event_options', file: 'Calendar'), '</legend>
-					<input type="hidden" name="calendar" value="1">
-					<input type="hidden" name="eventid" value="', Utils::$context['event']->id, '">
-					<input type="hidden" name="recurrenceid" value="', Utils::$context['event']->selected_occurrence->id, '">';
-
-	// Allow the user to link events to topics.
-	if (
-		Utils::$context['event']->type === Event::TYPE_EVENT
-		&& (
-			Utils::$context['event']->new
-			|| Utils::$context['event']->selected_occurrence->is_first
-		)
-	) {
-		if (empty(Utils::$context['event']->topic)) {
-			template_event_board();
-		} elseif (Utils::$context['event']->topic === (Topic::$topic_id ?? NAN)) {
-			template_event_unlink();
-		} elseif (Utils::$context['event']->new) {
-			template_event_link_to();
-		}
-	}
-
-	template_event_new();
-
-	echo '
-				</fieldset>';
-}
-
-/**
- * Template for linking an existing topic to an event.
- */
-function template_event_link_to()
-{
-	// If user cannot edit existing events, we don't need to bother showing these options at all.
-	if (!User::$me->allowedTo('calendar_edit_any') && !User::$me->allowedTo('calendar_edit_own')) {
-		return;
-	}
-
-	// If user can both create and edit events, show both options.
-	if (User::$me->allowedTo('calendar_post')) {
-		echo '
-					<dl id="event_link_to">
-						<dt class="clear">
-							' . Lang::getTxt('calendar_link_to', file: 'Calendar') . '
-						</dt>
-						<dd>
-							<label>
-								<input type="radio" id="event_link_to_new" name="event_link_to" value="new" checked>
-								<span>' . Lang::getTxt('calendar_event_new', file: 'Calendar') . '</span>
-							</label>
-							<label>
-								<input type="radio" name="event_link_to" value="existing">
-								<span>' . Lang::getTxt('calendar_event_existing', file: 'Calendar') . '</span>
-							</label>
-						</dd>
-					</dl>';
-	}
-
-	// Let the user specify an existing event to link to.
-	echo '
-					<dl id="event_id_to_link">
-						<dt class="clear">
-							' . Lang::getTxt('calendar_link_event_id', file: 'Calendar') . '
-						</dt>
-						<dd>
-							<input type="text" name="event_id_to_link">
-						</dd>
-					</dl>';
-}
-
-/**
- * Template for unlinking a topic and an event.
- */
-function template_event_unlink()
-{
-	if (empty(Utils::$context['event']->topic) || empty(Config::$modSettings['cal_allow_unlinked'])) {
-		return;
-	}
-
-	echo '
-					<dl>
-						<dt class="clear">
-							' . Lang::getTxt('calendar_unlink', file: 'Calendar') . '
-						</dt>
-						<dd>
-							<input type="checkbox" name="unlink">
-						</dd>
-					</dl>
-					<hr class="clear">';
-}
-
-/**
- * Template for choosing a board to create a linked topic in.
- */
-function template_event_board()
-{
-	// If user cannot create new events, skip this.
-	if (!User::$me->allowedTo('calendar_post')) {
-		return;
-	}
-
-	echo '
-					<dl id="topic_link_to">
-						<dt class="clear">
-							' . Lang::getTxt('calendar_post_in', file: 'Calendar') . '
-						</dt>
-						<dd>';
-
-	if (!empty(Config::$modSettings['cal_allow_unlinked'])) {
-		echo '
-							<label>
-								<input type="radio" id="link_to_none" name="link_to" value="none"' . (empty(Utils::$context['event']->topic) ? ' checked' : '') . '>
-								' . Lang::getTxt('calendar_only', file: 'Calendar') . '
-							</label>';
-	}
-
-	if (!empty(Utils::$context['event']->categories)) {
-		echo '
-							<label>
-								<input type="radio" id="link_to_board" name="link_to" value="board"' . (empty(Utils::$context['event']->topic) && empty(Config::$modSettings['cal_allow_unlinked']) ? ' checked' : '') . '>
-								' . Lang::getTxt('new_topic', file: 'General') . '
-							</label>';
-	}
-
-	echo '
-							<label>
-								<input type="radio" id="link_to_topic" name="link_to" value="topic"' . (!empty(Utils::$context['event']->topic) ? ' checked' : '') . '>
-								' . Lang::getTxt('calendar_topic_existing', file: 'Calendar') . '
-							</label>
-						</dd>
-					</dl>';
-
-
-	if (!empty(Utils::$context['event']->categories)) {
-		echo '
-					<dl id="event_board">
-						<dt class="clear">
-							<label>' . Lang::getTxt('board_name', file: 'General') . '</label>
-						</dt>
-						<dd>';
-		echo '
-							<select name="board"', empty(Utils::$context['event']->board) ? ' disabled' : '', '>';
-
-		foreach (Utils::$context['event']->categories as $category) {
-			echo '
-								<optgroup label="', $category['name'], '">';
-
-			foreach ($category['boards'] as $board) {
-				echo '
-									<option value="', $board['id'], '"', $board['id'] == Utils::$context['event']->board ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
-			}
-
-			echo '
-								</optgroup>';
-		}
-
-		echo '
-							</select>
-						</dd>
-					</dl>';
-	}
-
-	echo '
-					<dl id="event_topic">
-						<dt class="clear">
-							<label>' . Lang::getTxt('calendar_link_topic_id', file: 'Calendar') . '</label>
-						</dt>
-						<dd>
-							<input type="text" name="topic" value="' . (!empty(Utils::$context['event']->topic) ? Utils::$context['event']->topic : '') . '">
-						</dd>
-					</dl>
-					<hr class="clear">';
-}
-
-/**
- * Template for entering info about a new event.
- */
-function template_event_new()
-{
-	// If user cannot create new events, skip this.
-	if (!User::$me->allowedTo('calendar_post')) {
-		return;
-	}
-
-	// Basic event info
-	echo '
-					<div id="event_new">
-						<dl id="event_basic_info">
-							<dt class="clear">
-								<label', isset(Utils::$context['post_error']['no_event']) ? ' class="error"' : '', '>', Lang::getTxt('calendar_event_title', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<input type="text" id="evtitle" name="evtitle" maxlength="255" value="', Utils::$context['event']->selected_occurrence->title, '"', isset(Utils::$context['post_error']['no_event']) ? ' class="error"' : '', '>
-							</dd>
-
-							<dt class="clear">
-								<label>', Lang::getTxt('location', file: 'General'), '</label>
-							</dt>
-							<dd>
-								<input type="text" name="event_location" id="event_location" maxlength="255" value="', Utils::$context['event']->selected_occurrence->location, '">
-							</dd>
-						</dl>';
-
-	// Date and time info.
-	echo '
-						<hr class="clear">
-						<dl id="event_date_and_time">
-							<dt class="clear">
-								<label for="allday">', Lang::getTxt('calendar_allday', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<input type="checkbox" name="allday" id="allday"', !empty(Utils::$context['event']->allday) ? ' checked' : '', !empty(Utils::$context['event']->special_rrule) || (!Utils::$context['event']->new && !Utils::$context['event']->selected_occurrence->is_first) ? ' disabled' : '', '>
-
-							</dd>
-
-							<dt class="clear">
-								<label>', Lang::getTxt('start', file: 'General'), '</label>
-							</dt>
-							<dd>
-								<input type="date" name="start_date" id="start_date" value="', Utils::$context['event']->selected_occurrence->start->format('Y-m-d'), '" class="date_input start"', !empty(Utils::$context['event']->special_rrule) ? ' disabled data-force-disabled' : '', '>
-								<input type="time" name="start_time" id="start_time" value="', Utils::$context['event']->selected_occurrence->start->format('H:i'), '" class="time_input start"', !empty(Utils::$context['event']->allday) || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '', !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '', '>
-							</dd>
-
-							<dt class="clear">
-								<label>', Lang::getTxt('end', file: 'General'), '</label>
-							</dt>
-							<dd>
-								<input type="date" name="end_date" id="end_date" value="', Utils::$context['event']->selected_occurrence->end->format('Y-m-d'), '" class="date_input end"', Config::$modSettings['cal_maxspan'] == 1 || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '', !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '', '>
-								<input type="time" name="end_time" id="end_time" value="', Utils::$context['event']->selected_occurrence->end->format('H:i'), '" class="time_input end"', !empty(Utils::$context['event']->allday) || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '', !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '', '>
-							</dd>
-
-							<dt id="tz_dt" class="clear">
-								<label>', Lang::getTxt('calendar_timezone', file: 'Calendar'), '</label>
-							</dt>
-							<dd id="tz_dd">';
-
-	template_timezone_select(
-		'tz',
-		Utils::$context['event']->selected_occurrence->tzid,
-		!empty(Utils::$context['event']->special_rrule) ? 2 : (int) Utils::$context['event']->allday,
-	);
-
-	echo '
-							</dd>
-						</dl>';
-
-	// If this is a new event or the first occurrence of an existing event, show the RRULE stuff.
-	if (Utils::$context['event']->new || Utils::$context['event']->selected_occurrence->is_first) {
-		template_rrule();
-	} else {
-		template_occurrence_options();
-	}
-
-	echo '
-					</div>';
-
-}
-
-/**
- * Template used when editing a single occurrence of an event.
- */
-function template_occurrence_options()
-{
-	if (Utils::$context['event']->selected_occurrence->can_affect_future) {
-		echo '
-						<dl id="occurrence_options">
-							<dt class="clear">
-								', Lang::getTxt('calendar_repeat_adjustment_label', file: 'Calendar'), '
-							</dt>
-							<dd>
-								<label>
-									<input type="radio" name="affects_future" value="0" required checked>
-									<span>', Lang::getTxt('calendar_repeat_adjustment_this_only', file: 'Calendar'), '</span>
-								</label>
-								<br>
-								<label>
-									<input type="radio" name="affects_future" value="1" required class="you_sure" data-confirm="' . Lang::getTxt('calendar_repeat_adjustment_confirm', file: 'Calendar') . '">
-									<span>', Lang::getTxt('calendar_repeat_adjustment_this_and_future', file: 'Calendar'), '</span>
-								</label>
-							</dd>
-						</dl>';
-	}
-}
-
-/**
- * Template for the recurrence rule options for events.
- */
-function template_rrule()
-{
-	// Recurring event options.
-	echo '
-						<dl id="rrule_options">';
-
-	// RRULE presets.
-	echo '
-							<dt class="clear">
-								<label>', Lang::getTxt('calendar_repeat_recurrence_label', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<select name="RRULE" id="rrule" class="rrule_input">';
-
-	foreach (Utils::$context['event']->rrule_presets as $rrule => $description) {
-		if (is_array($description)) {
-			echo '
-									<optgroup label="', $rrule, '">';
-
-			foreach ($description as $special_rrule => $special_rrule_description) {
-				echo '
-											<option value="', $special_rrule, '"', $special_rrule === Utils::$context['event']->rrule_preset || $special_rrule === 'custom' && !isset(Utils::$context['event']->rrule_presets[Utils::$context['event']->rrule_preset]) ? ' selected' : '', '>', $special_rrule_description, '</option>';
-			}
-
-			echo '
-									</optgroup>';
-		} else {
-			echo '
-									<option value="', $rrule, '"', $rrule === Utils::$context['event']->rrule_preset || $rrule === 'custom' && !isset(Utils::$context['event']->rrule_presets[Utils::$context['event']->rrule_preset]) ? ' selected' : '', '>', $description, '</option>';
-		}
-	}
-
-	echo '
-								</select>';
-
-	// When to end the recurrence.
-	if (empty(Utils::$context['event']->special_rrule)) {
-		echo '
-								<span id="rrule_end" class="rrule_input_wrapper">
-									<select id="end_option" class="rrule_input">
-										<option value="forever">', Lang::getTxt(['calendar_repeat_until_options', 'forever'], file: 'Calendar'), '</option>
-										<option value="until"', !empty(Utils::$context['event']->recurrence_iterator->getRRule()->until) ? ' selected' : '', '>', Lang::getTxt(['calendar_repeat_until_options', 'until'], file: 'Calendar'), '</option>
-										<option value="count"', (Utils::$context['event']->recurrence_iterator->getRRule()->count ?? 0) > 1 ? ' selected' : '', '>', Lang::getTxt(['calendar_repeat_until_options', 'count'], file: 'Calendar'), '</option>
-									</select>
-									<input type="date" name="UNTIL" id="until" class="rrule_input"', !empty(Utils::$context['event']->recurrence_iterator->getRRule()->until) ? ' value="' . Utils::$context['event']->recurrence_iterator->getRRule()->until->format('Y-m-d') . '"' : ' disabled', '>
-									<input type="number" name="COUNT" id="count" class="rrule_input" min="1"', (Utils::$context['event']->recurrence_iterator->getRRule()->count ?? 0) > 1 ? ' value="' . Utils::$context['event']->recurrence_iterator->getRRule()->count . '"' : ' value="1" disabled', '>
-								</span>';
-	}
-
-	echo '
-							</dd>
-						</dl>';
-
-
-	if (!empty(Utils::$context['event']->special_rrule) || (Utils::$context['event']->new && Utils::$context['event']->type === Event::TYPE_HOLIDAY)) {
-		echo '
-						<dl id="special_rrule_options">
-							<dt class="clear">
-								<a id="special_rrule_modifier_help" href="' . Config::$scripturl . '?action=helpadmin;help=special_rrule_modifier" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="Help"></span></a>
-								<label>', Lang::getTxt('calendar_repeat_special_rrule_modifier', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<input type="text" name="special_rrule_modifier" id="special_rrule_modifier" placeholder="', Lang::getTxt('calendar_repeat_offset_examples', file: 'Calendar'), '" value="' . (Utils::$context['event']->special_rrule['modifier'] ?? '') . '">
-							</dd>
-						</dl>';
-	}
-
-
-	if (empty(Utils::$context['event']->special_rrule)) {
-		// Custom frequency and interval (e.g. "every 2 weeks")
-		echo '
-						<dl id="freq_interval_options" class="rrule_input_wrapper">
-							<dt class="clear">
-								<label>', Lang::getTxt('calendar_repeat_interval_label', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<input type="number" name="INTERVAL" value="', Utils::$context['event']->recurrence_iterator->getRRule()->interval, '" min="1" class="rrule_input" disabled>
-								<select name="FREQ" id="freq" class="rrule_input">';
-
-		foreach (Utils::$context['event']->frequency_units as $freq => $unit) {
-			echo '
-									<option value="', $freq, '"', Utils::$context['event']->recurrence_iterator->getRRule()->freq === $freq ? ' selected' : '', '>', $unit, '</option>';
-		}
-
-		echo '
-								</select>
-							</dd>
-						</dl>';
-
-		// Custom yearly options.
-		echo '
-						<dl id="yearly_options" class="rrule_input_wrapper">
-							<dt class="clear">
-								<label>', Lang::getTxt('calendar_repeat_bymonth_label', file: 'Calendar'), '</label>
-							</dt>
-							<dd>
-								<div class="rrule_input_row">';
-
-		for ($i = 1; $i <= 12; $i++) {
-			echo '
-									<label class="bymonth_label">
-										<input type="checkbox" name="BYMONTH[]" value="' . $i . '" id="bymonth_', $i,'" class="rrule_input" disabled>
-										<span>' . Lang::getTxt(['months_short', $i], file: 'General') . '</span>
-									</label>';
-
-			if ($i % 6 === 0) {
-				echo '
-								</div>
-								<div class="rrule_input_row">';
-			}
-		}
-
-		echo '
-								</div>
-							</dd>
-						</dl>';
-
-		// Custom monthly options.
-		echo '
-						<dl id="monthly_options" class="rrule_input_wrapper">';
-
-		// Custom monthly: by day of month.
-		echo '
-							<dt class="clear" id="dt_monthly_option_type_bymonthday">
-								<label>
-									', Lang::getTxt('calendar_repeat_bymonthday_label', file: 'Calendar'), '
-									<input type="radio" name="monthly_option_type" id="monthly_option_type_bymonthday"', !empty(Utils::$context['event']->recurrence_iterator->getRRule()->bymonthday) ? ' checked' : '', '>
-								</label>
-							</dt>
-							<dd id="dd_monthly_option_type_bymonthday">
-								<div id="month_bymonthday_options" class="rrule_input">
-									<div class="rrule_input inline_block">
-										<div class="rrule_input_row">';
-
-		for ($i = 1; $i <= 31; $i++) {
-			echo '
-											<label class="bymonthday_label">
-												<input type="checkbox" name="BYMONTHDAY[]" id="bymonthday_' . $i . '" value="' . $i . '"  class="rrule_input" disabled> <span>' . $i . '</span>
-											</label>';
-
-			if ($i % 7 === 0) {
-				echo '
-										</div>
-										<div class="rrule_input_row">';
-			}
-		}
-
-		echo '
-										</div>
-									</div>
-								</div>
-							</dd>';
-
-		// Custom monthly: by weekday and offset (e.g. "the second Tuesday")
-		echo '
-							<dt class="clear">
-								<label>
-									', Lang::getTxt('calendar_repeat_byday_label', file: 'Calendar'), '
-									<input type="radio" name="monthly_option_type" id="monthly_option_type_byday"', !empty(Utils::$context['event']->recurrence_iterator->getRRule()->byday) ? ' checked' : '', '>
-								</label>
-							</dt>
-							<dd id="month_byday_options">
-								<div class="rrule_input clear">';
-
-		foreach (Utils::$context['event']->byday_items as $byday_item_key => $byday_item) {
-			echo '
-									<div>
-										<select id="byday_num_select_', $byday_item_key, '" name="BYDAY_num[', $byday_item_key, ']" class="rrule_input byday_num_select" disabled>';
-
-			foreach (Utils::$context['event']->byday_num_options as $num => $ordinal) {
-				if (isset($prev_num) && ($num < 0) !== ($prev_num < 0)) {
-					echo '
-											<option disabled>------</option>';
-			}
-
-			echo '
-											<option value="', $num, '" class="byday_num_', ($num < 0 ? 'neg' : '') . abs($num), '"', $num == $byday_item['num'] ? ' selected' : '', '>', $ordinal, '</option>';
-
-				$prev_num = $num;
-			}
-			unset($prev_num);
-
-			echo '
-										</select>
-										<select id="byday_name_select_', $byday_item_key, '" name="BYDAY_name[', $byday_item_key, ']" class="rrule_input byday_name_select" disabled>';
-
-			foreach (Utils::$context['event']->sorted_weekdays as $weekday) {
-				echo '
-											<option value="', $weekday['abbrev'], '" class="byday_name_', $weekday['abbrev'], '"', $weekday['abbrev'] == $byday_item['name'] ? ' selected' : '', '>', $weekday['long'], '</option>';
-			}
-
-			echo '
-											<option disabled>------</option>
-											<option value="MO,TU,WE,TH,FR">', Lang::getTxt('calendar_repeat_weekday', file: 'Calendar'), '</option>
-											<option value="SA,SU">', Lang::getTxt('calendar_repeat_weekend_day', file: 'Calendar'), '</option>
-										</select>
-									</div>';
-		}
-
-		echo '
-								</div>
-								<div>
-									<a id="event_add_byday" class="rrule_input button floatnone">', Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar'), '</a>
-								</div>
-								<template id="byday_template">
-									<div>
-										<select name="BYDAY_num[-1]" class="rrule_input byday_num_select">';
-
-		foreach (Utils::$context['event']->byday_num_options as $num => $ordinal) {
-			if (isset($prev_num) && ($num < 0) !== ($prev_num < 0)) {
-				echo '
-											<option disabled>------</option>';
-		}
-
-		echo '
-											<option value="', $num, '" class="byday_num_', ($num < 0 ? 'neg' : '') . abs($num), '">', $ordinal, '</option>';
-
-			$prev_num = $num;
-		}
-		unset($prev_num);
-
-		echo '
-										</select>
-										<select name="BYDAY_name[-1]" class="rrule_input byday_name_select">';
-
-		foreach (Utils::$context['event']->sorted_weekdays as $weekday) {
-			echo '
-											<option value="', $weekday['abbrev'], '" class="byday_name_', $weekday['abbrev'], '">', $weekday['long'], '</option>';
-		}
-
-		echo '
-											<option disabled>------</option>
-											<option value="MO,TU,WE,TH,FR">', Lang::getTxt('calendar_repeat_weekday', file: 'Calendar'), '</option>
-											<option value="SA,SU">', Lang::getTxt('calendar_repeat_weekend_day', file: 'Calendar'), '</option>
-										</select>
-									</div>
-								</template>
-							</dd>
-						</dl>';
-
-		// Custom weekly options.
-		echo '
-						<dl id="weekly_options" class="rrule_input_wrapper">
-							<dt class="clear">
-								<label>', Lang::getTxt('calendar_repeat_byday_label', file: 'Calendar'), '</label>
-							</dt>
-							<dd class="rrule_input_row">';
-
-		foreach (Utils::$context['event']->sorted_weekdays as $weekday) {
-			echo '
-									<label class="byday_label">
-										<input type="checkbox" name="BYDAY[]" id="byday_', $weekday['abbrev'], '" value="', $weekday['abbrev'], '"  class="rrule_input"', in_array($weekday['abbrev'], Utils::$context['event']->recurrence_iterator->getRRule()->byday ?? []) ? ' checked' : '', ' disabled>
-										<span>', $weekday['short'], '</span>
-									</label>';
-		}
-
-		echo '
-							</dd>
-						</dl>';
-	}
-
-	// Advanced options.
-	echo '
-						<details id="advanced_options" class="rrule_input_wrapper"' . (!empty(Utils::$context['event']->recurrence_iterator->getRDates()) || !empty(Utils::$context['event']->recurrence_iterator->getEXDates()) ? ' open' : '') . '>
-							<summary>', Lang::getTxt('calendar_repeat_advanced_options_label', file: 'Calendar'), '</summary>';
-
-	// Arbitrary dates to add to the recurrence set.
-	echo '
-							<dl id="rdates">
-								<dt class="clear">
-									<label>', Lang::getTxt('calendar_repeat_rdates_label', file: 'Calendar'), '</label>
-								</dt>
-								<dd>
-									<div id="rdate_list">';
-
-	foreach (Utils::$context['event']->recurrence_iterator->getRDates() as $key => $rdate) {
-		$rdate = new SMF\Time($rdate);
-		$rdate->setTimezone(Utils::$context['event']->start->getTimezone());
-
-		echo '
-										<div>
-											<input type="date" name="RDATE_date[', $key, ']" value="', $rdate->format('Y-m-d'), '" class="date_input">
-											<input type="time" name="RDATE_time[', $key, ']" value="', $rdate->format('H:i'), '" class="time_input">
-											<a class="main_icons delete"></a>
-										</div>';
-	}
-
-	echo '
-									</div>
-									<div>
-										<a id="event_add_rdate" data-container="rdate_list" data-inputname="RDATE" class="button floatnone">', Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar'), '</a>
-									</div>
-								</dd>
-							</dl>';
-
-	// Dates to exclude from the recurrence set.
-	echo '
-							<dl id="exdates">
-								<dt class="clear">
-									<label>', Lang::getTxt('calendar_repeat_exdates_label', file: 'Calendar'), '</label>
-								</dt>
-								<dd>
-									<div id="exdate_list">';
-
-	foreach (Utils::$context['event']->recurrence_iterator->getExDates() as $key => $exdate) {
-		$exdate = new SMF\Time($exdate);
-		$exdate->setTimezone(Utils::$context['event']->start->getTimezone());
-
-		echo '
-										<div>
-											<input type="date" name="EXDATE_date[', $key, ']" value="', $exdate->format('Y-m-d'), '" class="date_input">
-											<input type="time" name="EXDATE_time[', $key, ']" value="', $exdate->format('H:i'), '" class="time_input">
-											<a class="main_icons delete"></a>
-										</div>';
-	}
-
-	echo '
-									</div>
-									<div>
-										<a id="event_add_exdate" data-container="exdate_list" data-inputname="EXDATE" class="button floatnone">', Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar'), '</a>
-									</div>
-									<template id="additional_dates_template">
-										<div>
-											<input type="date" name="" value="" class="date_input">
-											<input type="time" name="" value="" class="time_input">
-											<a class="main_icons delete"></a>
-										</div>
-									</template>
-								</dd>
-							</dl>';
-
-	echo '
-						</details>';
-}
-
-/**
- * Template to show linked events.
- */
-function template_linked_events()
-{
-	if (empty(Utils::$context['linked_calendar_events'])) {
-		return;
-	}
-
-	echo '
-				<div class="information events">
-					<ul>';
-
-	foreach (Utils::$context['linked_calendar_events'] as $event) {
-		echo '
-						<li>
-							<strong class="event_title"><a href="', Config::$scripturl, '?action=calendar;event=', $event->id, (!$event->is_first ? ';start_date=' . $event->start->date : ''), '">', $event->title, '</a></strong>';
-
-		if ($event->can_edit) {
-			echo ' <a href="' . $event->modify_href . '"><span class="main_icons calendar_modify" title="', Lang::getTxt('calendar_edit', file: 'Calendar'), '"></span></a>';
-		}
-
-		if ($event->can_export) {
-			echo ' <a href="' . $event->export_href . '"><span class="main_icons calendar_export" title="', Lang::getTxt('calendar_export', file: 'Calendar'), '"></span></a>';
-		}
-
-		echo '
-							<br>';
-
-		if (!empty($event->allday)) {
-			echo '<time datetime="' . $event->start->iso_gmdate . '">', trim($event->start->date_local), '</time>', ($event->start->date != $event->end->date) ? ' &ndash; <time datetime="' . $event->end->iso_gmdate . '">' . trim($event->end->date_local) . '</time>' : '';
-		} else {
-			// Display event info relative to user's local timezone
-			echo '<time datetime="' . $event->start->iso_gmdate . '">', trim($event->start->date_local), ', ', trim($event->start->time_local), '</time> &ndash; <time datetime="' . $event->end->iso_gmdate . '">';
-
-			if ($event->start->date_local != $event->end->date_local) {
-				echo trim($event->end->date_local) . ', ';
-			}
-
-			echo trim($event->end->time_local);
-
-			// Display event info relative to original timezone
-			if ($event->start->date_local . $event->start->time_local != $event->start->date_orig . $event->start->time_orig) {
-				echo '</time> (<time datetime="' . $event->start->iso_gmdate . '">';
-
-				if ($event->start->date_orig != $event->start->date_local || $event->end->date_orig != $event->end->date_local || $event->start->date_orig != $event->end->date_orig) {
-					echo trim($event->start->date_orig), ', ';
-				}
-
-				echo trim($event->start->time_orig), '</time> &ndash; <time datetime="' . $event->end->iso_gmdate . '">';
-
-				if ($event->start->date_orig != $event->end->date_orig) {
-					echo trim($event->end->date_orig) . ', ';
-				}
-
-				echo trim($event->end->time_orig), ' ', $event->start->tz_abbrev, '</time>)';
-			}
-			// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-			else {
-				echo ' ', $event->start->tz_abbrev, '</time>';
-			}
-		}
-
-		if (!empty($event->location)) {
-			echo '
-							<br>', $event->location;
-		}
-
-		$rrule_description = $event->getParentEvent()->recurrence_iterator->getRRule()->getDescription($event);
-
-		if (!empty($rrule_description)) {
-			echo '
-							<br>', $rrule_description;
-		}
-
-		echo '
-						</li>';
-	}
-
-	echo '
-					</ul>
-				</div>';
-}
diff --git a/Themes/default/GenericControls.template.php b/Themes/default/GenericControls.template.php
deleted file mode 100644
index da7ee3d3442..00000000000
--- a/Themes/default/GenericControls.template.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Editor;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-use SMF\Verifier;
-
-/**
- * Renders a rich-text editor, including BBC buttons and smileys if enabled.
- *
- * This function sets up a textarea as a rich-text editor using SCEditor.
- * The `$smiley_container` and `$bbc_container` parameters control the visibility
- * and source of smiley and BBC containers, respectively.
- *
- * @param string $editor_id The unique ID of the editor.
- * @param null|bool|string $smiley_container Controls the smiley container:
- *   - `null`: Hides the smiley section.
- *   - `true`: Generates the container dynamically using JavaScript.
- *   - `string`: Specifies the HTML element ID for the smiley container.
- * @param null|bool|string $bbc_container Controls the BBC container:
- *   - `null`: Hides the BBC buttons.
- *   - `true`: Generates the container dynamically using JavaScript.
- *   - `string`: Specifies the HTML element ID for the BBC container.
- */
-function template_control_richedit(string $editor_id, bool|string|null $smiley_container = null, bool|string|null $bbc_container = null): void
-{
-	$editor_context = Editor::$loaded[$editor_id];
-
-	echo '
-		<textarea class="editor" name="', $editor_id, '" id="', $editor_id, '" cols="600" style="width: ', $editor_context['width'], '; height: ', $editor_context['height'], ';', isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? 'border: 1px solid red;' : '', '"', !empty(Utils::$context['editor']['required']) ? ' required' : '', '>', $editor_context['value'], '</textarea>
-		<input type="hidden" name="', $editor_id, '_mode" id="', $editor_id, '_mode" value="0">
-		<script>
-			document.addEventListener("DOMContentLoaded", function () {
-				var textarea = document.getElementById("', $editor_id, '"), options = ', json_encode($editor_context['sce_options'], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), ';
-				sceditor.create(textarea, options, ' . Utils::escapeJavaScript($bbc_container) . ', ' . Utils::escapeJavaScript($smiley_container) . ');
-			});
-		</script>';
-}
-
-/**
- * Renders the buttons section below a rich-text editor.
- *
- * Displays form buttons such as "Post" or "Preview" and integrates
- * functionality like auto-saving drafts if enabled.
- *
- * @param string $editor_id The unique ID of the editor for which buttons are displayed.
- */
-function template_control_richedit_buttons(string $editor_id): void
-{
-	$editor_context = Editor::$loaded[$editor_id];
-
-	echo '
-		<span class="smalltext">
-			', Utils::$context['shortcuts_text'], '
-		</span>
-		<span class="post_button_container">';
-
-	foreach (Utils::$context['richedit_buttons'] as $name => $button) {
-		if ($name == 'preview') {
-			$button['value'] = $editor_context['labels']['preview_button'] ?? $button['value'];
-			$button['show'] = $editor_context['preview_type'];
-		}
-
-		if ($button['show']) {
-			echo '
-		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
-		}
-	}
-
-	echo '
-		<input type="submit" value="', $editor_context['labels']['post_button'] ?? Lang::getTxt('post', file: 'General'), '" name="post" onclick="return submitThisOnce(this);" accesskey="s" class="button">
-		</span>';
-
-	// Include auto-save feature if drafts are enabled.
-	if (!empty(Utils::$context['drafts_save']) && !empty(Utils::$context['drafts_autosave'])) {
-		echo '
-		<span class="righttext padding" style="display: block">
-			<span id="throbber" style="display:none"><img src="', Theme::$current->settings['images_url'], '/loading_sm.gif" alt="" class="centericon"></span>
-			<span id="draft_lastautosave"></span>
-		</span>';
-	}
-}
-
-/**
- * Displays a verification form with CAPTCHA or question-based challenges.
- *
- * Used to validate user input for forms, supporting various verification
- * mechanisms such as CAPTCHA images, reCAPTCHA, and custom questions.
- *
- * @param int|string $verify_id The unique identifier for the verification control.
- * @param string $display_type Determines how to display items:
- *   - `'single'`: Displays one item at a time (e.g., in a loop).
- *   - `'all'`: Displays all items together.
- * @param bool $reset Whether to reset the internal tracking counter.
- *
- * @return ?bool Returns `false` if no items are left to display, `true` if displaying a single item, and `null` otherwise.
- */
-function template_control_verification(int|string $verify_id, string $display_type = 'all', bool $reset = false): ?bool
-{
-	$verify_context = Verifier::$loaded[$verify_id];
-
-	// Reset tracking if necessary.
-	if (empty($verify_context->tracking) || $reset) {
-		$verify_context->tracking = 0;
-	}
-
-	$total_items = count($verify_context->questions) + ($verify_context->show_visual || $verify_context->can_recaptcha ? 1 : 0);
-
-	// Stop if all items are processed.
-	if ($verify_context->tracking > $total_items) {
-		return false;
-	}
-
-	// Loop through each item to show them.
-	for ($i = 0; $i < $total_items; $i++) {
-		// If we're after a single item only show it if we're in the right place.
-		if ($display_type == 'single' && $verify_context->tracking != $i) {
-			continue;
-		}
-
-		if ($display_type != 'single') {
-			echo '
-			<div id="verification_control_', $i, '" class="verification_control">';
-		}
-
-		// Display empty field, but only if we have one, and it's the first time.
-		if ($verify_context->empty_field && empty($i)) {
-			echo '
-				<div class="smalltext vv_special">
-					', Lang::getTxt('visual_verification_hidden', file: 'General'), '
-					<input type="text" name="', $_SESSION[$verify_id . '_vv']['empty_field'], '" autocomplete="off" size="30" value="">
-				</div>';
-		}
-
-		// Do the actual stuff
-		if ($i == 0 && ($verify_context->show_visual || $verify_context->can_recaptcha)) {
-			if ($verify_context->show_visual) {
-				if (Utils::$context['use_graphic_library']) {
-					echo '
-				<img src="', $verify_context->image_href, '" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '">';
-				} else {
-				echo '
-				<img src="', $verify_context->image_href, ';letter=1" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_1">
-				<img src="', $verify_context->image_href, ';letter=2" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_2">
-				<img src="', $verify_context->image_href, ';letter=3" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_3">
-				<img src="', $verify_context->image_href, ';letter=4" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_4">
-				<img src="', $verify_context->image_href, ';letter=5" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_5">
-				<img src="', $verify_context->image_href, ';letter=6" alt="', Lang::getTxt('visual_verification_description', file: 'General'), '" id="verification_image_', $verify_id, '_6">';
-				}
-
-				echo '
-				<div class="smalltext" style="margin: 4px 0 8px 0;">
-					<a href="', $verify_context->image_href, ';sound" id="visual_verification_', $verify_id, '_sound" rel="nofollow">', Lang::getTxt('visual_verification_sound', file: 'General'), '</a> / <a href="#visual_verification_', $verify_id, '_refresh" id="visual_verification_', $verify_id, '_refresh">', Lang::getTxt('visual_verification_request_new', file: 'General'), '</a>', $display_type != 'quick_reply' ? '<br>' : '', '<br>
-					', Lang::getTxt('visual_verification_description', file: 'General'), $display_type != 'quick_reply' ? '<br>' : '', '
-					<input type="text" name="', $verify_id, '_vv[code]" value="" size="30" autocomplete="off" required>
-				</div>';
-			}
-
-			if ($verify_context->can_recaptcha) {
-				$lang = Lang::getTxt(Lang::txtExists('lang_recaptcha', file: 'General') ? 'lang_recaptcha' : 'lang_dictionary', file: 'General');
-				echo '
-				<div class="g-recaptcha centertext" data-sitekey="' . $verify_context->recaptcha_site_key . '" data-theme="' . $verify_context->recaptcha_theme . '"></div>
-				<br>
-				<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?hl=' . $lang . '"></script>';
-			}
-		} else {
-			// Where in the question array is this question?
-			$qIndex = $verify_context->show_visual || $verify_context->can_recaptcha ? $i - 1 : $i;
-
-			if (isset($verify_context->questions[$qIndex])) {
-				echo '
-				<div class="smalltext">
-					', $verify_context->questions[$qIndex]['q'], ':<br>
-					<input type="text" name="', $verify_id, '_vv[q][', $verify_context->questions[$qIndex]['id'], ']" size="30" value="', $verify_context->questions[$qIndex]['a'], '" ', $verify_context->questions[$qIndex]['is_error'] ? 'style="border: 1px red solid;"' : '', ' required>
-				</div>';
-			}
-		}
-
-		if ($display_type != 'single') {
-			echo '
-			</div><!-- #verification_control_[i] -->';
-		}
-
-		// If we were displaying just one and we did it, break.
-		if ($display_type == 'single' && $verify_context->tracking == $i) {
-			break;
-		}
-	}
-
-	// Assume we found something, always.
-	$verify_context->tracking++;
-
-	// Tell something displaying piecemeal to keep going.
-	if ($display_type == 'single') {
-		return true;
-	}
-
-	return null;
-}
diff --git a/Themes/default/GenericList.template.php b/Themes/default/GenericList.template.php
deleted file mode 100644
index 234818f217d..00000000000
--- a/Themes/default/GenericList.template.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Utils;
-
-/**
- * This template handles displaying a list
- *
- * @param string $list_id The list ID. If null, uses Utils::$context['default_list'].
- */
-function template_show_list($list_id = null)
-{
-	// Get a shortcut to the current list.
-	$list_id = $list_id === null ? (!empty(Utils::$context['default_list']) ? Utils::$context['default_list'] : '') : $list_id;
-
-	if (empty($list_id) || empty(Utils::$context[$list_id])) {
-		return;
-	}
-
-	$cur_list = &Utils::$context[$list_id];
-
-	if (isset($cur_list['form'])) {
-		echo '
-	<form action="', $cur_list['form']['href'], '" method="post"', empty($cur_list['form']['name']) ? '' : ' name="' . $cur_list['form']['name'] . '" id="' . $cur_list['form']['name'] . '"', ' accept-charset="UTF-8">';
-	}
-
-	// Show the title of the table (if any).
-	if (!empty($cur_list['title'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', $cur_list['title'], '
-			</h3>
-		</div>';
-	}
-
-	if (isset($cur_list['additional_rows']['after_title'])) {
-		echo '
-		<div class="information flow_hidden">';
-
-		template_additional_rows('after_title', $cur_list);
-
-		echo '
-		</div>';
-	}
-
-	if (isset($cur_list['additional_rows']['top_of_list'])) {
-		template_additional_rows('top_of_list', $cur_list);
-	}
-
-	if ((!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) || isset($cur_list['additional_rows']['above_column_headers'])) {
-		// Show the page index (if this list doesn't intend to show all items).
-		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) {
-			echo '
-		<div class="pagesection floatleft">
-			<div class="pagelinks">', $cur_list['page_index'], '</div>
-		</div>';
-		}
-
-		if (isset($cur_list['additional_rows']['above_column_headers'])) {
-			template_additional_rows('above_column_headers', $cur_list);
-		}
-	}
-
-	echo '
-		<table class="table_grid" ', !empty($list_id) ? 'id="' . $list_id . '"' : '', ' ', !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '', '>';
-
-	// Show the column headers.
-	$header_count = count($cur_list['headers']);
-
-	if (!($header_count < 2 && empty($cur_list['headers'][0]['label']))) {
-		echo '
-			<thead>
-				<tr class="title_bar">';
-
-		// Loop through each column and add a table header.
-		foreach ($cur_list['headers'] as $col_header) {
-			echo '
-					<th scope="col" id="header_', $list_id, '_', $col_header['id'], '" class="', $col_header['id'], empty($col_header['class']) ? '' : ' ' . $col_header['class'], '"', empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"', empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"', '>
-						', empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">', empty($col_header['label']) ? '' : $col_header['label'], empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <span class="main_icons sort_' . $col_header['sort_image'] . '"></span></a>'), '
-					</th>';
-		}
-
-		echo '
-				</tr>
-			</thead>';
-	}
-
-	echo '
-			<tbody>';
-
-	// Show a nice message informing there are no items in this list.
-	if (empty($cur_list['rows']) && !empty($cur_list['no_items_label'])) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="', $cur_list['num_columns'], '" class="', !empty($cur_list['no_items_align']) ? $cur_list['no_items_align'] : 'centertext', '">
-						', $cur_list['no_items_label'], '
-					</td>
-				</tr>';
-	}
-
-	// Show the list rows.
-	elseif (!empty($cur_list['rows'])) {
-		foreach ($cur_list['rows'] as $id => $row) {
-			echo '
-				<tr class="', empty($row['class']) ? 'windowbg' : $row['class'], '"', empty($row['style']) ? '' : ' style="' . $row['style'] . '"', ' id="list_', $list_id, '_', $id, '">';
-
-			if (!empty($row['data'])) {
-				foreach ($row['data'] as $row_id => $row_data) {
-					echo '
-					<td class="', $row_id, empty($row_data['class']) ? '' : ' ' . $row_data['class'] . '', '"', empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"', '>
-						', Utils::adjustHeadingLevels($row_data['value'], 3), '
-					</td>';
-				}
-			}
-
-			echo '
-				</tr>';
-		}
-	}
-
-	echo '
-			</tbody>
-		</table>';
-
-	if ((!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) || isset($cur_list['additional_rows']['below_table_data'])) {
-		echo '
-		<div class="flow_auto">';
-
-		// Show the page index (if this list doesn't intend to show all items).
-		if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) {
-			echo '
-			<div class="pagesection floatleft">
-				<div class="pagelinks">', $cur_list['page_index'], '</div>
-			</div>';
-		}
-
-
-		if (isset($cur_list['additional_rows']['below_table_data'])) {
-			template_additional_rows('below_table_data', $cur_list);
-		}
-		echo '
-		</div>';
-	}
-
-	if (isset($cur_list['additional_rows']['bottom_of_list'])) {
-		template_additional_rows('bottom_of_list', $cur_list);
-	}
-
-	if (isset($cur_list['form'])) {
-		foreach ($cur_list['form']['hidden_fields'] as $name => $value) {
-			echo '
-		<input type="hidden" name="', $name, '" value="', $value, '">';
-		}
-
-		if (isset($cur_list['form']['token'])) {
-			echo '
-		<input type="hidden" name="', Utils::$context[$cur_list['form']['token'] . '_token_var'], '" value="', Utils::$context[$cur_list['form']['token'] . '_token'], '">';
-		}
-
-		echo '
-	</form>';
-	}
-
-	if (isset($cur_list['javascript'])) {
-		echo '
-	<script>
-		', $cur_list['javascript'], '
-	</script>';
-	}
-}
-
-/**
- * This template displays additional rows above or below the list.
- *
- * @param string $row_position The position ('top', 'bottom', etc.)
- * @param array $cur_list An array with the data for the current list
- */
-function template_additional_rows($row_position, $cur_list)
-{
-	foreach ($cur_list['additional_rows'][$row_position] as $row) {
-		echo '
-			<div class="additional_row', empty($row['class']) ? '' : ' ' . $row['class'], '"', empty($row['style']) ? '' : ' style="' . $row['style'] . '"', '>
-				', $row['value'], '
-			</div>';
-	}
-}
diff --git a/Themes/default/GenericMenu.template.php b/Themes/default/GenericMenu.template.php
deleted file mode 100644
index d413eda7f5c..00000000000
--- a/Themes/default/GenericMenu.template.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This contains the HTML for the menu bar at the top of the admin center.
- */
-function template_generic_menu_dropdown_above()
-{
-	// Which menu are we rendering?
-	Utils::$context['cur_menu_id'] = isset(Utils::$context['cur_menu_id']) ? Utils::$context['cur_menu_id'] + 1 : 1;
-	$menu_context = &Utils::$context['menu_data_' . Utils::$context['cur_menu_id']];
-	$menu_label = isset(Utils::$context['admin_menu_name']) ? Lang::getTxt('admin_center', file: 'General') : (isset(Utils::$context['moderation_menu_name']) ? Lang::getTxt('moderation_center', file: 'ModerationCenter') : '');
-
-	// Load the menu
-	// Add mobile menu as well
-	echo '
-	<nav id="genericmenu" aria-label="', Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General'), '">
-		<a class="mobile_generic_menu_', Utils::$context['cur_menu_id'], '">
-			<span class="menu_icon"></span>
-			<span class="text_menu">', Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General'), '</span>
-		</a>
-		<div id="mobile_generic_menu_', Utils::$context['cur_menu_id'], '" class="popup_container">
-			<div class="popup_window description">
-				<div class="popup_heading">
-					', Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General'), '
-					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-				</div>
-				', template_generic_menu($menu_context), '
-			</div>
-		</div>
-	</nav>
-	<script>
-		$( ".mobile_generic_menu_', Utils::$context['cur_menu_id'], '" ).click(function() {
-			$( "#mobile_generic_menu_', Utils::$context['cur_menu_id'], '" ).show();
-			});
-		$( ".hide_popup" ).click(function() {
-			$( "#mobile_generic_menu_', Utils::$context['cur_menu_id'], '" ).hide();
-		});
-	</script>';
-
-	// This is the main table - we need it so we can keep the content to the right of it.
-	echo '
-				<div id="admin_content">';
-
-	// It's possible that some pages have their own tabs they wanna force...
-// 	if (!empty(Utils::$context['tabs']))
-	template_generic_menu_tabs($menu_context);
-}
-
-/**
- * Part of the admin layer - used with generic_menu_dropdown_above to close the admin content div.
- */
-function template_generic_menu_dropdown_below()
-{
-	echo '
-				</div><!-- #admin_content -->';
-}
-
-/**
- * The template for displaying a menu
- *
- * @param array $menu_context An array of menu information
- */
-function template_generic_menu(&$menu_context)
-{
-	echo '
-				<div class="generic_menu">
-					<ul class="dropmenu dropdown_menu_', Utils::$context['cur_menu_id'], '">';
-
-	// Main areas first.
-	foreach ($menu_context['sections'] as $section) {
-		echo '
-						<li ', !empty($section['areas']) ? 'class="subsections"' : '', '><a class="', !empty($section['selected']) ? 'active ' : '', '" href="', $section['url'], $menu_context['extra_parameters'], '">', $section['title'], !empty($section['amt']) ? ' <span class="amt">' . $section['amt'] . '</span>' : '', '</a>
-							<ul>';
-
-		// For every area of this section show a link to that area (bold if it's currently selected.)
-		// @todo Code for additional_items class was deprecated and has been removed. Suggest following up in Sources if required.
-		foreach ($section['areas'] as $i => $area) {
-			// Not supposed to be printed?
-			if (empty($area['label'])) {
-				continue;
-			}
-
-			echo '
-								<li', !empty($area['subsections']) && empty($area['hide_subsections']) ? ' class="subsections"' : '', '>
-									<a class="', $area['icon_class'], !empty($area['selected']) ? ' chosen ' : '', '" href="', ($area['url'] ?? $menu_context['base_url'] . ';area=' . $i), $menu_context['extra_parameters'], '">', $area['icon'], $area['label'], !empty($area['amt']) ? ' <span class="amt">' . $area['amt'] . '</span>' : '', '</a>';
-
-			// Is this the current area, or just some area?
-			if (!empty($area['selected']) && empty(Utils::$context['tabs'])) {
-				Utils::$context['tabs'] = $area['subsections'] ?? [];
-			}
-
-			// Are there any subsections?
-			if (!empty($area['subsections']) && empty($area['hide_subsections'])) {
-				echo '
-									<ul>';
-
-				foreach ($area['subsections'] as $sa => $sub) {
-					if (!empty($sub['disabled'])) {
-						continue;
-					}
-
-					$url = $sub['url'] ?? ($area['url'] ?? $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
-
-					echo '
-										<li>
-											<a ', !empty($sub['selected']) ? 'class="chosen" ' : '', ' href="', $url, $menu_context['extra_parameters'], '">', $sub['label'], !empty($sub['amt']) ? ' <span class="amt">' . $sub['amt'] . '</span>' : '', '</a>
-										</li>';
-				}
-
-				echo '
-									</ul>';
-			}
-
-			echo '
-								</li>';
-		}
-		echo '
-							</ul>
-						</li>';
-	}
-
-	echo '
-					</ul><!-- .dropmenu -->
-				</div><!-- .generic_menu -->';
-}
-
-/**
- * The code for displaying the menu
- *
- * @param array $menu_context An array of menu context data
- */
-function template_generic_menu_tabs(&$menu_context)
-{
-	// Handy shortcut.
-	$tab_context = $menu_context['tab_data'];
-
-	if (!empty($tab_context['title'])) {
-		echo '
-					<div class="cat_bar">
-						<h3 class="catbg">';
-
-		// Exactly how many tabs do we have?
-		if (!empty(Utils::$context['tabs'])) {
-			foreach (Utils::$context['tabs'] as $id => $tab) {
-				// Can this not be accessed?
-				if (!empty($tab['disabled'])) {
-					$tab_context['tabs'][$id]['disabled'] = true;
-					continue;
-				}
-
-				// Did this not even exist - or do we not have a label?
-				if (!isset($tab_context['tabs'][$id])) {
-					$tab_context['tabs'][$id] = ['label' => $tab['label']];
-				} elseif (!isset($tab_context['tabs'][$id]['label'])) {
-					$tab_context['tabs'][$id]['label'] = $tab['label'];
-				}
-
-				// Has a custom URL defined in the main admin structure?
-				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])) {
-					$tab_context['tabs'][$id]['url'] = $tab['url'];
-				}
-
-				// Any additional parameters for the url?
-				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])) {
-					$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
-				}
-
-				// Has it been deemed selected?
-				if (!empty($tab['is_selected'])) {
-					$tab_context['tabs'][$id]['is_selected'] = true;
-				}
-
-				// Does it have its own help?
-				if (!empty($tab['help'])) {
-					$tab_context['tabs'][$id]['help'] = $tab['help'];
-				}
-
-				// Is this the last one?
-				if (!empty($tab['is_last']) && !isset($tab_context['override_last'])) {
-					$tab_context['tabs'][$id]['is_last'] = true;
-				}
-			}
-
-			// Find the selected tab
-			foreach ($tab_context['tabs'] as $sa => $tab) {
-				if (!empty($tab['is_selected']) || (isset($menu_context['current_subsection']) && $menu_context['current_subsection'] == $sa)) {
-					$selected_tab = $tab;
-					$tab_context['tabs'][$sa]['is_selected'] = true;
-				}
-			}
-		}
-
-		// Show an icon and/or a help item?
-		if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']) || !empty($selected_tab['icon']) || !empty($tab_context['icon']) || !empty($selected_tab['help']) || !empty($tab_context['help'])) {
-			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])) {
-				echo '
-								<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
-			} elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])) {
-				echo '
-								<img src="', Theme::$current->settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
-			}
-
-			if (!empty($selected_tab['help']) || !empty($tab_context['help'])) {
-				echo '
-								<a href="', Config::$scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>';
-			}
-
-			echo $tab_context['title'];
-		} else {
-		echo '
-								', $tab_context['title'];
-		}
-
-		echo '
-						</h3>';
-
-		// The function is in Admin.template.php, but since this template is used
-		// elsewhere too better check if the function is available. It goes after
-		// the heading: .cat_bar is a flex row, so the search box lands at the end
-		// of it by being last, not by floating.
-		if (function_exists('template_admin_quick_search')) {
-			template_admin_quick_search();
-		}
-
-		echo '
-					</div><!-- .cat_bar -->';
-	}
-
-	// Shall we use the tabs? Yes, it's the only known way!
-	if (!empty($selected_tab['description']) || !empty($tab_context['description'])) {
-		echo '
-					<p class="information">
-						', !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'], '
-					</p>';
-	}
-
-	// Print out all the items in this tab (if any).
-	// What gets drawn below is $tab_context['tabs'], and that is only assembled
-	// above when this menu has a title of its own. Utils::$context['tabs'] is
-	// set as a side effect of drawing the menu, so it can be full while this
-	// one is still empty, which produced an empty menu on those pages.
-	// Labels arrive from the loop above, and it only runs over the areas the
-	// menu itself knows about, so a page that forces tabs of its own can leave
-	// some without one. Those cannot be drawn, so they do not count towards
-	// having anything to draw either. Same treatment the areas above get.
-	$drawable_tabs = array_filter(
-		$tab_context['tabs'] ?? [],
-		fn($tab) => empty($tab['disabled']) && !empty($tab['label']),
-	);
-
-	if (!empty($drawable_tabs)) {
-		// The admin tabs.
-		echo '
-					<a class="mobile_generic_menu_', Utils::$context['cur_menu_id'], '_tabs">
-						<span class="menu_icon"></span>
-						<span class="text_menu">', Lang::getTxt('mobile_generic_menu', ['label' => $tab_context['title'] ?? ''], file: 'General'), '</span>
-					</a>
-					<div id="adm_submenus">
-						<div id="mobile_generic_menu_', Utils::$context['cur_menu_id'], '_tabs" class="popup_container">
-							<div class="popup_window description">
-								<div class="popup_heading">
-									', Lang::getTxt('mobile_generic_menu', ['label' => $tab_context['title'] ?? ''], file: 'General'), '
-									<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-								</div>';
-
-		echo '
-								<div class="generic_menu">
-									<ul class="dropmenu dropdown_menu_', Utils::$context['cur_menu_id'], '_tabs">';
-
-		foreach ($drawable_tabs as $sa => $tab) {
-			if (!empty($tab['is_selected'])) {
-				echo '
-										<li>
-											<a class="active" href="', $tab['url'] ?? $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], $tab['add_params'] ?? '', '">', $tab['label'], '</a>
-										</li>';
-			} else {
-			echo '
-										<li>
-											<a href="', $tab['url'] ?? $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], $tab['add_params'] ?? '', '">', $tab['label'], '</a>
-										</li>';
-			}
-		}
-
-		// The end of tabs
-		echo '
-									</ul>
-								</div>
-							</div>
-						</div>
-					</div><!-- #adm_submenus -->
-					<script>
-						$( ".mobile_generic_menu_', Utils::$context['cur_menu_id'], '_tabs" ).click(function() {
-							$( "#mobile_generic_menu_', Utils::$context['cur_menu_id'], '_tabs" ).show();
-							});
-						$( ".hide_popup" ).click(function() {
-							$( "#mobile_generic_menu_', Utils::$context['cur_menu_id'], '_tabs" ).hide();
-						});
-					</script>';
-	}
-}
diff --git a/Themes/default/Help.template.php b/Themes/default/Help.template.php
deleted file mode 100644
index 755e9a778fb..00000000000
--- a/Themes/default/Help.template.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This displays a help popup thingy
- */
-function template_popup()
-{
-	// reqOverlayDiv() asks for this with ';ajax' on the end and shows whatever
-	// comes back inside an overlay on the page it was called from. There is no
-	// window to close in that case, and no use for a document of its own.
-	if (isset($_REQUEST['ajax'])) {
-		echo '
-		<div class="windowbg description">
-			', Utils::$context['help_text'], '
-		</div>';
-
-		return;
-	}
-
-	// Otherwise this really is a window of its own, so it needs the html.
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="robots" content="noindex">
-		<title>', Utils::$context['page_title'], '</title>
-		', Theme::template_css(), '
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/script.js', Utils::$context['browser_cache'], '"></script>
-	</head>
-	<body id="help_popup">
-		<div class="windowbg description">
-			', Utils::$context['help_text'], '<br>
-			<br>
-			<a href="javascript:self.close();">', Lang::getTxt('close_window', file: 'Help'), '</a>
-		</div>
-	</body>
-</html>';
-}
-
-/**
- * The main help page
- */
-function template_manual()
-{
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('manual_smf_user_help', file: 'Manual'), '</h3>
-			</div>
-			<div id="help_container">
-				<div id="helpmain" class="windowbg">
-					<p>', Lang::getTxt('manual_welcome', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'Manual'), '</p>
-					<p>', Lang::getTxt('manual_introduction', file: 'Manual'), '</p>
-					<ul>';
-
-	foreach (Utils::$context['manual_sections'] as $section_id => $wiki_id) {
-		echo '
-						<li><a href="', Utils::$context['wiki_url'], '/', Utils::$context['wiki_prefix'], $wiki_id, (Lang::getTxt('lang_dictionary', file: 'General') != 'en' ? '/' . Lang::getTxt('lang_dictionary', file: 'General') : ''), '" target="_blank" rel="noopener">', Lang::getTxt('manual_section_' . $section_id . '_title', file: 'Manual'), '</a> - ', Lang::getTxt('manual_section_' . $section_id . '_desc', file: 'Manual'), '</li>';
-	}
-
-	echo '
-					</ul>
-					<p>', Lang::getTxt('manual_docs_and_credits', ['wiki_url' => Utils::$context['wiki_url'], 'credits_url' => Config::$scripturl . '?action=credits'], file: 'Manual'), '</p>
-				</div><!-- #helpmain -->
-			</div><!-- #help_container -->';
-}
diff --git a/Themes/default/Likes.template.php b/Themes/default/Likes.template.php
deleted file mode 100644
index 2fdb339a469..00000000000
--- a/Themes/default/Likes.template.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This shows the popup that shows who likes a particular post.
- */
-function template_popup()
-{
-	// Since this is a popup of its own we need to start the html, etc.
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="robots" content="noindex">
-		<title>', Utils::$context['page_title'], '</title>
-		', Theme::template_css(), '
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/script.js', Utils::$context['browser_cache'], '"></script>
-	</head>
-	<body id="likes_popup">
-		<div class="windowbg">
-			<ul id="likes">';
-
-	foreach (Utils::$context['likers'] as $liker => $like_details) {
-		echo '
-				<li>
-					', $like_details['profile']['avatar']['image'], '
-					<span class="like_profile">
-						', $like_details['profile']['link_color'], '
-						<span class="description">', $like_details['profile']['group'], '</span>
-					</span>
-					<span class="floatright like_time">', $like_details['time'], '</span>
-				</li>';
-	}
-
-	echo '
-			</ul>
-			<br class="clear">
-			<a href="javascript:self.close();">', Lang::getTxt('close_window', file: 'Help'), '</a>
-		</div><!-- .windowbg -->
-	</body>
-</html>';
-}
-
-/**
- * Display a like button and info about how many people liked something
- */
-function template_like()
-{
-	echo '
-	<ul class="floatleft">';
-
-	if (!empty(Utils::$context['data']['can_like'])) {
-		echo '
-		<li class="smflikebutton" id="', Utils::$context['data']['type'], '_', Utils::$context['data']['id_content'], '_likes"', '>
-			<a href="', Config::$scripturl, '?action=likes;ltype=', Utils::$context['data']['type'], ';sa=like;like=', Utils::$context['data']['id_content'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="', Utils::$context['data']['type'], '_like"><span class="main_icons ', Utils::$context['data']['already_liked'] ? 'unlike' : 'like', '"></span> ', Lang::getTxt(Utils::$context['data']['already_liked'] ? 'unlike' : 'like', file: 'General'), '</a>
-		</li>';
-	}
-
-	if (!empty(Utils::$context['data']['count'])) {
-		Utils::$context['some_likes'] = true;
-		$count = Utils::$context['data']['count'];
-		$base = 'likes_count';
-
-		if (Utils::$context['data']['already_liked']) {
-			$base = 'you_' . $base;
-			$count--;
-		}
-
-		echo '
-		<li class="like_count smalltext">', Lang::getTxt($base, ['url' => Config::$scripturl . '?action=likes;sa=view;ltype=' . Utils::$context['data']['type'] . ';js=1;like=' . Utils::$context['data']['id_content'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'num' => $count], file: 'General'), '</li>';
-	}
-
-	echo '
-	</ul>';
-}
-
-/**
- * A generic template that outputs any data passed to it...
- */
-function template_generic()
-{
-	echo Utils::$context['data'];
-}
diff --git a/Themes/default/Login.template.php b/Themes/default/Login.template.php
deleted file mode 100644
index f4c61b38357..00000000000
--- a/Themes/default/Login.template.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This is just the basic "login" form.
- */
-function template_login()
-{
-	echo '
-		<div class="login">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="main_icons login"></span> ', Lang::getTxt('login', file: 'General'), '
-				</h3>
-			</div>
-			<div class="roundframe">
-				<form class="login" action="', Utils::$context['login_url'], '" name="frmLogin" id="frmLogin" method="post" accept-charset="UTF-8"';
-
-	// A plain submit is enough when the response is going to come back to the
-	// page it was sent from. Anywhere else, login.js has to take the form over,
-	// and this attribute is how it knows to.
-	if (!empty(Utils::$context['from_ajax']) && (empty(Config::$modSettings['allow_cors']) || empty(Config::$modSettings['allow_cors_credentials']) || empty(Utils::$context['valid_cors_found']) || !in_array(Utils::$context['valid_cors_found'], ['same', 'subdomain']))) {
-		echo ' data-ajax-login="', Utils::$context['valid_cors_found'] ?? '', '"';
-	}
-
-	echo '>';
-
-	// Did they make a mistake last time?
-	if (!empty(Utils::$context['login_errors'])) {
-		echo '
-					<div class="errorbox">', implode('<br>', Utils::$context['login_errors']), '</div>
-					<br>';
-	}
-
-	// Or perhaps there's some special description for this time?
-	if (isset(Utils::$context['description'])) {
-		echo '
-					<div class="information">', Utils::$context['description'], '</div>';
-	}
-
-	// Now just get the basic information - username, password, etc.
-	echo '
-					<dl>
-						<dt>', Lang::getTxt('username', file: 'General'), '</dt>
-						<dd>
-							<input type="text" id="', !empty(Utils::$context['from_ajax']) ? 'ajax_' : '', 'loginuser" name="user" size="20" value="', Utils::$context['default_username'], '" required>
-						</dd>
-						<dt>', Lang::getTxt('password', file: 'General'), '</dt>
-						<dd>
-							<input type="password" id="', !empty(Utils::$context['from_ajax']) ? 'ajax_' : '', 'loginpass" name="passwrd" value="', Utils::$context['default_password'], '" size="20" required>
-						</dd>
-					</dl>
-					<dl>
-						<dt></dt>
-						<dd>
-							<label>
-								<input type="checkbox" name="cookieneverexp"', !empty(Utils::$context['never_expire']) ? ' checked' : '', '>
-								', Lang::getTxt('remember_me', file: 'General'), '
-							</label>
-						</dd>';
-
-	// If they have deleted their account, give them a chance to change their mind.
-	if (isset(Utils::$context['login_show_undelete'])) {
-		echo '
-						<dt class="alert">', Lang::getTxt('undelete_account', file: 'Login'), '</dt>
-						<dd><input type="checkbox" name="undelete"></dd>';
-	}
-
-	echo '
-					</dl>
-					<p>
-						<input type="submit" value="', Lang::getTxt('login', file: 'General'), '" class="button">
-					</p>
-					<p class="smalltext">
-						<a href="', Config::$scripturl, '?action=reminder">', Lang::getTxt('forgot_your_password', file: 'General'), '</a>
-					</p>';
-
-	if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1) {
-		echo '
-					<p class="smalltext">
-						', Lang::getTxt('welcome_guest_activate', ['scripturl' => Config::$scripturl], file: 'General'), '
-					</p>';
-	}
-	echo '
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['login_token_var'], '" value="', Utils::$context['login_token'], '">
-					<script>
-						setTimeout(function() {
-							document.getElementById("', !empty(Utils::$context['from_ajax']) ? 'ajax_' : '', isset(Utils::$context['default_username']) && Utils::$context['default_username'] != '' ? 'loginpass' : 'loginuser', '").focus();
-						}, 150);';
-
-	echo '
-					</script>
-				</form>';
-
-	if (!empty(Utils::$context['can_register'])) {
-		echo '
-				<hr>
-				<div class="centertext">
-					', Lang::getTxt('register_prompt', ['scripturl' => Config::$scripturl], file: 'General'), '
-				</div>';
-	}
-
-	// It is a long story as to why we have this when we're clearly not going to use it.
-	if (!empty(Utils::$context['from_ajax'])) {
-		echo '
-				<br>
-				<a href="javascript:self.close();"></a>';
-	}
-
-	echo '
-			</div><!-- .roundframe -->
-		</div><!-- .login -->';
-}
-
-/**
- * TFA authentication form
- */
-function template_login_tfa()
-{
-	echo '
-		<div class="login">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('tfa_profile_label', file: 'Profile'), '
-				</h3>
-			</div>
-			<div class="roundframe">';
-
-	if (!empty(Utils::$context['tfa_error']) || !empty(Utils::$context['tfa_backup_error'])) {
-		echo '
-				<div class="error">
-					', Lang::getTxt('tfa_' . (!empty(Utils::$context['tfa_error']) ? 'code_' : 'backup_') . 'invalid', file: 'Profile'), '
-				</div>';
-	}
-
-	echo '
-				<form action="', Utils::$context['tfa_url'], '" method="post" id="frmTfa">
-					<div id="tfaCode">
-						<p style="margin-bottom: 0.5em">', Lang::getTxt('tfa_login_desc', file: 'Profile'), '</p>
-						<div class="centertext">
-							<strong>', Lang::getTxt('tfa_code', file: 'Profile'), '</strong>
-							<input type="text" name="tfa_code" value="', !empty(Utils::$context['tfa_value']) ? Utils::$context['tfa_value'] : '', '">
-							<input type="submit" class="button" name="submit" value="', Lang::getTxt('login', file: 'General'), '">
-						</div>
-						<hr>
-						<div class="centertext">
-							<input type="button" class="button" name="backup" value="', Lang::getTxt('tfa_backup', file: 'Profile'), '">
-						</div>
-					</div>
-					<div id="tfaBackup" style="display: none;">
-						<p style="margin-bottom: 0.5em">', Lang::getTxt('tfa_backup_desc', file: 'Profile'), '</p>
-						<div class="centertext">
-							<strong>', Lang::getTxt('tfa_backup_code', file: 'Profile'), '</strong>
-							<input type="text" name="tfa_backup" value="', !empty(Utils::$context['tfa_backup']) ? Utils::$context['tfa_backup'] : '', '">
-							<input type="submit" class="button" name="submit" value="', Lang::getTxt('login', file: 'General'), '">
-						</div>
-					</div>
-				</form>
-				<script>
-					form = $("#frmTfa");';
-
-	if (!empty(Utils::$context['from_ajax'])) {
-		echo '
-					form.submit(function(e) {
-						// If we are submitting backup code, let normal workflow follow since it redirects a couple times into a different page
-						if (form.find("input[name=tfa_backup]:first").val().length > 0)
-							return true;
-
-						e.preventDefault();
-						e.stopPropagation();
-
-						$.ajax({
-							url: form.prop("action") + (form.prop("action").indexOf("?") !== -1 ? ";" : "?") + "ajax",
-							method: "POST",
-							headers: {
-								"X-SMF-AJAX": 1
-							},
-							xhrFields: {
-								withCredentials: typeof allow_xhjr_credentials !== "undefined" ? allow_xhjr_credentials : false
-							},
-							data: form.serialize(),
-							success: function(data) {
-								if (data.indexOf("<bo" + "dy") > -1) {';
-
-		if (empty(Utils::$context['valid_cors_found']) || Utils::$context['valid_cors_found'] == 'same') {
-			echo '
-									document.location = ', Utils::escapeJavaScript(!empty($_SESSION['login_url']) ? $_SESSION['login_url'] : Config::$scripturl), ';';
-		} else {
-			echo '
-									window.location.reload();';
-		}
-
-		echo '
-								}
-								else {
-									window.location.reload();
-								}
-							},
-							error: function(xhr) {
-								var data = xhr.responseText;
-								if (data.indexOf("<bo" + "dy") > -1) {
-									document.open();
-									document.write(data);
-									document.close();
-								}
-								else
-									form.parent().html($(data).filter("#fatal_error").html());
-							}
-						});
-
-						return false;
-					});';
-	}
-
-	echo '
-					form.find("input[name=backup]").click(function(e) {
-						$("#tfaBackup").show();
-						$("#tfaCode").hide();
-					});
-				</script>
-			</div><!-- .roundframe -->
-		</div><!-- .login -->';
-}
-
-/**
- * Tell a guest to get lost or login!
- */
-function template_kick_guest()
-{
-	// This isn't that much... just like normal login but with a message at the top.
-	echo '
-	<form action="', Utils::$context['login_url'], '" method="post" accept-charset="UTF-8" name="frmLogin" id="frmLogin">
-		<div class="login">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('warning', file: 'Login'), '</h3>
-			</div>';
-
-	// Show the message or default message.
-	echo '
-			<p class="information centertext">
-				', empty(Utils::$context['kick_message']) ? Lang::getTxt('only_members_can_access', file: 'Login') : Utils::$context['kick_message'], '<br>';
-
-	if (Utils::$context['can_register']) {
-		echo Lang::getTxt('login_below_or_register', ['url' => Config::$scripturl . '?action=signup', 'forum_name' => Utils::$context['forum_name_html_safe']], file: 'Login');
-	} else {
-	echo Lang::getTxt('login_below', file: 'Login');
-	}
-
-	// And now the login information.
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="main_icons login"></span> ', Lang::getTxt('login', file: 'General'), '
-				</h3>
-			</div>
-			<div class="roundframe">
-				<dl>
-					<dt>', Lang::getTxt('username', file: 'General'), '</dt>
-					<dd><input type="text" name="user" size="20"></dd>
-					<dt>', Lang::getTxt('password', file: 'General'), '</dt>
-					<dd><input type="password" name="passwrd" size="20"></dd>
-					<dt></dt>
-					<dd>
-						<label>
-							<input type="checkbox" name="cookieneverexp"', !empty(Utils::$context['never_expire']) ? ' checked' : '', '>
-							', Lang::getTxt('remember_me', file: 'General'), '
-						</label>
-					</dd>
-				</dl>
-				<p class="centertext">
-					<input type="submit" value="', Lang::getTxt('login', file: 'General'), '" class="button">
-				</p>
-				<p class="centertext smalltext">
-					<a href="', Config::$scripturl, '?action=reminder">', Lang::getTxt('forgot_your_password', file: 'General'), '</a>
-				</p>
-			</div>
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['login_token_var'], '" value="', Utils::$context['login_token'], '">
-		</div><!-- .login -->
-	</form>';
-
-	// Do the focus thing...
-	echo '
-	<script>
-		document.forms.frmLogin.user.focus();
-	</script>';
-}
-
-/**
- * This is for maintenance mode.
- */
-function template_maintenance()
-{
-	// Display the administrator's message at the top.
-	echo '
-	<form action="', Utils::$context['login_url'], '" method="post" accept-charset="UTF-8">
-		<div class="login" id="maintenance_mode">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['title'], '</h3>
-			</div>
-			<div class="information">
-				<img class="floatleft" src="', Theme::$current->settings['images_url'], '/construction.png" width="40" height="40" alt="', Lang::getTxt('in_maintain_mode', file: 'Login'), '">
-				', Utils::$context['description'], '<br class="clear">
-			</div>
-			<div class="title_bar">
-				<h4 class="titlebg">', Lang::getTxt('admin_login', file: 'General'), '</h4>
-			</div>
-			<div class="roundframe">
-				<dl>
-					<dt>', Lang::getTxt('username', file: 'General'), '</dt>
-					<dd><input type="text" name="user" size="20"></dd>
-					<dt>', Lang::getTxt('password', file: 'General'), '</dt>
-					<dd><input type="password" name="passwrd" size="20"></dd>
-					<dt></dt>
-					<dd>
-						<label>
-							<input type="checkbox" name="cookieneverexp"', !empty(Utils::$context['never_expire']) ? ' checked' : '', '>
-							', Lang::getTxt('remember_me', file: 'General'), '
-						</label>
-					</dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('login', file: 'General'), '" class="button">
-				<br class="clear">
-			</div>
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['login_token_var'], '" value="', Utils::$context['login_token'], '">
-		</div><!-- #maintenance_mode -->
-	</form>';
-}
-
-/**
- * This is for the security stuff - makes administrators login every so often.
- */
-function template_admin_login()
-{
-	// Since this should redirect to whatever they were doing, send all the get data.
-	echo '
-	<form action="', !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl, Utils::$context['get_data'], '" method="post" accept-charset="UTF-8" name="frmLogin" id="frmLogin">
-		<div class="login" id="admin_login">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="main_icons login"></span> ', Lang::getTxt('login', file: 'General'), '
-				</h3>
-			</div>
-			<div class="roundframe centertext">';
-
-	if (!empty(Utils::$context['incorrect_password'])) {
-		echo '
-				<div class="error">', Lang::getTxt('admin_incorrect_password', file: 'Admin'), '</div>';
-	}
-
-	echo '
-				<strong>', Lang::getTxt('password', file: 'General'), '</strong>
-				<input type="password" name="', Utils::$context['sessionCheckType'], '_pass" size="24">
-				<a href="', Config::$scripturl, '?action=helpadmin;help=securityDisable_why" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a><br>
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-login_token_var'], '" value="', Utils::$context['admin-login_token'], '">
-				<input type="submit" value="', Lang::getTxt('login', file: 'General'), '" class="button">';
-
-	// Make sure to output all the old post data.
-	echo Utils::$context['post_data'], '
-			</div><!-- .roundframe -->
-		</div><!-- #admin_login -->
-		<input type="hidden" name="', Utils::$context['sessionCheckType'], '_hash_pass" value="">
-	</form>';
-
-	// Focus on the password box.
-	echo '
-	<script>
-		document.forms.frmLogin.', Utils::$context['sessionCheckType'], '_pass.focus();
-	</script>';
-}
-
-/**
- * Activate your account manually?
- */
-function template_retry_activate()
-{
-	// Just ask them for their code so they can try it again...
-	echo '
-		<form action="', Config::$scripturl, '?action=activate;u=', Utils::$context['member_id'], '" method="post" accept-charset="UTF-8">
-			<div class="title_bar">
-				<h3 class="titlebg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="roundframe">
-				<dl>';
-
-	// You didn't even have an ID?
-	if (empty(Utils::$context['member_id'])) {
-		echo '
-					<dt>', Lang::getTxt('invalid_activation_username', file: 'Login'), '</dt>
-					<dd><input type="text" name="user" size="30"></dd>';
-	}
-
-	echo '
-					<dt>', Lang::getTxt('invalid_activation_retry', file: 'Login'), '</dt>
-					<dd><input type="text" name="code" size="30"></dd>
-				</dl>
-				<p><input type="submit" value="', Lang::getTxt('invalid_activation_submit', file: 'Login'), '" class="button"></p>
-			</div>
-		</form>';
-}
-
-/**
- * The form for resending the activation code.
- */
-function template_resend()
-{
-	// Just ask them for their code so they can try it again...
-	echo '
-		<form action="', Config::$scripturl, '?action=activate;sa=resend" method="post" accept-charset="UTF-8">
-			<div class="title_bar">
-				<h3 class="titlebg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="roundframe">
-				<dl>
-					<dt>', Lang::getTxt('invalid_activation_username', file: 'Login'), '</dt>
-					<dd><input type="text" name="user" size="40" value="', Utils::$context['default_username'], '"></dd>
-				</dl>
-				<p>', Lang::getTxt('invalid_activation_new', file: 'Login'), '</p>
-				<dl>
-					<dt>', Lang::getTxt('invalid_activation_new_email', file: 'Login'), '</dt>
-					<dd><input type="text" name="new_email" size="40"></dd>
-					<dt>', Lang::getTxt('invalid_activation_password', file: 'Login'), '</dt>
-					<dd><input type="password" name="passwd" size="30"></dd>
-				</dl>';
-
-	if (Utils::$context['can_activate']) {
-		echo '
-				<p>', Lang::getTxt('invalid_activation_known', file: 'Login'), '</p>
-				<dl>
-					<dt>', Lang::getTxt('invalid_activation_retry', file: 'Login'), '</dt>
-					<dd><input type="text" name="code" size="30"></dd>
-				</dl>';
-	}
-
-	echo '
-				<p><input type="submit" value="', Lang::getTxt('invalid_activation_resend', file: 'Login'), '" class="button"></p>
-			</div><!-- .roundframe -->
-		</form>';
-}
-
-/**
- * Confirm a logout.
- */
-function template_logout()
-{
-	// This isn't that much... just like normal login but with a message at the top.
-	echo '
-	<form action="', Config::$scripturl . '?action=logout;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8" name="frmLogout" id="frmLogout">
-		<div class="logout">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('logout_confirm', file: 'Login'), '</h3>
-			</div>
-			<div class="roundframe">
-				<p class="information centertext">
-					', Lang::getTxt('logout_notice', file: 'Login'), '
-				</p>
-
-				<p class="centertext">
-					<input type="submit" value="', Lang::getTxt('logout', file: 'General'), '" class="button">
-					<input type="submit" name="cancel" value="', Lang::getTxt('logout_return', file: 'Login'), '" class="button">
-				</p>
-			</div>
-		</div><!-- .logout -->
-	</form>';
-}
diff --git a/Themes/default/ManageAttachments.template.php b/Themes/default/ManageAttachments.template.php
deleted file mode 100644
index 2631c8b3e64..00000000000
--- a/Themes/default/ManageAttachments.template.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This template wraps around the simple settings page to add javascript functionality.
- */
-function template_avatar_settings_above() {}
-
-/**
- * JavaScript to be output below the simple settings page
- */
-function template_avatar_settings_below()
-{
-	echo '
-	<script>
-		var fUpdateStatus = function ()
-		{
-			document.getElementById("avatar_max_width_external").disabled = document.getElementById("avatar_download_external").checked;
-			document.getElementById("avatar_max_height_external").disabled = document.getElementById("avatar_download_external").checked;
-			document.getElementById("avatar_action_too_large").disabled = document.getElementById("avatar_download_external").checked;
-		}
-		addLoadEvent(fUpdateStatus);
-	</script>';
-}
-
-/**
- * The attachment maintenance page
- */
-function template_maintenance()
-{
-	echo '
-	<div id="manage_attachments">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('attachment_stats', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt><strong>', Lang::getTxt('attachment_total', file: 'Admin'), '</strong></dt>
-				<dd>', Utils::$context['num_attachments'], '</dd>
-				<dt><strong>', Lang::getTxt('attachment_manager_total_avatars', file: 'Admin'), '</strong></dt>
-				<dd>', Utils::$context['num_avatars'], '</dd>
-				<dt><strong>', Lang::getTxt('attachmentdir_size', file: 'Admin'), '</strong></dt>
-				<dd>', Lang::getTxt('size_kilobyte', [Utils::$context['attachment_total_size']], file: 'General'), '</dd>
-				<dt><strong>', Lang::getTxt('attach_current_dir', file: 'Admin'), '</strong></dt>
-				<dd class="word_break">', Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']], '</dd>
-				<dt><strong>', Lang::getTxt('attachmentdir_size_current', file: 'Admin'), '</strong></dt>
-				<dd>', Lang::getTxt('size_kilobyte', [Utils::$context['attachment_current_size']], file: 'General'), '</dd>
-				<dt><strong>', Lang::getTxt('attachment_space', file: 'Admin'), '</strong></dt>
-				<dd>', isset(Utils::$context['attachment_space']) ? Lang::getTxt('size_kilobyte', [Utils::$context['attachment_space']], file: 'General') : Lang::getTxt('attachmentdir_size_not_set', file: 'Admin'), '</dd>
-				<dt><strong>', Lang::getTxt('attachmentdir_files_current', file: 'Admin'), '</strong></dt>
-				<dd>', Utils::$context['attachment_current_files'], '</dd>
-				<dt><strong>', Lang::getTxt('attachment_files', file: 'Admin'), '</strong></dt>
-				<dd>', Utils::$context['attachment_files'] ?? Lang::getTxt('attachmentdir_files_not_set', file: 'Admin'), '</dd>
-			</dl>
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('attachment_integrity_check', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=manageattachments;sa=repair;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-				<p>', Lang::getTxt('attachment_integrity_check_desc', file: 'Admin'), '</p>
-				<input type="submit" name="repair" value="', Lang::getTxt('attachment_check_now', file: 'Admin'), '" class="button">
-			</form>
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('attachment_pruning', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm(\'', Lang::getTxt('attachment_pruning_warning', file: 'Admin'), '\');">
-				<dl class="settings">
-					<dt>', Lang::getTxt('attachment_remove_old', file: 'Admin'), '</dt>
-					<dd><input type="number" name="age" value="25" size="4"> ', str_replace('25', '', Lang::getTxt('number_of_days', [25], file: 'General')), '</dd>
-					<dt>', Lang::getTxt('attachment_pruning_message', file: 'Admin'), '</dt>
-					<dd><input type="text" name="notice" value="', Lang::getTxt('attachment_delete_admin', file: 'Admin'), '" size="40"></dd>
-					<input type="submit" name="remove" value="', Lang::getTxt('remove', file: 'General'), '" class="button">
-					<input type="hidden" name="type" value="attachments">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="sa" value="byage">
-				</dl>
-			</form>
-			<form action="', Config::$scripturl, '?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm(\'', Lang::getTxt('attachment_pruning_warning', file: 'Admin'), '\');">
-				<dl class="settings">
-					<dt>', Lang::getTxt('attachment_remove_size', file: 'Admin'), '</dt>
-					<dd><input type="number" name="size" id="size" value="100" size="4"> ', Lang::getTxt('kilobyte', file: 'General'), '</dd>
-					<dt>', Lang::getTxt('attachment_pruning_message', file: 'Admin'), '</dt>
-					<dd><input type="text" name="notice" value="', Lang::getTxt('attachment_delete_admin', file: 'Admin'), '" size="40"></dd>
-					<input type="submit" name="remove" value="', Lang::getTxt('remove', file: 'General'), '" class="button">
-					<input type="hidden" name="type" value="attachments">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="sa" value="bysize">
-				</dl>
-			</form>
-			<form action="', Config::$scripturl, '?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm(\'', Lang::getTxt('attachment_pruning_warning', file: 'Admin'), '\');">
-				<dl class="settings">
-					<dt>', Lang::getTxt('attachment_manager_avatars_older', file: 'Admin'), '</dt>
-					<dd><input type="number" name="age" value="45" size="4"> ', str_replace('45', '', Lang::getTxt('number_of_days', [45], file: 'General')), '</dd>
-					<input type="submit" name="remove" value="', Lang::getTxt('remove', file: 'General'), '" class="button">
-					<input type="hidden" name="type" value="avatars">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="sa" value="byage">
-				</dl>
-			</form>
-		</div><!-- .windowbg -->
-	</div><!-- #manage_attachments -->';
-
-	if (!empty(Utils::$context['results'])) {
-		echo '
-	<div class="noticebox">', Utils::$context['results'], '</div>';
-	}
-
-	echo '
-	<div id="transfer" class="cat_bar">
-		<h3 class="catbg">', Lang::getTxt('attachment_transfer', file: 'Admin'), '</h3>
-	</div>
-	<div class="windowbg">
-		<form action="', Config::$scripturl, '?action=admin;area=manageattachments;sa=transfer" method="post" accept-charset="UTF-8">
-			<p>', Lang::getTxt('attachment_transfer_desc', file: 'Admin'), '</p>
-			<dl class="settings">
-				<dt>', Lang::getTxt('attachment_transfer_from', file: 'Admin'), '</dt>
-				<dd>
-					<select name="from">
-						<option value="0">', Lang::getTxt('attachment_transfer_select', file: 'Admin'), '</option>';
-
-	foreach (Utils::$context['attach_dirs'] as $id => $dir) {
-		echo '
-						<option value="', $id, '">', $dir, '</option>';
-	}
-
-	echo '
-					</select>
-				</dd>
-				<dt>', Lang::getTxt('attachment_transfer_auto', file: 'Admin'), '</dt>
-				<dd>
-					<select name="auto">
-						<option value="0">', Lang::getTxt('attachment_transfer_auto_select', file: 'Admin'), '</option>
-						<option value="-1">', Lang::getTxt('attachment_transfer_forum_root', file: 'Admin'), '</option>';
-
-	if (!empty(Utils::$context['base_dirs'])) {
-		foreach (Utils::$context['base_dirs'] as $id => $dir) {
-			echo '
-						<option value="', $id, '">', $dir, '</option>';
-		}
-	} else {
-	echo '
-						<option value="0" disabled>', Lang::getTxt('attachment_transfer_no_base', file: 'Admin'), '</option>';
-	}
-
-	echo '
-					</select>
-				</dd>
-				<dt>', Lang::getTxt('attachment_transfer_to', file: 'Admin'), '</dt>
-				<dd>
-					<select name="to">
-						<option value="0">', Lang::getTxt('attachment_transfer_select', file: 'Admin'), '</option>';
-
-	foreach (Utils::$context['attach_dirs'] as $id => $dir) {
-		echo '
-						<option value="', $id, '">', $dir, '</option>';
-	}
-
-	echo '
-					</select>
-				</dd>';
-
-	if (!empty(Config::$modSettings['attachmentDirFileLimit'])) {
-		echo '
-				<dt>', Lang::getTxt('attachment_transfer_empty', file: 'Admin'), '</dt>
-				<dd><input type="checkbox" name="empty_it"', Utils::$context['checked'] ? ' checked' : '', '></dd>';
-	}
-
-	echo '
-			</dl>
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="submit" onclick="start_progress()" name="transfer" value="', Lang::getTxt('attachment_transfer_now', file: 'Admin'), '" class="button">
-			<div id="progress_msg"></div>
-			<div id="show_progress" class="padding"></div>
-		</form>
-		<script>
-			function start_progress() {
-				setTimeout(show_msg, 1000);
-			}
-
-			function show_msg() {
-				$(\'#progress_msg\').html(\'<div><img src="', Theme::$current->settings['actual_images_url'], '/loading_sm.gif" alt="', Lang::getTxt('ajax_in_progress', file: 'General'), '" width="35" height="35"> ', Lang::getTxt('attachment_transfer_progress', file: 'Admin'), '<\/div>\');
-				show_progress();
-			}
-
-			function show_progress() {
-				$(\'#show_progress\').on("load", "progress.php");
-				setTimeout(show_progress, 1500);
-			}
-
-		</script>
-	</div><!-- .windowbg -->';
-}
-
-/**
- * The file repair page
- */
-function template_attachment_repair()
-{
-	// If we've completed just let them know!
-	if (Utils::$context['completed']) {
-		echo '
-	<div id="manage_attachments">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('repair_attachments_complete', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			', Lang::getTxt('repair_attachments_complete_desc', file: 'Admin'), '
-		</div>
-	</div>';
-	}
-
-	// What about if no errors were even found?
-	elseif (!Utils::$context['errors_found']) {
-		echo '
-	<div id="manage_attachments">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('repair_attachments_complete', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			', Lang::getTxt('repair_attachments_no_errors', file: 'Admin'), '
-		</div>
-	</div>';
-	}
-
-	// Otherwise, I'm sad to say, we have a problem!
-	else {
-		echo '
-	<div id="manage_attachments">
-		<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('repair_attachments', file: 'Admin'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Lang::getTxt('repair_attachments_error_desc', file: 'Admin'), '</p>';
-
-		// Loop through each error reporting the status
-		foreach (Utils::$context['repair_errors'] as $error => $number) {
-			if (!empty($number)) {
-				echo '
-				<input type="checkbox" name="to_fix[]" id="', $error, '" value="', $error, '">
-				<label for="', $error, '">', Lang::getTxt('attach_repair_' . $error, [$number], file: 'Admin'), '</label><br>';
-			}
-		}
-
-		echo '
-				<br>
-				<input type="submit" value="', Lang::getTxt('repair_attachments_continue', file: 'Admin'), '" class="button">
-				<input type="submit" name="cancel" value="', Lang::getTxt('repair_attachments_cancel', file: 'Admin'), '" class="button">
-			</div>
-		</form>
-	</div><!-- #manage_attachments -->';
-	}
-}
-
-/**
- * The page that handles managing attachment paths.
- */
-function template_attachment_paths()
-{
-	if (!empty(Config::$modSettings['attachment_basedirectories'])) {
-		template_show_list('base_paths');
-	}
-
-	template_show_list('attach_paths');
-}
diff --git a/Themes/default/ManageBans.template.php b/Themes/default/ManageBans.template.php
deleted file mode 100644
index 610bb0d1c43..00000000000
--- a/Themes/default/ManageBans.template.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Add or edit a ban
- */
-function template_ban_edit()
-{
-	echo '
-	<div id="manage_bans">
-		<form id="admin_form_wrapper" action="', Utils::$context['form_url'], '" method="post" accept-charset="UTF-8" onsubmit="return confirmBan(this);">';
-
-	// If there were errors creating the ban, show them.
-	if (!empty(Utils::$context['error_messages'])) {
-		echo '
-			<div class="errorbox">
-				<strong>', Lang::getTxt('ban_errors_detected', file: 'Admin'), '</strong>
-				<ul>';
-
-		foreach (Utils::$context['error_messages'] as $error) {
-			echo '
-					<li class="error">', $error, '</li>';
-		}
-
-		echo '
-				</ul>
-			</div>';
-	}
-
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Utils::$context['ban']['is_new'] ? Lang::getTxt('ban_add_new', file: 'Admin') : Lang::getTxt('ban_edit', Utils::$context['ban'], file: 'Admin'), '
-				</h3>
-			</div>';
-
-	if (Utils::$context['ban']['is_new']) {
-		echo '
-			<div class="information noup">', Lang::getTxt('ban_add_notes', file: 'Admin'), '</div>';
-	}
-
-	echo '
-			<div class="windowbg noup">
-				<dl class="settings">
-					<dt id="ban_name_label">
-						<strong>', Lang::getTxt('ban_name', file: 'Admin'), ':</strong>
-					</dt>
-					<dd>
-						<input type="text" id="ban_name" name="ban_name" value="', Utils::$context['ban']['name'], '" size="45" maxlength="60">
-					</dd>';
-
-	if (isset(Utils::$context['ban']['reason'])) {
-		echo '
-					<dt>
-						<strong><label for="reason">', Lang::getTxt('ban_reason', file: 'General'), '</label></strong><br>
-						<span class="smalltext">', Lang::getTxt('ban_reason_desc', file: 'Admin'), '</span>
-					</dt>
-					<dd>
-						<textarea name="reason" id="reason" cols="40" rows="3">', Utils::$context['ban']['reason'], '</textarea>
-					</dd>';
-	}
-
-	if (isset(Utils::$context['ban']['notes'])) {
-		echo '
-					<dt>
-						<strong><label for="ban_notes">', Lang::getTxt('ban_notes', file: 'Admin'), '</label></strong><br>
-						<span class="smalltext">', Lang::getTxt('ban_notes_desc', file: 'Admin'), '</span>
-					</dt>
-					<dd>
-						<textarea name="notes" id="ban_notes" cols="40" rows="3">', Utils::$context['ban']['notes'], '</textarea>
-					</dd>';
-	}
-
-	echo '
-				</dl>
-				<fieldset class="ban_settings floatleft">
-					<legend>
-						', Lang::getTxt('ban_expiration', file: 'Admin'), '
-					</legend>
-					<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"', Utils::$context['ban']['expiration']['status'] == 'never' ? ' checked' : '', '> <label for="never_expires">', Lang::getTxt('never', file: 'General'), '</label><br>
-					<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"', Utils::$context['ban']['expiration']['status'] == 'one_day' ? ' checked' : '', '> <label for="expires_one_day">', Lang::getTxt('ban_will_expire_within', file: 'Admin'), '</label> <input type="number" name="expire_date" id="expire_date" size="3" value="', Utils::$context['ban']['expiration']['days'], '"> ', str_replace(Utils::$context['ban']['expiration']['days'], '', Lang::getTxt('number_of_days', [Utils::$context['ban']['expiration']['days']], file: 'General')), '<br>
-					<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"', Utils::$context['ban']['expiration']['status'] == 'expired' ? ' checked' : '', '> <label for="already_expired">', Lang::getTxt('ban_expired', file: 'Admin'), '</label>
-				</fieldset>
-				<fieldset class="ban_settings floatright">
-					<legend>
-						', Lang::getTxt('ban_restriction', file: 'Admin'), '
-					</legend>
-					<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"', Utils::$context['ban']['cannot']['access'] ? ' checked' : '', '> <label for="full_ban">', Lang::getTxt('ban_full_ban', file: 'Admin'), '</label><br>
-					<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"', !Utils::$context['ban']['cannot']['access'] ? ' checked' : '', '> <label for="partial_ban">', Lang::getTxt('ban_partial_ban', file: 'Admin'), '</label><br>
-					<input type="checkbox" name="cannot_post" id="cannot_post" value="1"', Utils::$context['ban']['cannot']['post'] ? ' checked' : '', ' class="ban_restriction"> <label for="cannot_post">', Lang::getTxt('ban_cannot_post', file: 'Admin'), '</label> (<a href="', Config::$scripturl, '?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br>
-					<input type="checkbox" name="cannot_register" id="cannot_register" value="1"', Utils::$context['ban']['cannot']['register'] ? ' checked' : '', ' class="ban_restriction"> <label for="cannot_register">', Lang::getTxt('ban_cannot_register', file: 'Admin'), '</label><br>
-					<input type="checkbox" name="cannot_login" id="cannot_login" value="1"', Utils::$context['ban']['cannot']['login'] ? ' checked' : '', ' class="ban_restriction"> <label for="cannot_login">', Lang::getTxt('ban_cannot_login', file: 'Admin'), '</label><br>
-				</fieldset>
-				<br class="clear_right">';
-
-	if (!empty(Utils::$context['ban_suggestions'])) {
-		echo '
-				<fieldset>
-					<legend>
-						<input type="checkbox" onclick="invertAll(this, this.form, \'ban_suggestion\');"> ', Lang::getTxt('ban_triggers', file: 'Admin'), '
-					</legend>
-					<dl class="settings">
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="main_ip_check" value="main_ip"', !empty(Utils::$context['ban_suggestions']['main_ip']) ? ' checked' : '', '>
-							<label for="main_ip_check">', Lang::getTxt('ban_on_ip', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" name="main_ip" value="', Utils::$context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
-						</dd>';
-
-		if (empty(Config::$modSettings['disableHostnameLookup'])) {
-			echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', !empty(Utils::$context['ban_suggestions']['hostname']) ? ' checked' : '', '>
-							<label for="hostname_check">', Lang::getTxt('ban_on_hostname', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" name="hostname" value="', Utils::$context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
-						</dd>';
-		}
-
-		echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="email_check" value="email"', !empty(Utils::$context['ban_suggestions']['email']) ? ' checked' : '', '>
-							<label for="email_check">', Lang::getTxt('ban_on_email', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" name="email" value="', Utils::$context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;">
-						</dd>
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user"', !empty(Utils::$context['ban_suggestions']['user']) || isset(Utils::$context['ban']['from_user']) ? ' checked' : '', '>
-							<label for="user_check">', Lang::getTxt('ban_on_username', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" ', isset(Utils::$context['ban']['from_user']) ? 'readonly value="' . Utils::$context['ban_suggestions']['member']['name'] . '"' : ' value=""', ' name="user" id="user" size="44">
-						</dd>
-					</dl>';
-
-		if (!empty(Utils::$context['ban_suggestions']['other_ips'])) {
-			foreach (Utils::$context['ban_suggestions']['other_ips'] as $key => $ban_ips) {
-				if (!empty($ban_ips)) {
-					echo '
-					<div>', Lang::getTxt($key, file: 'Profile'), '</div>
-					<dl class="settings">';
-
-					$count = 0;
-
-					foreach ($ban_ips as $ip) {
-						echo '
-						<dt>
-							<input type="checkbox" id="suggestions_', $key, '_', $count, '" name="ban_suggestions[', $key, '][]"', !empty(Utils::$context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, Utils::$context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '">
-						</dt>
-						<dd>
-							<label for="suggestions_', $key, '_', $count++, '">', $ip, '</label>
-						</dd>';
-					}
-
-					echo '
-					</dl>';
-				}
-			}
-		}
-
-		echo '
-				</fieldset>';
-	}
-
-	echo '
-				<input type="submit" name="', Utils::$context['ban']['is_new'] ? 'add_ban' : 'modify_ban', '" value="', Lang::getTxt(Utils::$context['ban']['is_new'] ? 'ban_add' : 'ban_modify', file: 'Admin'), '" class="button">
-				<input type="hidden" name="old_expire" value="', Utils::$context['ban']['expiration']['days'], '">
-				<input type="hidden" name="bg" value="', Utils::$context['ban']['id'], '">', isset(Utils::$context['ban']['from_user']) ? '
-				<input type="hidden" name="u" value="' . Utils::$context['ban_suggestions']['member']['id'] . '">' : '', '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-bet_token_var'], '" value="', Utils::$context['admin-bet_token'], '">
-			</div><!-- .windowbg -->
-		</form>';
-
-	if (!Utils::$context['ban']['is_new'] && empty(Utils::$context['ban_suggestions'])) {
-		echo '
-		<br>';
-		template_show_list('ban_items');
-	}
-
-	echo '
-	</div><!-- #manage_bans -->
-	<script>
-		var fUpdateStatus = function ()
-		{
-			document.getElementById("expire_date").disabled = !document.getElementById("expires_one_day").checked;
-			document.getElementById("cannot_post").disabled = document.getElementById("full_ban").checked;
-			document.getElementById("cannot_register").disabled = document.getElementById("full_ban").checked;
-			document.getElementById("cannot_login").disabled = document.getElementById("full_ban").checked;
-		}
-		addLoadEvent(fUpdateStatus);';
-
-	// Auto suggest only needed for adding new bans, not editing
-	if (Utils::$context['ban']['is_new'] && empty($_REQUEST['u'])) {
-		echo '
-		var oAddMemberSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'user\',
-			sControlId: \'user\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-		});
-
-		function confirmBan(aForm)
-		{
-			if (aForm.ban_name.value == \'\')
-			{
-				alert(\'', Lang::getTxt('ban_name_empty', file: 'Errors'), '\');
-				return false;
-			}
-
-			if (aForm.partial_ban.checked && !(aForm.cannot_post.checked || aForm.cannot_register.checked || aForm.cannot_login.checked))
-			{
-				alert(\'', Lang::getTxt('ban_restriction_empty', file: 'Admin'), '\');
-				return false;
-			}
-		}
-	</script>';
-	}
-}
-
-/**
- * Add or edit a ban trigger
- */
-function template_ban_edit_trigger()
-{
-	echo '
-	<div id="manage_bans">
-		<form id="admin_form_wrapper" action="', Utils::$context['form_url'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt(Utils::$context['ban_trigger']['is_new'] ? 'ban_add_trigger' : 'ban_edit_trigger_title', file: 'Admin'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<fieldset>';
-
-	if (Utils::$context['ban_trigger']['is_new']) {
-		echo '
-					<legend>
-						<input type="checkbox" onclick="invertAll(this, this.form, \'ban_suggestion\');"> ', Lang::getTxt('ban_triggers', file: 'Admin'), '
-					</legend>';
-	}
-	echo '
-					<dl class="settings">';
-
-	if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['ip']['selected']) {
-		echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="main_ip_check" value="main_ip"', Utils::$context['ban_trigger']['ip']['selected'] ? ' checked' : '', '>
-							<label for="main_ip_check">', Lang::getTxt('ban_on_ip', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" name="main_ip" value="', Utils::$context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
-						</dd>';
-	}
-
-	if (empty(Config::$modSettings['disableHostnameLookup']) && (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['hostname']['selected'])) {
-		echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', Utils::$context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
-							<label for="hostname_check">', Lang::getTxt('ban_on_hostname', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="text" name="hostname" value="', Utils::$context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
-						</dd>';
-	}
-
-	if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['email']['selected']) {
-		echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="email_check" value="email"', Utils::$context['ban_trigger']['email']['selected'] ? ' checked' : '', '>
-							<label for="email_check">', Lang::getTxt('ban_on_email', file: 'Admin'), '</label>
-						</dt>
-						<dd>
-							<input type="email" name="email" value="', Utils::$context['ban_trigger']['email']['value'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;">
-						</dd>';
-	}
-
-	if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['banneduser']['selected']) {
-		echo '
-						<dt>
-							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user"', Utils::$context['ban_trigger']['banneduser']['selected'] ? ' checked' : '', '>
-							<label for="user_check">', Lang::getTxt('ban_on_username', file: 'Admin'), '</label>:
-						</dt>
-						<dd>
-							<input type="text" value="' . Utils::$context['ban_trigger']['banneduser']['value'] . '" name="user" id="user" size="44"  onfocus="document.getElementById(\'user_check\').checked = true;">
-						</dd>';
-	}
-	echo '
-					</dl>
-				</fieldset>
-				<input type="submit" name="', Utils::$context['ban_trigger']['is_new'] ? 'add_new_trigger' : 'edit_trigger', '" value="', Lang::getTxt(Utils::$context['ban_trigger']['is_new'] ? 'ban_add_trigger_submit' : 'ban_edit_trigger_submit', file: 'Admin'), '" class="button">
-			</div><!-- .windowbg -->
-			<input type="hidden" name="bi" value="' . Utils::$context['ban_trigger']['id'] . '">
-			<input type="hidden" name="bg" value="' . Utils::$context['ban_trigger']['group'] . '">
-			<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-			<input type="hidden" name="', Utils::$context['admin-bet_token_var'], '" value="', Utils::$context['admin-bet_token'], '">
-		</form>
-	</div><!-- #manage_bans -->
-	<script>
-		var oAddMemberSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'username\',
-			sControlId: \'user\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-		});
-
-		function onUpdateName(oAutoSuggest)
-		{
-			document.getElementById(\'user_check\').checked = true;
-			return true;
-		}
-		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');
-	</script>';
-}
diff --git a/Themes/default/ManageBoards.template.php b/Themes/default/ManageBoards.template.php
deleted file mode 100644
index 7abdc4e143e..00000000000
--- a/Themes/default/ManageBoards.template.php
+++ /dev/null
@@ -1,781 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * Template for listing all the current categories and boards.
- */
-function template_main()
-{
-	// Table header.
-	echo '
-	<div id="manage_boards">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('boards_edit', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">';
-
-	if (!empty(Utils::$context['move_board'])) {
-		echo '
-			<div class="noticebox">
-				', Utils::$context['move_title'], ' [<a href="', Config::$scripturl, '?action=admin;area=manageboards">', Lang::getTxt('mboards_cancel_moving', file: 'ManageBoards'), '</a>]', '
-			</div>';
-	}
-
-	// No categories so show a label.
-	if (empty(Utils::$context['categories'])) {
-		echo '
-			<div class="windowbg centertext">
-				', Lang::getTxt('mboards_no_cats', file: 'ManageBoards'), '
-			</div>';
-	}
-
-	// Loop through every category, listing the boards in each as we go.
-	foreach (Utils::$context['categories'] as $category) {
-		// Link to modify the category.
-		echo '
-			<div class="sub_bar">
-				<h3 class="subbg">
-					<a href="', Config::$scripturl, '?action=admin;area=manageboards;sa=cat;cat=', $category['id'], '">', $category['name'], '</a> <a href="', Config::$scripturl, '?action=admin;area=manageboards;sa=cat;cat=', $category['id'], '">', Lang::getTxt('cat_modify', file: 'ManageBoards'), '</a>
-				</h3>
-			</div>';
-
-		// Boards table header.
-		echo '
-			<form action="', Config::$scripturl, '?action=admin;area=manageboards;sa=newboard;cat=', $category['id'], '" method="post" accept-charset="UTF-8">
-				<ul id="category_', $category['id'], '" class="nolist">';
-
-		if (!empty($category['move_link'])) {
-			echo '
-					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><span class="main_icons select_above"></span></a></li>';
-		}
-
-		$recycle_board = '<a href="' . Config::$scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . Theme::$current->settings['images_url'] . '/post/recycled.png" alt="' . Lang::getTxt('recycle_board', file: 'ManageBoards') . '" title="' . Lang::getTxt('recycle_board', file: 'ManageBoards') . '"></a>';
-		$redirect_board = '<img src="' . Theme::$current->settings['images_url'] . '/new_redirect.png" alt="' . Lang::getTxt('redirect_board_desc', file: 'ManageBoards') . '" title="' . Lang::getTxt('redirect_board_desc', file: 'ManageBoards') . '">';
-
-		// List through every board in the category, printing its name and link to modify the board.
-		foreach ($category['boards'] as $board) {
-			echo '
-					<li', !empty(Config::$modSettings['recycle_board']) && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $board['id'] ? ' id="recycle_board"' : ' ', ' class="windowbg', $board['is_redirect'] ? ' redirect_board' : '', '" style="padding-inline-start: ', 5 + 30 * $board['child_level'], 'px;">
-						<span class="floatleft"><a', $board['move'] ? ' class="red"' : '', ' href="', Config::$scripturl, '?board=', $board['id'], '.0">', $board['name'], '</a>', !empty(Config::$modSettings['recycle_board']) && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $board['id'] ? $recycle_board : '', $board['is_redirect'] ? $redirect_board : '', '</span>
-						<span class="floatright">
-							', Utils::$context['can_manage_permissions'] ? '<a href="' . Config::$scripturl . '?action=admin;area=permissions;sa=index;pid=' . $board['permission_profile'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" class="button">' . Lang::getTxt('mboards_permissions', file: 'ManageBoards') . '</a>' : '', '
-							<a href="', Config::$scripturl, '?action=admin;area=manageboards;move=', $board['id'], '" class="button">', Lang::getTxt('mboards_move', file: 'ManageBoards'), '</a>
-							<a href="', Config::$scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], '" class="button">', Lang::getTxt('mboards_modify', file: 'ManageBoards'), '</a>
-						</span><br style="clear: right;">
-					</li>';
-
-			if (!empty($board['move_links'])) {
-				echo '
-					<li class="windowbg" style="padding-inline-start: ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
-
-				foreach ($board['move_links'] as $link) {
-					echo '
-						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><span class="main_icons select_', $link['class'], '" title="', $link['label'], '"></span></a>';
-				}
-
-				echo '
-					</li>';
-			}
-		}
-
-		// Button to add a new board.
-		echo '
-				</ul>
-				<input type="submit" value="', Lang::getTxt('mboards_new_board', file: 'ManageBoards'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>';
-	}
-
-	echo '
-		</div><!-- .windowbg -->
-	</div><!-- #manage_boards -->';
-}
-
-/**
- * Template for editing/adding a category on the forum.
- */
-function template_modify_category()
-{
-	// Print table header.
-	echo '
-	<div id="manage_boards">
-		<form action="', Config::$scripturl, '?action=admin;area=manageboards;sa=cat2" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="cat" value="', Utils::$context['category']['id'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt(isset(Utils::$context['category']['is_new']) ? 'mboards_new_cat_name' : 'cat_edit', file: 'ManageBoards'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">';
-
-	// If this isn't the only category, let the user choose where this category should be positioned down the board index.
-	if (count(Utils::$context['category_order']) > 1) {
-		echo '
-					<dt><strong>', Lang::getTxt('order', file: 'ManageBoards'), '</strong></dt>
-					<dd>
-						<select name="cat_order">';
-
-		// Print every existing category into a select box.
-		foreach (Utils::$context['category_order'] as $order) {
-			echo '
-							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
-		}
-		echo '
-						</select>
-					</dd>';
-	}
-
-	// Allow the user to edit the category name and/or choose whether you can collapse the category.
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('full_name', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('name_on_display', file: 'ManageBoards'), '</span>
-					</dt>
-					<dd>
-						<input type="text" name="cat_name" value="', Utils::$context['category']['editable_name'], '" size="30">
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('mboards_description', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('mboards_cat_description_desc', ['allowed_tags' => implode(', ', Utils::$context['description_allowed_tags'])], file: 'ManageBoards'), '</span>
-					</dt>
-					<dd>
-						<textarea name="cat_desc" rows="3" cols="35">', Utils::$context['category']['description'], '</textarea>
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('collapse_enable', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('collapse_desc', file: 'ManageBoards'), '</span>
-					</dt>
-					<dd>
-						<input type="checkbox" name="collapse"', Utils::$context['category']['can_collapse'] ? ' checked' : '', '>
-					</dd>';
-
-	// Show any category settings added by mods using the 'integrate_edit_category' hook.
-	if (!empty(Utils::$context['custom_category_settings']) && is_array(Utils::$context['custom_category_settings'])) {
-		foreach (Utils::$context['custom_category_settings'] as $catset_id => $catset) {
-			if (!empty($catset['dt']) && !empty($catset['dd'])) {
-				echo '
-					<dt class="clear', !is_numeric($catset_id) ? ' catset_' . $catset_id : '', '">
-						', $catset['dt'], '
-					</dt>
-					<dd', !is_numeric($catset_id) ? ' class="catset_' . $catset_id . '"' : '', '>
-						', $catset['dd'], '
-					</dd>';
-			}
-		}
-	}
-
-	// Table footer.
-	echo '
-				</dl>';
-
-	if (isset(Utils::$context['category']['is_new'])) {
-		echo '
-				<input type="submit" name="add" value="', Lang::getTxt('mboards_add_cat_button', file: 'ManageBoards'), '" onclick="return !isEmptyText(this.form.cat_name);" class="button">';
-	} else {
-	echo '
-				<input type="submit" name="edit" value="', Lang::getTxt('modify', file: 'General'), '" onclick="return !isEmptyText(this.form.cat_name);" class="button">
-				<input type="submit" name="delete" value="', Lang::getTxt('mboards_delete_cat', file: 'ManageBoards'), '" data-confirm="', Lang::getTxt('cat_delete_confirm', file: 'ManageBoards'), '" class="button you_sure">';
-	}
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-
-	// If this category is empty we don't bother with the next confirmation screen.
-	if (Utils::$context['category']['is_empty']) {
-		echo '
-				<input type="hidden" name="empty" value="1">';
-	}
-
-	echo '
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #manage_boards -->';
-}
-
-/**
- * A template to confirm if a user wishes to delete a category - and whether they want to save the boards.
- */
-function template_confirm_category_delete()
-{
-	// Print table header.
-	echo '
-	<div id="manage_boards" class="roundframe">
-		<form action="', Config::$scripturl, '?action=admin;area=manageboards;sa=cat2" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="cat" value="', Utils::$context['category']['id'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mboards_delete_cat', file: 'ManageBoards'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Lang::getTxt('mboards_delete_cat_contains', file: 'ManageBoards'), '</p>
-				<ul>';
-
-	foreach (Utils::$context['category']['children'] as $child) {
-		echo '
-					<li>', $child, '</li>';
-	}
-
-	echo '
-				</ul>
-			</div>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mboards_delete_what_do', file: 'ManageBoards'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>
-					<label for="delete_action0"><input type="radio" id="delete_action0" name="delete_action" value="0" checked>', Lang::getTxt('mboards_delete_option1', file: 'ManageBoards'), '</label><br>
-					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', count(Utils::$context['category_order']) == 1 ? ' disabled' : '', '>', Lang::getTxt('mboards_delete_option2', file: 'ManageBoards'), '</label>
-					<select name="cat_to"', count(Utils::$context['category_order']) == 1 ? ' disabled' : '', '>';
-
-	foreach (Utils::$context['category_order'] as $cat) {
-		if ($cat['id'] != 0) {
-			echo '
-						<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
-		}
-	}
-
-	echo '
-					</select>
-				</p>
-				<input type="submit" name="delete" value="', Lang::getTxt('mboards_delete_confirm', file: 'ManageBoards'), '" class="button">
-				<input type="submit" name="cancel" value="', Lang::getTxt('mboards_delete_cancel', file: 'ManageBoards'), '" class="button">
-				<input type="hidden" name="confirmation" value="1">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #manage_boards -->';
-}
-
-/**
- * Below is the template for adding/editing a board on the forum.
- */
-function template_modify_board()
-{
-	// The main table header.
-	echo '
-	<div id="manage_boards">
-		<form action="', Config::$scripturl, '?action=admin;area=manageboards;sa=board2" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="boardid" value="', Utils::$context['board']['id'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', isset(Utils::$context['board']['is_new']) ? Lang::getTxt('mboards_new_board_name', file: 'ManageBoards') : Lang::getTxt('boards_edit', file: 'Admin'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">';
-
-	// Option for choosing the category the board lives in.
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('mboards_category', file: 'ManageBoards'), '</strong>
-					</dt>
-					<dd>
-						<select name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == \'\';}">';
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-							<option', $category['selected'] ? ' selected' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
-	}
-	echo '
-						</select>
-					</dd>';
-
-	// If this isn't the only board in this category let the user choose where the board is to live.
-	if ((isset(Utils::$context['board']['is_new']) && count(Utils::$context['board_order']) > 0) || count(Utils::$context['board_order']) > 1) {
-		echo '
-					<dt>
-						<strong>', Lang::getTxt('order', file: 'ManageBoards'), '</strong>
-					</dt>
-					<dd>';
-
-		// The first select box gives the user the option to position it before, after or as a child of another board.
-		echo '
-						<select id="order" name="placement" onchange="this.form.board_order.disabled = this.options[this.selectedIndex].value == \'\';">
-							', !isset(Utils::$context['board']['is_new']) ? '<option value="">(' . Lang::getTxt('mboards_unchanged', file: 'ManageBoards') . ')</option>' : '', '
-							<option value="after">' . Lang::getTxt('mboards_order_after', ['name' => '...'], file: 'ManageBoards') . '</option>
-							<option value="child">' . Lang::getTxt('mboards_order_child_of', ['name' => '...'], file: 'ManageBoards') . '</option>
-							<option value="before">' . Lang::getTxt('mboards_order_before', ['name' => '...'], file: 'ManageBoards') . '</option>
-						</select>';
-
-		// The second select box lists all the boards in the category.
-		echo '
-						<select id="board_order" name="board_order"', !isset(Utils::$context['board']['is_new']) ? ' disabled' : '', '>
-							', !isset(Utils::$context['board']['is_new']) ? '<option value="">(' . Lang::getTxt('mboards_unchanged', file: 'ManageBoards') . ')</option>' : '';
-
-		foreach (Utils::$context['board_order'] as $order) {
-			echo '
-							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
-		}
-		echo '
-						</select>
-					</dd>';
-	}
-
-	// Options for board name and description.
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('full_name', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('name_on_display', file: 'ManageBoards'), '</span>
-					</dt>
-					<dd>
-						<input type="text" name="board_name" value="', Utils::$context['board']['name'], '" size="30">
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('mboards_description', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('mboards_description_desc', ['allowed_tags' => implode(', ', Utils::$context['description_allowed_tags'])], file: 'ManageBoards'), '</span>
-					</dt>
-					<dd>
-						<textarea name="desc" rows="3" cols="35">', Utils::$context['board']['description'], '</textarea>
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('permission_profile', file: 'ManagePermissions'), '</strong><br>
-						<span class="smalltext">', Utils::$context['can_manage_permissions'] ? Lang::getTxt('permission_profile_desc', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']], file: 'ManagePermissions') : strip_tags(Lang::getTxt('permission_profile_desc', file: 'ManagePermissions')), '</span>
-					</dt>
-					<dd>
-						<select name="profile">';
-
-	if (isset(Utils::$context['board']['is_new'])) {
-		echo '
-							<option value="-1">[', Lang::getTxt('permission_profile_inherit', file: 'ManagePermissions'), ']</option>';
-	}
-
-	foreach (Utils::$context['profiles'] as $id => $profile) {
-		echo '
-							<option value="', $id, '"', $id == Utils::$context['board']['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
-	}
-
-	echo '
-						</select>
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('mboards_groups', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt(empty(Config::$modSettings['deny_boards_access']) ? 'mboards_groups_desc' : 'boardsaccess_option_desc', file: 'ManageBoards'), '</span>';
-
-	echo '
-					</dt>
-					<dd>';
-
-	if (!empty(Config::$modSettings['deny_boards_access'])) {
-		echo '
-						<table>
-							<tr>
-								<td></td>
-								<th>', Lang::getTxt('permissions_option_on', file: 'ManagePermissions'), '</th>
-								<th>', Lang::getTxt('permissions_option_off', file: 'ManagePermissions'), '</th>
-								<th>', Lang::getTxt('permissions_option_deny', file: 'ManagePermissions'), '</th>
-							</tr>';
-	}
-
-	// List all the membergroups so the user can choose who may access this board.
-	foreach (Utils::$context['groups'] as $group) {
-		if (empty(Config::$modSettings['deny_boards_access'])) {
-			echo '
-						<label for="groups_', $group['id'], '">
-							<input type="checkbox" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '"', in_array($group['id'], Utils::$context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), '>
-							<span', $group['is_post_group'] ? ' class="post_group" title="' . Lang::getTxt('mboards_groups_post_group', file: 'ManageBoards') . '"' : ($group['id'] == 0 ? ' class="regular_members" title="' . Lang::getTxt('mboards_groups_regular_members', file: 'ManageBoards') . '"' : ''), '>
-								', $group['name'], '
-							</span>
-						</label><br>';
-		} else {
-		echo '
-							<tr>
-								<td>
-									<label for="groups_', $group['id'], '_a">
-										<span', $group['is_post_group'] ? ' class="post_group" title="' . Lang::getTxt('mboards_groups_post_group', file: 'ManageBoards') . '"' : ($group['id'] == 0 ? ' class="regular_members" title="' . Lang::getTxt('mboards_groups_regular_members', file: 'ManageBoards') . '"' : ''), '>
-											', $group['name'], '
-										</span>
-									</label>
-								</td>
-								<td>
-									<input type="radio" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '_a"', in_array($group['id'], Utils::$context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), '>
-								</td>
-								<td>
-									<input type="radio" name="groups[', $group['id'], ']" value="ignore" id="groups_', $group['id'], '_x"', in_array($group['id'], Utils::$context['board_managers']) ? ' disabled' : (!$group['allow'] && !$group['deny'] ? ' checked' : ''), '>
-								</td>
-								<td>
-									<input type="radio" name="groups[', $group['id'], ']" value="deny" id="groups_', $group['id'], '_d"', in_array($group['id'], Utils::$context['board_managers']) ? ' disabled' : ($group['deny'] ? ' checked' : ''), '>
-								</td>
-								<td></td>
-							</tr>';
-		}
-	}
-
-	if (empty(Config::$modSettings['deny_boards_access'])) {
-		echo '
-						<span class="select_all_box">
-							<em>', Lang::getTxt('check_all', file: 'General'), '</em> <input type="checkbox" onclick="invertAll(this, this.form, \'groups[\');">
-						</span>
-						<br><br>
-					</dd>';
-	} else {
-	echo '
-							<tr class="select_all_box">
-								<td>
-								</td>
-								<td>
-									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, \'groups\', \'allow\');">
-								</td>
-								<td>
-									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, \'groups\', \'ignore\');">
-								</td>
-								<td>
-									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, \'groups\', \'deny\');">
-								</td>
-								<td>
-									<em>', Lang::getTxt('check_all', file: 'General'), '</em>
-								</td>
-							</tr>
-						</table>
-					</dd>';
-	}
-
-	// Options to choose moderators, specify as announcement board and choose whether to count posts here.
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('mboards_moderators', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('mboards_moderators_desc', file: 'ManageBoards'), '</span><br>
-					</dt>
-					<dd>
-						<input type="text" name="moderators" id="moderators" value="', Utils::$context['board']['moderator_list'], '" size="30">
-						<div id="moderator_container"></div>
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('mboards_moderator_groups', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('mboards_moderator_groups_desc', file: 'ManageBoards'), '</span><br>
-					</dt>
-					<dd>
-						<input type="text" name="moderator_groups" id="moderator_groups" value="', Utils::$context['board']['moderator_groups_list'], '" size="30">
-						<div id="moderator_group_container"></div>
-					</dd>
-				</dl>
-				<script>
-					$(document).ready(function () {
-						$(".select_all_box").each(function () {
-							$(this).removeClass(\'select_all_box\');
-						});
-					});
-				</script>
-				<hr>';
-
-	if (empty(Utils::$context['board']['is_recycle']) && empty(Utils::$context['board']['topics'])) {
-		echo '
-				<dl class="settings">
-					<dt>
-						<strong', Utils::$context['board']['topics'] ? ' style="color: gray;"' : '', '>', Lang::getTxt('mboards_redirect', file: 'ManageBoards'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('mboards_redirect_desc', file: 'ManageBoards'), '</span><br>
-					</dt>
-					<dd>
-						<input type="checkbox" id="redirect_enable" name="redirect_enable"', Utils::$context['board']['redirect'] != '' ? ' checked' : '', ' onclick="refreshOptions();">
-					</dd>
-				</dl>
-
-				<div id="redirect_address_div">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('mboards_redirect_url', file: 'ManageBoards'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('mboards_redirect_url_desc', file: 'ManageBoards'), '</span><br>
-						</dt>
-						<dd>
-							<input type="text" name="redirect_address" value="', Utils::$context['board']['redirect'], '" size="40">
-						</dd>
-					</dl>
-				</div>';
-
-		if (Utils::$context['board']['redirect']) {
-			echo '
-				<div id="reset_redirect_div">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('mboards_redirect_reset', file: 'ManageBoards'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('mboards_redirect_reset_desc', file: 'ManageBoards'), '</span><br>
-						</dt>
-						<dd>
-							<input type="checkbox" name="reset_redirect">
-							<em>(', Lang::getTxt('mboards_current_redirects', [Utils::$context['board']['posts']], file: 'ManageBoards'), ')</em>
-						</dd>
-					</dl>
-				</div>';
-		}
-	}
-
-	echo '
-				<div id="count_posts_div">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('mboards_count_posts', file: 'ManageBoards'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('mboards_count_posts_desc', file: 'ManageBoards'), '</span><br>
-						</dt>
-						<dd>
-							<input type="checkbox" name="count"', Utils::$context['board']['posts_count'] ? ' checked' : '', '>
-						</dd>
-					</dl>
-				</div>';
-
-	// Here the user can choose to force this board to use a theme other than the default theme for the forum.
-	echo '
-				<div id="board_theme_div">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('mboards_theme', file: 'ManageBoards'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('mboards_theme_desc', file: 'ManageBoards'), '</span><br>
-						</dt>
-						<dd>
-							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
-								<option value="0"', Utils::$context['board']['theme'] == 0 ? ' selected' : '', '>', Lang::getTxt('mboards_theme_default', file: 'ManageBoards'), '</option>';
-
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-									<option value="', $theme['id'], '"', Utils::$context['board']['theme'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
-	}
-
-	echo '
-							</select>
-						</dd>
-					</dl>
-				</div><!-- #board_theme_div -->
-				<div id="override_theme_div">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('mboards_override_theme', file: 'ManageBoards'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('mboards_override_theme_desc', file: 'ManageBoards'), '</span><br>
-						</dt>
-						<dd>
-							<input type="checkbox" name="override_theme"', Utils::$context['board']['override_theme'] ? ' checked' : '', '>
-						</dd>
-					</dl>
-				</div>';
-
-	// Show any board settings added by mods using the 'integrate_edit_board' hook.
-	if (!empty(Utils::$context['custom_board_settings']) && is_array(Utils::$context['custom_board_settings'])) {
-		echo '
-				<hr>
-				<div id="custom_board_settings">
-					<dl class="settings">';
-
-		foreach (Utils::$context['custom_board_settings'] as $cbs_id => $cbs) {
-			if (!empty($cbs['dt']) && !empty($cbs['dd'])) {
-				echo '
-						<dt class="clear', !is_numeric($cbs_id) ? ' cbs_' . $cbs_id : '', '">
-							', $cbs['dt'], '
-						</dt>
-						<dd', !is_numeric($cbs_id) ? ' class="cbs_' . $cbs_id . '"' : '', '>
-							', $cbs['dd'], '
-						</dd>';
-			}
-		}
-
-		echo '
-					</dl>
-				</div>';
-	}
-
-	if (!empty(Utils::$context['board']['is_recycle'])) {
-		echo '
-				<div class="noticebox">', Lang::getTxt('mboards_recycle_disabled_delete', file: 'ManageBoards'), '</div>';
-	}
-
-	echo '
-				<input type="hidden" name="rid" value="', Utils::$context['redirect_location'], '">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token_var'], '" value="', Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token'], '">';
-
-	// If this board has no children don't bother with the next confirmation screen.
-	if (Utils::$context['board']['no_children']) {
-		echo '
-				<input type="hidden" name="no_children" value="1">';
-	}
-
-	if (isset(Utils::$context['board']['is_new'])) {
-		echo '
-				<input type="hidden" name="cur_cat" value="', Utils::$context['board']['category'], '">
-				<input type="submit" name="add" value="', Lang::getTxt('mboards_new_board', file: 'ManageBoards'), '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
-	} else {
-	echo '
-				<input type="submit" name="edit" value="', Lang::getTxt('modify', file: 'General'), '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
-	}
-
-	if (!isset(Utils::$context['board']['is_new']) && empty(Utils::$context['board']['is_recycle'])) {
-		echo '
-				<input type="submit" name="delete" value="', Lang::getTxt('mboards_delete_board', file: 'ManageBoards'), '" data-confirm="', Lang::getTxt('board_delete_confirm', file: 'ManageBoards'), '" class="button you_sure">';
-	}
-	echo '
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #manage_boards -->
-
-	<script>
-		var oModeratorSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'moderators\',
-			sControlId: \'moderators\',
-			sSearchType: \'member\',
-			bItemList: true,
-			sPostName: \'moderator_list\',
-			sURLMask: \'action=profile;u=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			sItemListContainerId: \'moderator_container\',
-			aListItems: [';
-
-	foreach (Utils::$context['board']['moderators'] as $id_member => $member_name) {
-		echo '
-				{
-					sItemId: ', Utils::escapeJavaScript($id_member), ',
-					sItemName: ', Utils::escapeJavaScript($member_name), '
-				}', $id_member == Utils::$context['board']['last_moderator_id'] ? '' : ',';
-	}
-
-	echo '
-			]
-		});
-
-		var oModeratorGroupSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'moderator_groups\',
-			sControlId: \'moderator_groups\',
-			sSearchType: \'membergroups\',
-			bItemList: true,
-			sPostName: \'moderator_group_list\',
-			sURLMask: \'action=groups;sa=members;group=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			sItemListContainerId: \'moderator_group_container\',
-			aListItems: [';
-
-	foreach (Utils::$context['board']['moderator_groups'] as $id_group => $group_name) {
-		echo '
-				{
-					sItemId: ', Utils::escapeJavaScript($id_group), ',
-					sItemName: ', Utils::escapeJavaScript($group_name), '
-				}', $id_group == Utils::$context['board']['last_moderator_group_id'] ? '' : ',';
-	}
-
-	echo '
-			]
-		});
-	</script>';
-
-	// Javascript for deciding what to show.
-	echo '
-	<script>
-		function refreshOptions()
-		{
-			var redirect = document.getElementById("redirect_enable");
-			var redirectEnabled = redirect ? redirect.checked : false;
-			var nonDefaultTheme = document.getElementById("boardtheme").value == 0 ? false : true;
-
-			// What to show?
-
-			if(redirectEnabled || !nonDefaultTheme)
-				document.getElementById("override_theme_div").classList.add(\'hidden\');
-			else
-				document.getElementById("override_theme_div").classList.remove(\'hidden\');
-
-			if(redirectEnabled) {
-				document.getElementById("board_theme_div").classList.add(\'hidden\');
-				document.getElementById("count_posts_div").classList.add(\'hidden\');
-			} else {
-				document.getElementById("board_theme_div").classList.remove(\'hidden\');
-				document.getElementById("count_posts_div").classList.remove(\'hidden\');
-			}';
-
-	if (!Utils::$context['board']['topics'] && empty(Utils::$context['board']['is_recycle'])) {
-		echo '
-			if(redirectEnabled)
-				document.getElementById("redirect_address_div").classList.remove(\'hidden\');
-			else
-				document.getElementById("redirect_address_div").classList.add(\'hidden\');';
-
-		if (Utils::$context['board']['redirect']) {
-			echo '
-			if(redirectEnabled)
-				document.getElementById("reset_redirect_div").classList.remove(\'hidden\');
-			else
-				document.getElementById("reset_redirect_div").classList.add(\'hidden\');';
-		}
-	}
-
-	// Include any JavaScript added by mods using the 'integrate_edit_board' hook.
-	if (!empty(Utils::$context['custom_refreshOptions']) && is_array(Utils::$context['custom_refreshOptions'])) {
-		foreach (Utils::$context['custom_refreshOptions'] as $refreshOption) {
-			echo '
-			', $refreshOption;
-		}
-	}
-
-	echo '
-		}
-		refreshOptions();
-	</script>';
-}
-
-/**
- * A template used when a user is deleting a board with child boards in it - to see what they want to do with them.
- */
-function template_confirm_board_delete()
-{
-	// Print table header.
-	echo '
-	<div id="manage_boards" class="roundframe">
-		<form action="', Config::$scripturl, '?action=admin;area=manageboards;sa=board2" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="boardid" value="', Utils::$context['board']['id'], '">
-
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mboards_delete_board', file: 'ManageBoards'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Lang::getTxt('mboards_delete_board_contains', file: 'ManageBoards'), '</p>
-				<ul>';
-
-	foreach (Utils::$context['children'] as $child) {
-		echo '
-					<li>', $child['node']['name'], '</li>';
-	}
-
-	echo '
-				</ul>
-			</div>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mboards_delete_what_do', file: 'ManageBoards'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>
-					<label for="delete_action0"><input type="radio" id="delete_action0" name="delete_action" value="0" checked>', Lang::getTxt('mboards_delete_board_option1', file: 'ManageBoards'), '</label><br>
-					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', empty(Utils::$context['can_move_children']) ? ' disabled' : '', '>', Lang::getTxt('mboards_delete_board_option2', file: 'ManageBoards'), '</label>:
-					<select name="board_to"', empty(Utils::$context['can_move_children']) ? ' disabled' : '', '>';
-
-	foreach (Utils::$context['board_order'] as $board) {
-		if ($board['id'] != Utils::$context['board']['id'] && empty($board['is_child'])) {
-			echo '
-						<option value="', $board['id'], '">', $board['name'], '</option>';
-		}
-	}
-
-	echo '
-					</select>
-				</p>
-				<input type="submit" name="delete" value="', Lang::getTxt('mboards_delete_confirm', file: 'ManageBoards'), '" class="button">
-				<input type="submit" name="cancel" value="', Lang::getTxt('mboards_delete_cancel', file: 'ManageBoards'), '" class="button">
-				<input type="hidden" name="confirmation" value="1">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token_var'], '" value="', Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token'], '">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #manage_boards -->';
-}
diff --git a/Themes/default/ManageCalendar.template.php b/Themes/default/ManageCalendar.template.php
deleted file mode 100644
index 2cac9465481..00000000000
--- a/Themes/default/ManageCalendar.template.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Editing or adding holidays.
- */
-function template_edit_holiday()
-{
-	// Show a form for all the holiday information.
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=managecalendar;sa=editholiday" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="windowbg">';
-
-	template_event_options();
-
-	if (Utils::$context['is_new']) {
-		echo '
-				<input type="submit" value="', Lang::getTxt('holidays_button_add', file: 'ManageCalendar'), '" class="button">';
-	} else {
-		echo '
-				<input type="submit" name="edit" value="', Lang::getTxt('holidays_button_edit', file: 'ManageCalendar'), '" class="button">
-				<input type="submit" name="delete" value="', Lang::getTxt('holidays_button_remove', file: 'ManageCalendar'), '" class="button">
-				<input type="hidden" name="holiday" value="', Utils::$context['event']['id'], '">';
-	}
-
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="' . Utils::$context['admin-eh_token_var'] . '" value="' . Utils::$context['admin-eh_token'] . '">
-			</div><!-- .windowbg -->
-		</form>';
-}
-
-/**
- * Importing iCalendar data.
- */
-function template_import()
-{
-	// Show a form for all the holiday information.
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=managecalendar;sa=import" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="">', Lang::getTxt('calendar_import_url', file: 'ManageCalendar'), '</label>
-						<br>
-						<span class="smalltext">', Lang::getTxt('calendar_import_url_desc', file: 'ManageCalendar'), '</span>
-					</dt>
-					<dd>
-						<input type="url" name="ics_url" id="ics_url">
-					</dd>
-					<dt>
-						<label>', Lang::getTxt('calendar_import_type', file: 'ManageCalendar'), '</label>
-					</dt>
-					<dd>
-						<label>
-							<input type="radio" name="type" value="holiday" checked>
-							', Lang::getTxt('calendar_import_type_holiday', file: 'ManageCalendar'), '
-						</label>
-						<label>
-							<input type="radio" name="type" value="event">
-							', Lang::getTxt('calendar_import_type_event', file: 'ManageCalendar'), '
-						</label>
-					</dd>
-					<dt>
-						<label>', Lang::getTxt('calendar_import_subscribe', file: 'ManageCalendar'), '</label>
-						<br>
-						<span class="smalltext">', Lang::getTxt('calendar_import_subscribe_desc', file: 'ManageCalendar'), '</span>
-					</dt>
-					<dd>
-						<input type="checkbox" name="subscribe" id="subscribe">
-					</dd>
-				</dl>
-				<input type="submit" name="import" value="', Lang::getTxt('calendar_import_button', file: 'ManageCalendar'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="' . Utils::$context['admin-calendarimport_token_var'] . '" value="' . Utils::$context['admin-calendarimport_token'] . '">
-			</div><!-- .windowbg -->
-		</form>';
-
-	if (!empty(Utils::$context['calendar_subscriptions'])) {
-		template_show_list('calendar_subscriptions');
-	}
-}
diff --git a/Themes/default/ManageLanguages.template.php b/Themes/default/ManageLanguages.template.php
deleted file mode 100644
index 9029b7f77fd..00000000000
--- a/Themes/default/ManageLanguages.template.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\BrowserDetector;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Download a new language file.
- */
-function template_download_language()
-{
-	// Actually finished?
-	if (!empty(Utils::$context['install_complete'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('languages_download_complete', file: 'ManageSettings'), '
-			</h3>
-		</div>
-		<div class="windowbg">
-			', Utils::$context['install_complete'], '
-		</div>';
-
-		return;
-	}
-
-	// An error?
-	if (!empty(Utils::$context['error_message'])) {
-		echo '
-	<div class="errorbox">
-		', Utils::$context['error_message'], '
-	</div>';
-	}
-
-	// Provide something of an introduction...
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=languages;sa=downloadlang;did=', Utils::$context['download_id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('languages_download', file: 'ManageSettings'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<p>
-					', Lang::getTxt('languages_download_note', file: 'ManageSettings'), '
-				</p>
-				<div class="smalltext">
-					', Lang::getTxt('languages_download_info', file: 'ManageSettings'), '
-				</div>
-			</div>';
-
-	// Show the main files.
-	template_show_list('lang_main_files_list');
-
-	// Do we want some FTP baby?
-	// If the files are not writable, we might!
-	if (!empty(Utils::$context['still_not_writable'])) {
-		if (!empty(Utils::$context['package_ftp']['error'])) {
-			echo '
-			<div class="errorbox">
-				', Utils::$context['package_ftp']['error'], '
-			</div>';
-		}
-
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('package_ftp_necessary', file: 'Packages'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Lang::getTxt('package_ftp_why', file: 'Packages'), '</p>
-				<dl class="settings">
-					<dt
-						<label for="ftp_server">', Lang::getTxt('package_ftp_server', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<div class="floatright">
-							<label for="ftp_port">
-								', Lang::getTxt('package_ftp_port', file: 'Packages'), '
-							</label>
-							<input type="text" size="3" name="ftp_port" id="ftp_port" value="', Utils::$context['package_ftp']['port'] ?? (Config::$modSettings['package_port'] ?? '21'), '">
-						</div>
-						<input type="text" size="30" name="ftp_server" id="ftp_server" value="', Utils::$context['package_ftp']['server'] ?? (Config::$modSettings['package_server'] ?? 'localhost'), '" style="width: 70%;">
-					</dd>
-
-					<dt>
-						<label for="ftp_username">', Lang::getTxt('package_ftp_username', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<input type="text" size="50" name="ftp_username" id="ftp_username" value="', Utils::$context['package_ftp']['username'] ?? (Config::$modSettings['package_username'] ?? ''), '">
-					</dd>
-
-					<dt>
-						<label for="ftp_password">', Lang::getTxt('package_ftp_password', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<input type="password" size="50" name="ftp_password" id="ftp_password">
-					</dd>
-
-					<dt>
-						<label for="ftp_path">', Lang::getTxt('package_ftp_path', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<input type="text" size="50" name="ftp_path" id="ftp_path" value="', Utils::$context['package_ftp']['path'], '">
-					</dd>
-				</dl>
-			</div><!-- .windowbg -->';
-	}
-
-	// Install?
-	echo '
-			<div class="righttext padding">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-dlang_token_var'], '" value="', Utils::$context['admin-dlang_token'], '">
-				<input type="submit" name="do_install" value="', Lang::getTxt('add_language_smf_install', file: 'ManageSettings'), '" class="button">
-			</div>
-		</form>';
-}
-
-/**
- * Edit language entries. Note that this doesn't always work because of PHP's max_post_vars setting.
- */
-function template_modify_language_entries()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=languages;sa=editlang;lid=', Utils::$context['lang_id'], '" id="primary_settings" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('edit_languages', file: 'ManageSettings'), '
-				</h3>
-			</div>
-			<div id="editlang_desc" class="information">
-				', Lang::getTxt('edit_language_entries_primary', file: 'ManageSettings'), '
-			</div>';
-
-	// Not writable? Oops, show an error for ya.
-	if (!empty(Utils::$context['lang_file_not_writable_message'])) {
-		echo '
-			<div class="errorbox">
-				', Utils::$context['lang_file_not_writable_message'], '
-			</div>';
-	}
-
-	// Show the language entries
-	echo '
-			<div class="windowbg">
-				<fieldset>
-					<legend>', Utils::$context['primary_settings']['native_name']['value'], '</legend>
-					<dl class="settings">';
-
-	foreach (Utils::$context['primary_settings'] as $setting => $setting_info) {
-		if ($setting != 'name') {
-			echo '
-						<dt>
-							<a id="settings_', $setting, '_help" href="', Config::$scripturl, '?action=helpadmin;help=languages_', $setting_info['label'], '" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-							<label for="', $setting, '">', Lang::getTxt('languages_' . $setting_info['label'], file: 'ManageSettings'), ':</label>
-						</dt>
-						<dd>
-							<input type="', (is_bool($setting_info['value']) ? 'checkbox' : 'text'), '" name="', $setting, '" id="', $setting_info['label'], '" size="20"', (is_bool($setting_info['value']) ? (!empty($setting_info['value']) ? ' checked' : '') : ' value="' . $setting_info['value'] . '"'), (!empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : ''), ' data-orig="' . (is_bool($setting_info['value']) ? (!empty($setting_info['value']) ? 'true' : 'false') : $setting_info['value']) . '">
-						</dd>';
-		}
-	}
-
-	echo '
-					</dl>
-				</fieldset>
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-mlang_token_var'], '" value="', Utils::$context['admin-mlang_token'], '">
-				<input type="submit" name="save_main" value="', Lang::getTxt('save', file: 'General'), '"', !empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : '', ' class="button">
-				<input type="reset" id="reset_main" value="', Lang::getTxt('reset', file: 'General'), '" class="button">';
-
-	// Allow deleting entries. The default language and en_US can't go.
-	if (Utils::$context['can_delete_language']) {
-		echo '
-				<input type="submit" name="delete_main" value="', Lang::getTxt('delete', file: 'General'), '"', !empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : '', ' data-confirm="', Lang::getTxt('languages_delete_confirm', file: 'ManageSettings'), '" class="button you_sure">';
-	}
-
-	echo '
-			</div><!-- .windowbg -->
-		</form>
-
-		<form action="', Config::$scripturl, '?action=admin;area=languages;sa=editlang;lid=', Utils::$context['lang_id'], ';entries" id="entry_form" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('edit_language_entries', file: 'ManageSettings'), '
-				</h3>
-			</div>
-			<div class="information">
-				<div>
-					', Lang::getTxt('edit_language_entries_desc', file: 'ManageSettings'), '
-				</div>
-				<br>
-				<div id="taskpad" class="floatright">
-					', Lang::getTxt('edit_language_entries_file', file: 'ManageSettings'), '
-					<select name="tfid" onchange="if (this.value != -1) document.forms.entry_form.submit();">
-						<option value="-1">&nbsp;</option>';
-
-	foreach (Utils::$context['possible_files'] as $id_theme => $theme) {
-		echo '
-						<optgroup label="', $theme['name'], '">';
-
-		foreach ($theme['files'] as $file) {
-			echo '
-							<option value="', $id_theme, '+', $file['id'], '"', $file['selected'] ? ' selected' : '', '>', $file['name'], '</option>';
-		}
-
-		echo '
-						</optgroup>';
-	}
-
-	echo '
-					</select>
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['admin-mlang_token_var'], '" value="', Utils::$context['admin-mlang_token'], '">
-					<input type="submit" value="', Lang::getTxt('go', file: 'General'), '" class="button" style="float: none">
-				</div><!-- #taskpad -->
-			</div><!-- .information -->';
-
-	// Is it not writable? Show an error.
-	if (!empty(Utils::$context['entries_not_writable_message'])) {
-		echo '
-			<div class="errorbox">
-				', Utils::$context['entries_not_writable_message'], '
-			</div>';
-	}
-
-	// Already have some file entries?
-	if (!empty(Utils::$context['file_entries'])) {
-		echo '
-			<div id="entry_fields" class="windowbg">';
-
-		$entry_num = 0;
-
-		foreach (Utils::$context['file_entries'] as $group => $entries) {
-			echo '
-				<fieldset>
-					<legend>
-						<a id="settings_language_', $group, '_help" href="', Config::$scripturl, '?action=helpadmin;help=languages_', $group, '" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-						<span>', Lang::getTxt('languages_' . $group, file: 'ManageSettings'), '</span>
-					</legend>
-					<dl class="settings" id="language_', $group, '">';
-
-			foreach ($entries as $entry) {
-				++$entry_num;
-
-				echo '
-						<dt>
-							<span>', $entry['key'], isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '</span>
-						</dt>
-						<dd id="entry_', $entry_num, '">';
-
-				if ($entry['can_remove']) {
-					echo '
-							<span style="margin-right: 1ch; white-space: nowrap">
-								<input id="entry_', $entry_num, '_none" class="entry_toggle" type="radio" name="edit[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" value="" data-target="#entry_', $entry_num, '" checked>
-								<label for="entry_', $entry_num, '_none">', Lang::getTxt('no_change', file: 'General'), '</label>
-							</span>
-							<span style="margin-right: 1ch; white-space: nowrap">
-								<input id="entry_', $entry_num, '_edit" class="entry_toggle" type="radio" name="edit[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" value="edit" data-target="#entry_', $entry_num, '">
-								<label for="entry_', $entry_num, '_edit">', Lang::getTxt('edit', file: 'General'), '</label>
-							</span>
-							<span style="margin-right: 1ch; white-space: nowrap">
-								<input id="entry_', $entry_num, '_remove" class="entry_toggle" type="radio" name="edit[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" value="remove" data-target="#entry_', $entry_num, '">
-								<label for="entry_', $entry_num, '_remove">', Lang::getTxt('remove', file: 'General'), '</label>
-							</span>';
-				} else {
-				echo '
-							<input id="entry_', $entry_num, '_edit" class="entry_toggle" type="checkbox" name="edit[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" value="edit" data-target="#entry_', $entry_num, '">
-							<label for="entry_', $entry_num, '_edit">', Lang::getTxt('edit', file: 'General'), '</label>';
-				}
-
-				echo '
-							</span>
-							<input type="hidden" class="entry_oldvalue" name="comp[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" value="', $entry['value'], '">
-							<textarea name="entry[', $entry['key'], ']', isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '', '" class="entry_textfield" cols="40" rows="', $entry['rows'] < 2 ? 2 : ($entry['rows'] > 25 ? 25 : $entry['rows']), '" style="width: 96%; margin-bottom: 2em;">', $entry['value'], '</textarea>
-						</dd>';
-			}
-
-			echo '
-					</dl>';
-
-			if (!empty(Utils::$context['can_add_lang_entry'][$group])) {
-				echo '
-				<span class="add_lang_entry_button" style="display: none;">
-					<a class="button" href="javascript:void(0);" onclick="add_lang_entry(\'', $group, '\'); return false;">' . Lang::getTxt('edit_language_entries_add', file: 'ManageSettings') . '</a>
-				</span>
-				<script>
-					entry_num = ', $entry_num, ';
-				</script>';
-			}
-
-			echo '
-				</fieldset>';
-		}
-
-		echo '
-				<input type="submit" name="save_entries" value="', Lang::getTxt('save', file: 'General'), '"', !empty(Utils::$context['entries_not_writable_message']) ? ' disabled' : '', ' class="button">
-			</div><!-- .windowbg -->';
-	}
-
-	echo '
-		</form>';
-}
-
-/**
- * Add a new language
- *
- */
-function template_add_language()
-{
-	echo '
-		<form id="admin_form_wrapper"action="', Config::$scripturl, '?action=admin;area=languages;sa=add;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('add_language', file: 'ManageSettings'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<fieldset>
-					<legend>', Lang::getTxt('add_language_smf', file: 'ManageSettings'), '</legend>
-					<label class="smalltext">', Lang::getTxt('add_language_smf_browse', file: 'ManageSettings'), '</label>
-					<input type="text" name="smf_add" size="40" value="', !empty(Utils::$context['smf_search_term']) ? Utils::$context['smf_search_term'] : '', '">';
-
-	// Do we have some errors? Too bad. Display a little error box.
-	if (!empty(Utils::$context['smf_error'])) {
-		echo '
-					<div>
-						<br>
-						<p class="errorbox">', Lang::getTxt('add_language_error_' . Utils::$context['smf_error'], file: 'ManageSettings'), '</p>
-					</div>';
-	}
-
-	echo '
-				</fieldset>
-				', BrowserDetector::isBrowser('is_ie') ? '<input type="text" name="ie_fix" style="display: none;"> ' : '', '
-				<input type="submit" name="smf_add_sub" value="', Lang::getTxt('search', file: 'General'), '" class="button">
-				<br>
-			</div><!-- .windowbg -->';
-
-	// Had some results?
-	if (!empty(Utils::$context['smf_languages']['rows'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('add_language_found_title', file: 'ManageSettings'), '</h3>
-			</div>
-			<div class="information">', Lang::getTxt('add_language_smf_found', file: 'ManageSettings'), '</div>';
-
-		template_show_list('smf_languages');
-	}
-
-	echo '
-		</form>';
-}
diff --git a/Themes/default/ManageMail.template.php b/Themes/default/ManageMail.template.php
deleted file mode 100644
index 4ebe9429a8e..00000000000
--- a/Themes/default/ManageMail.template.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Template for browsing the mail queue.
- */
-function template_browse()
-{
-	echo '
-	<div id="manage_mail">
-		<div id="mailqueue_stats">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mailqueue_stats', file: 'ManageMail'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt><strong>', Lang::getTxt('mailqueue_size', file: 'ManageMail'), '</strong></dt>
-					<dd>', Utils::$context['mail_queue_size'], '</dd>
-					<dt><strong>', Lang::getTxt('mailqueue_oldest', file: 'ManageMail'), '</strong></dt>
-					<dd>', Utils::$context['oldest_mail'], '</dd>
-				</dl>
-			</div>
-		</div>';
-
-	template_show_list('mail_queue');
-
-	echo '
-	</div>';
-}
-
-/**
- * Template for testing mail send.
- */
-
-function template_mailtest()
-{
-	// The results.
-	if (!empty(Utils::$context['result'])) {
-		if (Utils::$context['result'] == 'failure') {
-			$result_txt = Lang::getTxt('mailtest_result_failure', ['url' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog;desc'], file: 'ManageMail');
-		} else {
-		$result_txt = Lang::getTxt('mailtest_result_success', file: 'ManageMail');
-		}
-
-		echo '
-					<div class="', Utils::$context['result'] == 'success' ? 'infobox' : 'errorbox', '">', $result_txt, '</div>';
-	}
-
-	echo '
-	<form id="admin_form_wrapper" action="', Utils::$context['post_url'], '" method="post">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('mailtest_header', file: 'ManageMail'), '</h3>
-		</div>
-		<div class="windowbg">
-				<dl id="post_header">
-					<dt><label for="subject" id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</label></dt>
-					<dd><input type="text" name="subject" id="subject" size="80" maxlength="80"></dd>
-				</dl>
-				<textarea class="editor" name="message" rows="5" cols="200"></textarea>
-				<dl id="post_footer">
-					<dd><input type="submit" value="', Lang::getTxt('send_message', file: 'General'), '" class="button"></dd>
-				</dl>
-		</div>
-	</form>';
-}
diff --git a/Themes/default/ManageMaintenance.template.php b/Themes/default/ManageMaintenance.template.php
deleted file mode 100644
index ac3bbe8314b..00000000000
--- a/Themes/default/ManageMaintenance.template.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * Wraps every maintenance sub-action.
- */
-function template_maintain_above()
-{
-	echo '
-	<div id="manage_maintenance">';
-
-	// If maintenance has finished tell the user.
-	if (!empty(Utils::$context['maintenance_finished'])) {
-		echo '
-		<div class="infobox">
-			', Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin'), '
-		</div>';
-	}
-}
-
-function template_maintain_below()
-{
-	echo '
-	</div><!-- #manage_maintenance -->';
-}
-
-/**
- * Lists the tasks of a maintenance sub-action as a single pick-one form.
- *
- * Utils::$context['options'] is keyed by activity name. A task can override its
- * label and description with 'title' and 'info', and add markup after the
- * description with 'after'.
- */
-function template_maintain_options()
-{
-	echo '
-		<form action="', Utils::$context['post_url'], '" method="post" accept-charset="UTF-8" class="windowbg option_form">';
-
-	foreach (Utils::$context['options'] as $activity => $option) {
-		echo '
-			<label>
-				<input type="radio" name="activity" value="', $activity, '">
-				<strong>', $option['title'] ?? Lang::getTxt('maintain_' . $activity, file: 'ManageMaintenance'), '</strong>
-				<p>', $option['info'] ?? Lang::getTxt('maintain_' . $activity . '_info', file: 'ManageMaintenance'), $option['after'] ?? '', '</p>
-			</label>';
-	}
-
-	echo '
-			<input type="submit" value="', Lang::getTxt('maintain_run_now', file: 'ManageMaintenance'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-		</form>';
-}
-
-/**
- * Template for the member maintenance tasks.
- */
-function template_maintain_members()
-{
-	echo '
-	<script>
-		var warningMessage = \'\';
-		var membersSwap = false;
-
-		function swapMembers()
-		{
-			membersSwap = !membersSwap;
-			var membersForm = document.getElementById(\'membersForm\');
-
-			$("#membersPanel").slideToggle(300);
-
-			document.getElementById("membersIcon").src = smf_images_url + (membersSwap ? "/selected_open.png" : "/selected.png");
-			setInnerHTML(document.getElementById("membersText"), membersSwap ? "', Lang::getTxt('maintain_members_choose', file: 'ManageMaintenance'), '" : "', Lang::getTxt('maintain_members_all', file: 'ManageMaintenance'), '");
-
-			for (var i = 0; i < membersForm.length; i++)
-			{
-				if (membersForm.elements[i].type.toLowerCase() == "checkbox")
-					membersForm.elements[i].checked = !membersSwap;
-			}
-		}
-
-		function checkAttributeValidity()
-		{
-			origText = \'', Lang::getTxt('reattribute_confirm', file: 'ManageMaintenance'), '\';
-			valid = true;
-
-			// Do all the fields!
-			if (!document.getElementById(\'to\').value)
-				valid = false;
-			warningMessage = origText.replace(/%member_to%/, document.getElementById(\'to\').value);
-
-			if (document.getElementById(\'type_email\').checked)
-			{
-				if (!document.getElementById(\'from_email\').value)
-					valid = false;
-				warningMessage = warningMessage.replace(/%type%/, \'', addcslashes(Lang::getTxt('reattribute_confirm_email', file: 'ManageMaintenance'), "'"), '\').replace(/%find%/, document.getElementById(\'from_email\').value);
-			}
-			else
-			{
-				if (!document.getElementById(\'from_name\').value)
-					valid = false;
-				warningMessage = warningMessage.replace(/%type%/, \'', addcslashes(Lang::getTxt('reattribute_confirm_username', file: 'ManageMaintenance'), "'"), '\').replace(/%find%/, document.getElementById(\'from_name\').value);
-			}
-
-			document.getElementById(\'do_attribute\').disabled = valid ? \'\' : \'disabled\';
-
-			setTimeout("checkAttributeValidity();", 500);
-			return valid;
-		}
-		setTimeout("checkAttributeValidity();", 500);
-	</script>
-	<div id="manage_maintenance">';
-
-	// If maintenance has finished, tell the user.
-	if (!empty(Utils::$context['maintenance_finished'])) {
-		echo '
-		<div class="infobox">
-			', Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin'), '
-		</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('maintain_reattribute_posts', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=members;activity=reattribute" method="post" accept-charset="UTF-8">
-				<p><strong>', Lang::getTxt('reattribute_guest_posts', file: 'ManageMaintenance'), '</strong></p>
-				<dl class="settings">
-					<dt>
-						<label for="type_email"><input type="radio" name="type" id="type_email" value="email" checked>', Lang::getTxt('reattribute_email', file: 'ManageMaintenance'), '</label>
-					</dt>
-					<dd>
-						<input type="text" name="from_email" id="from_email" value="" onclick="document.getElementById(\'type_email\').checked = \'checked\'; document.getElementById(\'from_name\').value = \'\';">
-					</dd>
-					<dt>
-						<label for="type_name"><input type="radio" name="type" id="type_name" value="name">', Lang::getTxt('reattribute_username', file: 'ManageMaintenance'), '</label>
-					</dt>
-					<dd>
-						<input type="text" name="from_name" id="from_name" value="" onclick="document.getElementById(\'type_name\').checked = \'checked\'; document.getElementById(\'from_email\').value = \'\';">
-					</dd>
-				</dl>
-				<dl class="settings">
-					<dt>
-						<label for="to"><strong>', Lang::getTxt('reattribute_current_member', file: 'ManageMaintenance'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="to" id="to" value="">
-					</dd>
-				</dl>
-				<p class="maintain_members">
-					<input type="checkbox" name="posts" id="posts" checked>
-					<label for="posts">', Lang::getTxt('reattribute_increase_posts', file: 'ManageMaintenance'), '</label>
-				</p>
-				<input type="submit" id="do_attribute" value="', Lang::getTxt('reattribute', file: 'ManageMaintenance'), '" onclick="if (!checkAttributeValidity()) return false;
-				return confirm(warningMessage);" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-			</form>
-		</div><!-- .windowbg -->
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=helpadmin;help=maintenance_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('maintain_members', file: 'ManageMaintenance'), '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=members;activity=purgeinactive" method="post" accept-charset="UTF-8" id="membersForm">
-				<div class="padding">
-					<a id="membersLink"></a>',
-					Lang::getTxt(
-						'maintain_members_since',
-						[
-							'input_condition' => '<select name="del_type"><option value="activated" selected>' . Lang::getTxt('maintain_members_activated', file: 'ManageMaintenance') . '</option><option value="logged">' . Lang::getTxt('maintain_members_logged_in', file: 'ManageMaintenance') . '</option></select>',
-							'input_number' => '<input type="number" name="maxdays" value="30" size="3">',
-						],
-						file: 'ManageMaintenance',
-					), '
-				</div>
-				<div class="padding">';
-
-	if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])) {
-		echo '
-					' . Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile');
-	} else {
-		echo '
-					<label for="anonymize">
-						<input type="checkbox" name="anonymize" id="anonymize" value="1"> ' . Lang::getTxt('deleteAccount_anonymize', file: 'Profile') . '
-					</label>';
-	}
-
-	echo '
-				</div>
-				<div class="padding">
-					<a href="#membersLink" onclick="swapMembers();"><img src="', Theme::$current->settings['images_url'], '/selected.png" alt="+" id="membersIcon"></a> <a href="#membersLink" onclick="swapMembers();" id="membersText" style="font-weight: bold;">', Lang::getTxt('maintain_members_all', file: 'ManageMaintenance'), '</a>
-				</div>
-				<div style="display: none;" id="membersPanel">';
-
-	foreach (Utils::$context['membergroups'] as $group) {
-		echo '
-					<label for="groups', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups', $group['id'], '" checked> ', $group['name'], '</label><br>';
-	}
-
-	echo '
-				</div>
-				<input type="submit" value="', Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance'), '" data-confirm="', Lang::getTxt('maintain_members_confirm', file: 'ManageMaintenance'), '" class="button you_sure">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-			</form>
-		</div><!-- .windowbg -->
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('maintain_recountposts', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=members;activity=recountposts" method="post" accept-charset="UTF-8" id="membersRecountForm">
-				<p>', Lang::getTxt('maintain_recountposts_info', file: 'ManageMaintenance'), '</p>
-				<input type="submit" value="', Lang::getTxt('maintain_run_now', file: 'ManageMaintenance'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-			</form>
-		</div>
-	</div><!-- #manage_maintenance -->
-
-	<script>
-		var oAttributeMemberSuggest = new smc_AutoSuggest({
-			sSelf: \'oAttributeMemberSuggest\',
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'attributeMember\',
-			sControlId: \'to\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			bItemList: false
-		});
-	</script>';
-}
-
-/**
- * Template for the topic maintenance tasks.
- */
-function template_maintain_topics()
-{
-	// If maintenance has finished tell the user.
-	if (!empty(Utils::$context['maintenance_finished'])) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin'), '
-	</div>';
-	}
-
-	// Bit of javascript for showing which boards to prune in an otherwise hidden list.
-	echo '
-	<script>
-		var rotSwap = false;
-		function swapRot()
-		{
-			rotSwap = !rotSwap;
-
-			// Toggle icon
-			document.getElementById("rotIcon").src = smf_images_url + (rotSwap ? "/selected_open.png" : "/selected.png");
-			setInnerHTML(document.getElementById("rotText"), rotSwap ? ', Utils::escapeJavaScript(Lang::getTxt('maintain_old_choose', file: 'ManageMaintenance')), ' : ', Utils::escapeJavaScript(Lang::getTxt('maintain_old_all', file: 'ManageMaintenance')), ');
-
-			// Toggle panel
-			$("#rotPanel").slideToggle(300);
-
-			// Toggle checkboxes
-			var rotPanel = document.getElementById(\'rotPanel\');
-			var oBoardCheckBoxes = rotPanel.getElementsByTagName(\'input\');
-			for (var i = 0; i < oBoardCheckBoxes.length; i++)
-			{
-				if (oBoardCheckBoxes[i].type.toLowerCase() == "checkbox")
-					oBoardCheckBoxes[i].checked = !rotSwap;
-			}
-		}
-	</script>';
-
-	echo '
-	<div id="manage_maintenance">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('maintain_old', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<div class="flow_auto">
-				<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=topics;activity=pruneold" method="post" accept-charset="UTF-8">';
-
-	// The otherwise hidden "choose which boards to prune".
-	echo '
-					<p>
-						<a id="rotLink"></a>', Lang::getTxt('maintain_old_since_days', ['input_number' => '<input type="number" name="maxdays" value="30" size="3">'], file: 'ManageMaintenance'), '
-					</p>
-					<p>
-						<label for="delete_type_nothing"><input type="radio" name="delete_type" id="delete_type_nothing" value="nothing"> ', Lang::getTxt('maintain_old_nothing_else', file: 'ManageMaintenance'), '</label><br>
-						<label for="delete_type_moved"><input type="radio" name="delete_type" id="delete_type_moved" value="moved" checked> ', Lang::getTxt('maintain_old_are_moved', file: 'ManageMaintenance'), '</label><br>
-						<label for="delete_type_locked"><input type="radio" name="delete_type" id="delete_type_locked" value="locked"> ', Lang::getTxt('maintain_old_are_locked', file: 'ManageMaintenance'), '</label><br>
-					</p>
-					<p>
-						<label for="delete_old_not_sticky"><input type="checkbox" name="delete_old_not_sticky" id="delete_old_not_sticky" checked> ', Lang::getTxt('maintain_old_are_not_stickied', file: 'ManageMaintenance'), '</label><br>
-					</p>
-					<p>
-						<a href="#rotLink" onclick="swapRot();"><img src="', Theme::$current->settings['images_url'], '/selected.png" alt="+" id="rotIcon"></a> <a href="#rotLink" onclick="swapRot();" id="rotText" style="font-weight: bold;">', Lang::getTxt('maintain_old_all', file: 'ManageMaintenance'), '</a>
-					</p>
-					<div style="display: none;" id="rotPanel" class="flow_hidden">
-						<div class="floatleft" style="width: 49%">';
-
-	// This is the "middle" of the list.
-	$middle = ceil(count(Utils::$context['categories']) / 2);
-
-	$i = 0;
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-							<fieldset>
-								<legend>', $category['name'], '</legend>
-								<ul>';
-
-		// Display a checkbox with every board.
-		foreach ($category['boards'] as $board) {
-			echo '
-									<li style="margin-inline-start: ', $board['child_level'] * 1.5, 'em;">
-										<label for="boards_', $board['id'], '"><input type="checkbox" name="boards[', $board['id'], ']" id="boards_', $board['id'], '" checked>', $board['name'], '</label>
-									</li>';
-		}
-
-		echo '
-								</ul>
-							</fieldset>';
-
-		// Increase $i, and check if we're at the middle yet.
-		if (++$i == $middle) {
-			echo '
-						</div><!-- .floatleft -->
-						<div class="floatright" style="width: 49%;">';
-		}
-	}
-
-	echo '
-						</div>
-					</div><!-- #rotPanel -->
-					<input type="submit" value="', Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance'), '" data-confirm="', Lang::getTxt('maintain_old_confirm', file: 'ManageMaintenance'), '" class="button you_sure">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-				</form>
-			</div><!-- .flow_auto -->
-		</div><!-- .windowbg -->
-
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('maintain_old_drafts', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=topics;activity=olddrafts" method="post" accept-charset="UTF-8">
-				<p>
-					', Lang::getTxt('maintain_old_drafts_days', ['input_number' => '<input type="number" name="draftdays" value="' . (!empty(Config::$modSettings['drafts_keep_days']) ? Config::$modSettings['drafts_keep_days'] : 30) . '" size="3">'], file: 'ManageMaintenance'), '
-				</p>
-				<input type="submit" value="', Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance'), '" data-confirm="', Lang::getTxt('maintain_old_drafts_confirm', file: 'ManageMaintenance'), '" class="button you_sure">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-			</form>
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('move_topics_maintenance', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=topics;activity=massmove" method="post" accept-charset="UTF-8">
-				<p>
-					';
-
-	$board_select = [
-		'<option disabled selected>(' . Lang::getTxt('move_topics_select_board', file: 'ManageMaintenance') . ')</option>',
-	];
-
-	foreach (Utils::$context['categories'] as $category) {
-		$board_select[] = '<optgroup label="' . $category['name'] . '">';
-
-		foreach ($category['boards'] as $board) {
-			$board_select[] = "\t" . '<option value="' . $board['id'] . '"> ' . str_repeat('==', $board['child_level']) . '=&gt;&nbsp;' . $board['name'] . '</option>';
-		}
-
-		$board_select[] = '</optgroup>';
-	}
-
-
-	echo Lang::getTxt(
-		'move_topics_from',
-		[
-			'old' => '
-						<select name="id_board_from" id="id_board_from">
-							' . implode("\n\t\t\t\t\t\t", $board_select) . '
-						</select>',
-			'new' => '
-						<select name="id_board_to" id="id_board_to">
-							' . implode("\n\t\t\t\t\t\t", $board_select) . '
-						</select>',
-		],
-		file: 'ManageMaintenance',
-	);
-
-	echo '
-				</p>
-				<p>
-					', Lang::getTxt('move_topics_older_than', ['input_number' => '<input type="number" name="maxdays" value="30" size="3">'], file: 'ManageMaintenance'), ' (', Lang::getTxt('move_zero_all', file: 'ManageMaintenance'), ')
-				</p>
-				<p>
-					<label for="move_type_locked"><input type="checkbox" name="move_type_locked" id="move_type_locked" checked> ', Lang::getTxt('move_type_locked', file: 'ManageMaintenance'), '</label><br>
-					<label for="move_type_sticky"><input type="checkbox" name="move_type_sticky" id="move_type_sticky"> ', Lang::getTxt('move_type_sticky', file: 'ManageMaintenance'), '</label><br>
-				</p>
-				<input type="submit" value="', Lang::getTxt('move_topics_now', file: 'ManageMaintenance'), '" onclick="if (document.getElementById(\'id_board_from\').options[document.getElementById(\'id_board_from\').selectedIndex].disabled || document.getElementById(\'id_board_from\').options[document.getElementById(\'id_board_to\').selectedIndex].disabled) return false; var confirmText = \'', Lang::getTxt('move_topics_confirm', file: 'ManageMaintenance') . '\'; return confirm(confirmText.replace(/%board_from%/, document.getElementById(\'id_board_from\').options[document.getElementById(\'id_board_from\').selectedIndex].text.replace(/^=+&gt;&nbsp;/, \'\')).replace(/%board_to%/, document.getElementById(\'id_board_to\').options[document.getElementById(\'id_board_to\').selectedIndex].text.replace(/^=+&gt;&nbsp;/, \'\')));" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-maint_token_var'], '" value="', Utils::$context['admin-maint_token'], '">
-			</form>
-		</div><!-- .windowbg -->
-	</div><!-- #manage_maintenance -->';
-}
-
-/**
- * Simple template for showing results of our optimization...
- */
-function template_optimize()
-{
-	echo '
-	<div id="manage_maintenance">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('maintain_optimize', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>
-				', Utils::$context['database_numb_tables'], '<br>
-				', Lang::getTxt('database_optimize_attempt', file: 'ManageMaintenance'), '<br>';
-
-	// List each table being optimized...
-	foreach (Utils::$context['optimized_tables'] as $table) {
-		echo '
-				', Lang::getTxt('database_optimizing', [$table['name'], round($table['data_freed'], 2)], file: 'ManageMaintenance'), '<br>';
-	}
-
-	// How did we go?
-	echo '
-				<br>
-				', Utils::$context['num_tables_optimized'] == 0 ? Lang::getTxt('database_already_optimized', file: 'ManageMaintenance') : Utils::$context['num_tables_optimized'] . ' ' . Lang::getTxt('database_optimized', file: 'ManageMaintenance');
-
-	echo '
-			</p>
-			<p><a href="', Config::$scripturl, '?action=admin;area=maintain">', Lang::getTxt('maintain_return', file: 'ManageMaintenance'), '</a></p>
-		</div><!-- .windowbg -->
-	</div><!-- #manage_maintenance -->';
-}
-
-/**
- * Template for converting entities to UTF-8 characters
- */
-function template_convert_entities()
-{
-	echo '
-	<div id="manage_maintenance">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('entity_convert_title', file: 'ManageMaintenance'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('entity_convert_introduction', file: 'ManageMaintenance'), '</p>
-			<form action="', Config::$scripturl, '?action=admin;area=maintain;sa=database;activity=convertentities;start=0;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-			<input type="submit" value="', Lang::getTxt('entity_convert_proceed', file: 'ManageMaintenance'), '" class="button">
-			</form>
-		</div>
-	</div>';
-}
diff --git a/Themes/default/ManageMembergroups.template.php b/Themes/default/ManageMembergroups.template.php
deleted file mode 100644
index 463322c3465..00000000000
--- a/Themes/default/ManageMembergroups.template.php
+++ /dev/null
@@ -1,772 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * The main page listing all the groups.
- */
-function template_main()
-{
-	template_show_list('regular_membergroups_list');
-
-	echo '<br><br>';
-
-	template_show_list('post_count_membergroups_list');
-}
-
-/**
- * Add a new membergroup.
- */
-function template_new_group()
-{
-	echo '
-		<form id="new_group" action="', Config::$scripturl, '?action=admin;area=membergroups;sa=add" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('membergroups_new_group', file: 'Admin'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="group_name_input"><strong>', Lang::getTxt('membergroups_group_name', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="group_name" id="group_name_input" size="30">
-					</dd>';
-
-	if (Utils::$context['undefined_group']) {
-		echo '
-					<dt>
-						<label for="group_type"><strong>', Lang::getTxt('membergroups_edit_group_type', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<fieldset id="group_type">
-							<legend>', Lang::getTxt('membergroups_edit_select_group_type', file: 'ManageMembers'), '</legend>
-							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0" checked onclick="swapPostGroup(0);">', Lang::getTxt('membergroups_group_type_private', file: 'ManageMembers'), '</label><br>';
-
-		if (Utils::$context['allow_protected']) {
-			echo '
-							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1" onclick="swapPostGroup(0);">', Lang::getTxt('membergroups_group_type_protected', file: 'ManageMembers'), '</label><br>';
-		}
-
-		echo '
-							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2" onclick="swapPostGroup(0);">', Lang::getTxt('membergroups_group_type_request', file: 'ManageMembers'), '</label><br>
-							<label for="group_type_free"><input type="radio" name="group_type" id="group_type_free" value="3" onclick="swapPostGroup(0);">', Lang::getTxt('membergroups_group_type_free', file: 'ManageMembers'), '</label><br>
-							<label for="group_type_post"><input type="radio" name="group_type" id="group_type_post" value="-1" onclick="swapPostGroup(1);">', Lang::getTxt('membergroups_group_type_post', file: 'ManageMembers'), '</label><br>
-						</fieldset>
-					</dd>';
-	}
-
-	if (Utils::$context['post_group'] || Utils::$context['undefined_group']) {
-		echo '
-					<dt id="min_posts_text">
-						<label for="min_posts_input"><strong>', Lang::getTxt('membergroups_min_posts', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="number" name="min_posts" id="min_posts_input" size="5">
-					</dd>';
-	}
-
-	if (!Utils::$context['post_group'] || !empty(Config::$modSettings['permission_enable_postgroups'])) {
-		echo '
-					<dt>
-						<label for="permission_base"><strong>', Lang::getTxt('membergroups_permissions', file: 'Admin'), '</strong></label><br>
-						<span class="smalltext">', Lang::getTxt('membergroups_can_edit_later', file: 'ManageMembers'), '</span>
-					</dt>
-					<dd>
-						<fieldset id="permission_base">
-							<legend>', Lang::getTxt('membergroups_select_permission_type', file: 'ManageMembers'), '</legend>
-							<input type="radio" name="perm_type" id="perm_type_inherit" value="inherit" checked>
-							<label for="perm_type_inherit">', Lang::getTxt('membergroups_new_as_inherit', file: 'ManageMembers'), '</label>
-							<select name="inheritperm" id="inheritperm_select" onclick="document.getElementById(\'perm_type_inherit\').checked = true;">
-								<option value="-1">', Lang::getTxt('membergroups_guests', file: 'Admin'), '</option>
-								<option value="0" selected>', Lang::getTxt('membergroups_members', file: 'Admin'), '</option>';
-
-		foreach (Utils::$context['groups'] as $group) {
-			echo '
-								<option value="', $group['id'], '">', $group['name'], '</option>';
-		}
-
-		echo '
-							</select>
-							<br>
-							<input type="radio" name="perm_type" id="perm_type_copy" value="copy">
-							<label for="perm_type_copy">', Lang::getTxt('membergroups_new_as_copy', file: 'ManageMembers'), '</label>
-							<select name="copyperm" id="copyperm_select" onclick="document.getElementById(\'perm_type_copy\').checked = true;">
-								<option value="-1">', Lang::getTxt('membergroups_guests', file: 'Admin'), '</option>
-								<option value="0" selected>', Lang::getTxt('membergroups_members', file: 'Admin'), '</option>';
-
-		foreach (Utils::$context['groups'] as $group) {
-			echo '
-								<option value="', $group['id'], '">', $group['name'], '</option>';
-		}
-
-		echo '
-							</select>
-							<br>
-							<input type="radio" name="perm_type" id="perm_type_predefined" value="predefined">
-							<label for="perm_type_predefined">', Lang::getTxt('membergroups_new_as_type', file: 'ManageMembers'), '</label>
-							<select name="level" id="level_select" onclick="document.getElementById(\'perm_type_predefined\').checked = true;">
-								<option value="restrict">', Lang::getTxt('permitgroups_restrict', file: 'Admin'), '</option>
-								<option value="standard" selected>', Lang::getTxt('permitgroups_standard', file: 'Admin'), '</option>
-								<option value="moderator">', Lang::getTxt('permitgroups_moderator', file: 'Admin'), '</option>
-								<option value="maintenance">', Lang::getTxt('permitgroups_maintenance', file: 'Admin'), '</option>
-							</select>
-						</fieldset>
-					</dd>';
-	}
-
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('membergroups_new_board', file: 'ManageMembers'), '</strong>', Utils::$context['post_group'] ? '<br>
-						<span class="smalltext">' . Lang::getTxt('membergroups_new_board_post_groups', file: 'ManageMembers') . '</span>' : '', '
-					</dt>
-					<dd>';
-
-	template_add_edit_group_boards_list(false);
-
-	echo '
-					</dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('membergroups_add_group', file: 'Admin'), '" class="button">
-			</div><!-- .windowbg -->';
-
-	if (Utils::$context['undefined_group']) {
-		echo '
-			<script>
-				function swapPostGroup(isChecked)
-				{
-					var min_posts_text = document.getElementById(\'min_posts_text\');
-					document.getElementById(\'min_posts_input\').disabled = !isChecked;
-					min_posts_text.style.color = isChecked ? "" : "#888888";
-				}
-				swapPostGroup(', Utils::$context['post_group'] ? 'true' : 'false', ');
-			</script>';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-mmg_token_var'], '" value="', Utils::$context['admin-mmg_token'], '">
-		</form>';
-}
-
-/**
- * Edit an existing membergroup.
- */
-function template_edit_group()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=membergroups;sa=edit;group=', Utils::$context['group']['id'], '" method="post" accept-charset="UTF-8" name="groupForm" id="groupForm">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('membergroups_edit_group', ['name' => Utils::$context['group']['name']], file: 'ManageMembers'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="group_name_input"><strong>', Lang::getTxt('membergroups_edit_name', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="group_name" id="group_name_input" value="', Utils::$context['group']['editable_name'], '" size="30">
-					</dd>';
-
-	if (Utils::$context['group']['id'] != 3 && Utils::$context['group']['id'] != 4) {
-		echo '
-					<dt id="group_desc_text">
-						<label for="group_desc_input"><strong>', Lang::getTxt('membergroups_edit_desc', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<textarea name="group_desc" id="group_desc_input" rows="4" cols="40">', Utils::$context['group']['description'], '</textarea>
-					</dd>';
-	}
-
-	// Group type...
-	if (Utils::$context['group']['can_change_type']) {
-		echo '
-					<dt>
-						<label for="group_type"><strong>', Lang::getTxt('membergroups_edit_group_type', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<fieldset id="group_type">
-							<legend>', Lang::getTxt('membergroups_edit_select_group_type', file: 'ManageMembers'), '</legend>
-							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0"', !Utils::$context['group']['is_post_group'] && Utils::$context['group']['type'] == 0 ? ' checked' : '', (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : ''), '>', Lang::getTxt('membergroups_group_type_private', file: 'ManageMembers'), '</label><br>';
-
-		if (Utils::$context['group']['allow_protected']) {
-			echo '
-							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1"', Utils::$context['group']['type'] == 1 ? ' checked' : '', (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : ''), '>', Lang::getTxt('membergroups_group_type_protected', file: 'ManageMembers'), '</label><br>';
-		}
-
-		echo '
-							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2"', Utils::$context['group']['type'] == 2 ? ' checked' : '', (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : ''), '>', Lang::getTxt('membergroups_group_type_request', file: 'ManageMembers'), '</label><br>
-							<label for="group_type_free"><input type="radio" name="group_type" id="group_type_free" value="3"', Utils::$context['group']['type'] == 3 ? ' checked' : '', (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : ''), '>', Lang::getTxt('membergroups_group_type_free', file: 'ManageMembers'), '</label><br>';
-
-		if (Utils::$context['group']['allow_post_group']) {
-			echo '
-
-							<label for="group_type_post"><input type="radio" name="group_type" id="group_type_post" value="-1"', Utils::$context['group']['is_post_group'] ? ' checked' : '', ' onclick="swapPostGroup(1);">', Lang::getTxt('membergroups_group_type_post', file: 'ManageMembers'), '</label><br>';
-		}
-
-		echo '
-						</fieldset>
-					</dd>';
-	}
-
-	if (Utils::$context['group']['id'] != 3 && Utils::$context['group']['id'] != 4) {
-		echo '
-					<dt id="group_moderators_text">
-						<label for="group_moderators"><strong>', Lang::getTxt('moderators', file: 'General'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="group_moderators" id="group_moderators" value="', Utils::$context['group']['moderator_list'], '" size="30">
-						<div id="moderator_container"></div>
-					</dd>
-					<dt id="group_hidden_text">
-						<label for="group_hidden_input"><strong>', Lang::getTxt('membergroups_edit_hidden', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<select name="group_hidden" id="group_hidden_input" onchange="if (this.value == 2 &amp;&amp; !confirm(\'', Lang::getTxt('membergroups_edit_hidden_warning', file: 'ManageMembers'), '\')) this.value = 0;">
-							<option value="0"', Utils::$context['group']['hidden'] ? '' : ' selected', '>', Lang::getTxt('membergroups_edit_hidden_no', file: 'ManageMembers'), '</option>
-							<option value="1"', Utils::$context['group']['hidden'] == 1 ? ' selected' : '', '>', Lang::getTxt('membergroups_edit_hidden_boardindex', file: 'ManageMembers'), '</option>
-							<option value="2"', Utils::$context['group']['hidden'] == 2 ? ' selected' : '', '>', Lang::getTxt('membergroups_edit_hidden_all', file: 'ManageMembers'), '</option>
-						</select>
-					</dd>';
-	}
-
-	// Can they inherit permissions?
-	if (Utils::$context['group']['id'] > 1 && Utils::$context['group']['id'] != 3) {
-		echo '
-					<dt id="group_inherit_text">
-						<label for="group_inherit_input"><strong>', Lang::getTxt('membergroups_edit_inherit_permissions', file: 'ManageMembers'), '</strong></label><br>
-						<span class="smalltext">', Lang::getTxt('membergroups_edit_inherit_permissions_desc', file: 'ManageMembers'), '</span>
-					</dt>
-					<dd>
-						<select name="group_inherit" id="group_inherit_input">
-							<option value="-2">', Lang::getTxt('membergroups_edit_inherit_permissions_no', file: 'ManageMembers'), '</option>
-							<option value="-1"', Utils::$context['group']['inherited_from'] == -1 ? ' selected' : '', '>', Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => Lang::getTxt('membergroups_guests', file: 'Admin')]), '</option>
-							<option value="0"', Utils::$context['group']['inherited_from'] == 0 ? ' selected' : '', '>', Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => Lang::getTxt('membergroups_members', file: 'Admin')]), '</option>';
-
-		// For all the inheritable groups show an option.
-		foreach (Utils::$context['inheritable_groups'] as $id => $group) {
-			echo '
-							<option value="', $id, '"', Utils::$context['group']['inherited_from'] == $id ? ' selected' : '', '>', Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => $group], file: 'ManageMembers'), '</option>';
-		}
-
-		echo '
-						</select>
-						<input type="hidden" name="old_inherit" value="', Utils::$context['group']['inherited_from'], '">
-					</dd>';
-	}
-
-	if (Utils::$context['group']['allow_post_group']) {
-		echo '
-
-					<dt id="min_posts_text">
-						<label for="min_posts_input"><strong>', Lang::getTxt('membergroups_min_posts', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="number" name="min_posts" id="min_posts_input"', Utils::$context['group']['is_post_group'] ? ' value="' . Utils::$context['group']['min_posts'] . '"' : '', ' size="6">
-					</dd>';
-	}
-
-	echo '
-					<dt>
-						<label for="online_color_input"><strong>', Lang::getTxt('membergroups_online_color', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="online_color" id="online_color_input" value="', Utils::$context['group']['color'], '" size="20">
-					</dd>
-					<dt>
-						<label for="icon_count_input"><strong>', Lang::getTxt('membergroups_icon_count', file: 'ManageMembers'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="number" name="icon_count" id="icon_count_input" value="', Utils::$context['group']['icon_count'], '" size="4">
-					</dd>';
-
-	// Do we have any possible icons to select from?
-	if (!empty(Utils::$context['possible_icons'])) {
-		echo '
-					<dt>
-						<label for="icon_image_input"><strong>', Lang::getTxt('membergroups_icon_image', file: 'ManageMembers'), '</strong></label><br>
-						<span class="smalltext">', Lang::getTxt('membergroups_icon_image_note', file: 'ManageMembers'), '</span>
-						<span class="smalltext">', Lang::getTxt('membergroups_icon_image_size', file: 'ManageMembers'), '</span>
-					</dt>
-					<dd>
-						', Lang::getTxt('membergroups_images_url', file: 'ManageMembers'), '
-						<select name="icon_image" id="icon_image_input">';
-
-		// For every possible icon, create an option.
-		foreach (Utils::$context['possible_icons'] as $icon) {
-			echo '
-							<option value="', $icon, '"', Utils::$context['group']['icon_image'] == $icon ? ' selected' : '', '>', $icon, '</option>';
-		}
-
-		echo '
-						</select>
-						<img id="icon_preview" src="" alt="*">
-					</dd>';
-	}
-
-	// No? Hide the entire control.
-	else {
-	echo '
-					<input type="hidden" name="icon_image" value="">';
-	}
-
-	echo '
-					<dt>
-						<label for="max_messages_input"><strong>', Lang::getTxt('membergroups_max_messages', file: 'ManageMembers'), '</strong></label><br>
-						<span class="smalltext">', Lang::getTxt('membergroups_max_messages_note', file: 'ManageMembers'), '</span>
-					</dt>
-					<dd>
-						<input type="text" name="max_messages" id="max_messages_input" value="', Utils::$context['group']['id'] == 1 ? 0 : Utils::$context['group']['max_messages'], '" size="6"', Utils::$context['group']['id'] == 1 ? ' disabled' : '', '>
-					</dd>';
-
-	// Force 2FA for this membergroup?
-	if (!empty(Config::$modSettings['tfa_mode']) && Config::$modSettings['tfa_mode'] == 2) {
-		echo '
-					<dt>
-						<label for="group_tfa_force_input"><strong>', Lang::getTxt('membergroups_tfa_force', file: 'ManageMembers'), '</strong></label><br>
-						<span class="smalltext">', Lang::getTxt('membergroups_tfa_force_note', file: 'ManageMembers'), '</span>
-					</dt>
-					<dd>
-						<input type="checkbox" name="group_tfa_force"', Utils::$context['group']['tfa_required'] ? ' checked' : '', '>
-					</dd>';
-	}
-
-	if (!empty(Utils::$context['categories'])) {
-		echo '
-					<dt>
-						<strong>', Lang::getTxt('membergroups_new_board', file: 'ManageMembers'), '</strong>', Utils::$context['group']['is_post_group'] ? '<br>
-						<span class="smalltext">' . Lang::getTxt('membergroups_new_board_post_groups', file: 'ManageMembers') . '</span>' : '', '
-					</dt>
-					<dd>';
-
-		if (!empty(Utils::$context['can_manage_boards'])) {
-			echo Lang::getTxt('membergroups_can_manage_access', file: 'ManageMembers');
-		} else {
-		template_add_edit_group_boards_list(true, 'groupForm');
-		}
-
-		echo '
-					</dd>';
-	}
-
-	echo '
-				</dl>
-				<input type="submit" name="save" value="', Lang::getTxt('membergroups_edit_save', file: 'ManageMembers'), '" class="button">', Utils::$context['group']['allow_delete'] ? '
-				<input type="submit" name="delete" value="' . Lang::getTxt('membergroups_delete', file: 'ManageMembers') . '" data-confirm="' . Lang::getTxt(Utils::$context['is_moderator_group'] ? 'membergroups_confirm_delete_mod' : 'membergroups_confirm_delete', file: 'ManageMembers') . '" class="button you_sure">' : '', '
-			</div><!-- .windowbg -->
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-mmg_token_var'], '" value="', Utils::$context['admin-mmg_token'], '">
-		</form>
-	<script>
-		var oModeratorSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'group_moderators\',
-			sControlId: \'group_moderators\',
-			sSearchType: \'member\',
-			bItemList: true,
-			sPostName: \'moderator_list\',
-			sURLMask: \'action=profile;u=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			sItemListContainerId: \'moderator_container\',
-			aListItems: [';
-
-	foreach (Utils::$context['group']['moderators'] as $id_member => $member_name) {
-		echo '
-				{
-					sItemId: ', Utils::escapeJavaScript($id_member), ',
-					sItemName: ', Utils::escapeJavaScript($member_name), '
-				}', $id_member == Utils::$context['group']['last_moderator_id'] ? '' : ',';
-	}
-
-	echo '
-			]
-		});
-	</script>';
-
-	if (Utils::$context['group']['allow_post_group']) {
-		echo '
-	<script>
-		function swapPostGroup(isChecked)
-		{
-			var is_moderator_group = ', (int) Utils::$context['is_moderator_group'], ';
-			var group_type = ', Utils::$context['group']['type'], ';
-			var min_posts_text = document.getElementById(\'min_posts_text\');
-			var group_desc_text = document.getElementById(\'group_desc_text\');
-			var group_hidden_text = document.getElementById(\'group_hidden_text\');
-			var group_moderators_text = document.getElementById(\'group_moderators_text\');
-
-			// If it\'s a moderator group, warn of possible problems... and remember the group type
-			if (isChecked && is_moderator_group && !confirm(\'', Lang::getTxt('membergroups_swap_mod', file: 'ManageMembers'), '\'))
-			{
-				isChecked = false;
-
-				switch(group_type)
-				{
-					case 0:
-						document.getElementById(\'group_type_private\').checked = true;
-						break;
-					case 1:
-						document.getElementById(\'group_type_protected\').checked = true;
-						break;
-					case 2:
-						document.getElementById(\'group_type_request\').checked = true;
-						break;
-					case 3:
-						document.getElementById(\'group_type_free\').checked = true;
-						break;
-					default:
-						document.getElementById(\'group_type_private\').checked = true;
-						break;
-				}
-			}
-
-			document.forms.groupForm.min_posts.disabled = !isChecked;
-			min_posts_text.style.color = isChecked ? "" : "#888888";
-			document.forms.groupForm.group_desc_input.disabled = isChecked;
-			group_desc_text.style.color = !isChecked ? "" : "#888888";
-			document.forms.groupForm.group_hidden_input.disabled = isChecked;
-			group_hidden_text.style.color = !isChecked ? "" : "#888888";
-			document.forms.groupForm.group_moderators.disabled = isChecked;
-			group_moderators_text.style.color = !isChecked ? "" : "#888888";
-		}
-
-		swapPostGroup(', Utils::$context['group']['is_post_group'] ? 'true' : 'false', ');
-	</script>';
-	}
-}
-
-/**
- * The template for determining which boards a group has access to.
- *
- * @param bool $collapse Whether to collapse the list by default
- */
-function template_add_edit_group_boards_list($collapse = true, $form_id = 'new_group')
-{
-	echo '
-							<fieldset id="visible_boards"', !empty(Config::$modSettings['deny_boards_access']) ? ' class="denyboards_layout"' : '', '>
-								<legend>', Lang::getTxt('membergroups_new_board_desc', file: 'ManageMembers'), '</legend>
-								<ul class="padding floatleft">';
-
-	foreach (Utils::$context['categories'] as $category) {
-		if (empty(Config::$modSettings['deny_boards_access'])) {
-			echo '
-									<li class="category">
-										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'' . $form_id . '\'); return false;"><strong>', $category['name'], '</strong></a>
-										<ul>';
-		} else {
-		echo '
-									<li class="category clear">
-										<strong>', $category['name'], '</strong>
-										<span class="select_all_box floatright">
-											<em class="all_boards_in_cat">', Lang::getTxt('all_boards_in_cat', file: 'Admin'), '</em>
-											<select onchange="select_in_category(', $category['id'], ', this, [', implode(',', array_keys($category['boards'])), ']);">
-												<option>---</option>
-												<option value="allow">', Lang::getTxt('board_perms_allow', file: 'Admin'), '</option>
-												<option value="ignore">', Lang::getTxt('board_perms_ignore', file: 'Admin'), '</option>
-												<option value="deny">', Lang::getTxt('board_perms_deny', file: 'Admin'), '</option>
-											</select>
-										</span>
-										<ul id="boards_list_', $category['id'], '">';
-		}
-
-		foreach ($category['boards'] as $board) {
-			if (empty(Config::$modSettings['deny_boards_access'])) {
-				echo '
-											<li class="board" style="margin-inline-start: ', $board['child_level'], 'em;">
-												<input type="checkbox" name="boardaccess[', $board['id'], ']" id="brd', $board['id'], '" value="allow"', $board['allow'] ? ' checked' : '', '> <label for="brd', $board['id'], '">', $board['name'], '</label>
-											</li>';
-			} else {
-			echo '
-											<li class="board clear">
-												<span style="margin-inline-start: ', $board['child_level'], 'em;">', $board['name'], ': </span>
-												<span class="floatright">
-													<input type="radio" name="boardaccess[', $board['id'], ']" id="allow_brd', $board['id'], '" value="allow"', $board['allow'] ? ' checked' : '', '> <label for="allow_brd', $board['id'], '">', Lang::getTxt('permissions_option_on', file: 'ManagePermissions'), '</label>
-													<input type="radio" name="boardaccess[', $board['id'], ']" id="ignore_brd', $board['id'], '" value="ignore"', !$board['allow'] && !$board['deny'] ? ' checked' : '', '> <label for="ignore_brd', $board['id'], '">', Lang::getTxt('permissions_option_off', file: 'ManagePermissions'), '</label>
-													<input type="radio" name="boardaccess[', $board['id'], ']" id="deny_brd', $board['id'], '" value="deny"', $board['deny'] ? ' checked' : '', '> <label for="deny_brd', $board['id'], '">', Lang::getTxt('permissions_option_deny', file: 'ManagePermissions'), '</label>
-												</span>
-											</li>';
-			}
-		}
-
-		echo '
-										</ul>
-									</li>';
-	}
-
-	echo '
-								</ul>';
-
-	if (empty(Config::$modSettings['deny_boards_access'])) {
-		echo '
-								<br class="clear"><br>
-								<input type="checkbox" id="checkall_check" onclick="invertAll(this, this.form, \'boardaccess\');">
-								<label for="checkall_check"><em>', Lang::getTxt('check_all', file: 'General'), '</em></label>
-							</fieldset>';
-	} else {
-	echo '
-								<br class="clear">
-								<span class="select_all_box">
-									<em>', Lang::getTxt('all', file: 'General'), '</em>
-									<input type="radio" name="select_all" id="allow_all" onclick="selectAllRadio(this, this.form, \'boardaccess\', \'allow\');"> <label for="allow_all">', Lang::getTxt('board_perms_allow', file: 'Admin'), '</label>
-									<input type="radio" name="select_all" id="ignore_all" onclick="selectAllRadio(this, this.form, \'boardaccess\', \'ignore\');"> <label for="ignore_all">', Lang::getTxt('board_perms_ignore', file: 'Admin'), '</label>
-									<input type="radio" name="select_all" id="deny_all" onclick="selectAllRadio(this, this.form, \'boardaccess\', \'deny\');"> <label for="deny_all">', Lang::getTxt('board_perms_deny', file: 'Admin'), '</label>
-								</span>
-							</fieldset>
-							<script>
-								$(document).ready(function () {
-									$(".select_all_box").each(function () {
-										$(this).removeClass(\'select_all_box\');
-									});
-								});
-							</script>';
-	}
-
-	if ($collapse) {
-		echo '
-							<a href="javascript:void(0);" onclick="document.getElementById(\'visible_boards\').classList.remove(\'hidden\'); document.getElementById(\'visible_boards_link\').classList.add(\'hidden\'); return false;" id="visible_boards_link" class="hidden">[ ', Lang::getTxt('membergroups_select_visible_boards', file: 'ManageMembers'), ' ]</a>
-							<script>
-								document.getElementById("visible_boards_link").classList.remove(\'hidden\');
-								document.getElementById("visible_boards").classList.add(\'hidden\');
-							</script>';
-	}
-}
-
-/**
- * Template for viewing the members of a group.
- */
-function template_group_members()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;group=', Utils::$context['group']['id'], '" method="post" accept-charset="UTF-8" id="view_group">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('name', file: 'General'), '</strong>
-					</dt>
-					<dd>
-						<span ', Utils::$context['group']['online_color'] ? 'style="color: ' . Utils::$context['group']['online_color'] . ';"' : '', '>', Utils::$context['group']['name'], '</span> ', Utils::$context['group']['icons'], '
-					</dd>';
-
-	// Any description to show?
-	if (!empty(Utils::$context['group']['description'])) {
-		echo '
-					<dt>
-						<strong>' . Lang::getTxt('membergroups_members_description', file: 'ManageMembers') . '</strong>
-					</dt>
-					<dd>
-						', Utils::$context['group']['description'], '
-					</dd>';
-	}
-
-	echo '
-					<dt>
-						<strong>', Lang::getTxt('membergroups_members_top', file: 'ManageMembers'), '</strong>
-					</dt>
-					<dd>
-						', Utils::$context['total_members'], '
-					</dd>';
-
-	// Any group moderators to show?
-	if (!empty(Utils::$context['group']['moderators'])) {
-		$moderators = [];
-
-		foreach (Utils::$context['group']['moderators'] as $moderator) {
-			$moderators[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>';
-		}
-
-		echo '
-					<dt>
-						<strong>', Lang::getTxt('membergroups_members_group_moderators', file: 'ManageMembers'), '</strong>
-					</dt>
-					<dd>
-						', implode(', ', $moderators), '
-					</dd>';
-	}
-
-	echo '
-				</dl>
-			</div><!-- .windowbg -->
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('membergroups_members_group_members', file: 'ManageMembers'), '</h3>
-			</div>
-			<br>
-			<div class="pagesection">
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>
-			</div>
-			<table class="table_grid" id="group_members">
-				<thead>
-					<tr class="title_bar">
-						<th class="user_name"><a href="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;start=', Utils::$context['start'], ';sort=name', Utils::$context['sort_by'] == 'name' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', ';group=', Utils::$context['group']['id'], '">', Lang::getTxt('name', file: 'General'), Utils::$context['sort_by'] == 'name' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>';
-
-	if (Utils::$context['can_send_email']) {
-		echo '
-						<th class="email"><a href="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;start=', Utils::$context['start'], ';sort=email', Utils::$context['sort_by'] == 'email' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', ';group=', Utils::$context['group']['id'], '">', Lang::getTxt('email', file: 'General'), Utils::$context['sort_by'] == 'email' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>';
-	}
-
-	echo '
-						<th class="last_active"><a href="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;start=', Utils::$context['start'], ';sort=active', Utils::$context['sort_by'] == 'active' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', ';group=', Utils::$context['group']['id'], '">', Lang::getTxt('membergroups_members_last_active', file: 'ManageMembers'), Utils::$context['sort_by'] == 'active' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>
-						<th class="date_registered"><a href="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;start=', Utils::$context['start'], ';sort=registered', Utils::$context['sort_by'] == 'registered' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', ';group=', Utils::$context['group']['id'], '">', Lang::getTxt('date_registered', file: 'General'), Utils::$context['sort_by'] == 'registered' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>
-						<th class="posts"', empty(Utils::$context['can_add_remove']) ? ' colspan="2"' : '', '>
-							<a href="', Config::$scripturl, '?action=', Utils::$context['current_action'], (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : ''), ';sa=members;start=', Utils::$context['start'], ';sort=posts', Utils::$context['sort_by'] == 'posts' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', ';group=', Utils::$context['group']['id'], '">', Lang::getTxt('posts', file: 'General'), Utils::$context['sort_by'] == 'posts' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a>
-						</th>';
-
-	if (!empty(Utils::$context['can_add_remove'])) {
-		echo '
-						<th class="quick_moderation" style="width: 4%"><input type="checkbox" onclick="invertAll(this, this.form);"></th>';
-	}
-
-	echo '
-					</tr>
-				</thead>
-				<tbody>';
-
-	if (empty(Utils::$context['members'])) {
-		echo '
-					<tr class="windowbg">
-						<td colspan="6">', Lang::getTxt('membergroups_members_no_members', file: 'ManageMembers'), '</td>
-					</tr>';
-	}
-
-	foreach (Utils::$context['members'] as $member) {
-		echo '
-					<tr class="windowbg">
-						<td class="user_name">', $member['link'], '</td>';
-
-		if (Utils::$context['can_send_email']) {
-			echo '
-						<td class="email">
-								<a href="mailto:', $member['email'], '">', $member['email'], '</a>
-						</td>';
-		}
-
-		echo '
-						<td class="last_active">', $member['last_login'], '</td>
-						<td class="date_registered">', $member['registered'], '</td>
-						<td class="posts"', empty(Utils::$context['can_add_remove']) ? ' colspan="2"' : '', '>', $member['posts'], '</td>';
-
-		if (!empty(Utils::$context['can_add_remove'])) {
-			echo '
-						<td class="quick_moderation" style="width: 4%"><input type="checkbox" name="rem[]" value="', $member['id'], '" ', (User::$me->id == $member['id'] && Utils::$context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . Lang::getTxt('membergroups_members_deadmin_confirm', file: 'ManageMembers') . '\')" ' : ''), '/></td>';
-		}
-
-		echo '
-					</tr>';
-	}
-
-	echo '
-				</tbody>
-			</table>';
-
-	if (!empty(Utils::$context['can_add_remove'])) {
-		echo '
-			<div class="floatright">
-				<input type="submit" name="remove" value="', Lang::getTxt('membergroups_members_remove', file: 'ManageMembers'), '" class="button ">
-			</div>';
-	}
-
-	echo '
-			<div class="pagesection">
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>
-			</div>
-			<br>';
-
-	if (!empty(Utils::$context['can_add_remove'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('membergroups_members_add_title', file: 'ManageMembers'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<strong><label for="toAdd">', Lang::getTxt('membergroups_members_add_desc', file: 'ManageMembers'), '</label></strong>
-					</dt>
-					<dd>
-						<input type="text" name="toAdd" id="toAdd" value="">
-						<div id="toAddItemContainer"></div>
-					</dd>
-				</dl>
-				<input type="submit" name="add" value="', Lang::getTxt('membergroups_members_add', file: 'ManageMembers'), '" class="button">
-			</div>';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['mod-mgm_token_var'], '" value="', Utils::$context['mod-mgm_token'], '">
-		</form>';
-
-	if (!empty(Utils::$context['can_add_remove'])) {
-		echo '
-	<script>
-		var oAddMemberSuggest = new smc_AutoSuggest({
-			sSessionId: \'', Utils::$context['session_id'], '\',
-			sSessionVar: \'', Utils::$context['session_var'], '\',
-			sSuggestId: \'to_suggest\',
-			sControlId: \'toAdd\',
-			sSearchType: \'member\',
-			sPostName: \'member_add\',
-			sURLMask: \'action=profile;u=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			bItemList: true,
-			sItemListContainerId: \'toAddItemContainer\'
-		});
-	</script>';
-	}
-}
-
-/**
- * Allow the moderator to enter a reason to each user being rejected.
- */
-function template_group_request_reason()
-{
-	// Show a welcome message to the user.
-	echo '
-	<div id="moderationcenter">
-		<form action="', Config::$scripturl, '?action=groups;sa=requests" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_groups_reason_title', file: 'ModerationCenter'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">';
-
-	// Loop through and print out a reason box for each...
-	foreach (Utils::$context['group_requests'] as $request) {
-		echo '
-					<dt>
-						<strong>', Lang::getTxt('mc_groupr_reason_desc', $request, file: 'ModerationCenter'), ':</strong>
-					</dt>
-					<dd>
-						<input type="hidden" name="groupr[]" value="', $request['id'], '">
-						<textarea name="groupreason[', $request['id'], ']" rows="3" cols="40"></textarea>
-					</dd>';
-	}
-
-	echo '
-				</dl>
-				<input type="submit" name="go" value="', Lang::getTxt('mc_groupr_submit', file: 'ModerationCenter'), '" class="button">
-				<input type="hidden" name="req_action" value="got_reason">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['mod-gr_token_var'], '" value="', Utils::$context['mod-gr_token'], '">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #moderationcenter -->';
-}
diff --git a/Themes/default/ManageMembers.template.php b/Themes/default/ManageMembers.template.php
deleted file mode 100644
index 1fca2cc54f9..00000000000
--- a/Themes/default/ManageMembers.template.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * The admin member search form
- */
-function template_search_members()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=viewmembers" method="post" accept-charset="UTF-8" id="admin_form_wrapper">
-			<input type="hidden" name="sa" value="query">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="floatleft">', Lang::getTxt('search_for', file: 'General'), '</span>
-					<span class="smalltext floatright">', Lang::getTxt('wild_cards_allowed', file: 'Admin'), '</span>
-				</h3>
-			</div>
-			<div class="windowbg">
-				<div class="flow_hidden">
-					<div class="msearch_details floatleft">
-						<dl class="settings right">
-							<dt class="righttext">
-								<strong><label for="mem_id">', Lang::getTxt('member_id', file: 'Admin'), '</label></strong>
-								<select name="types[mem_id]">
-									<option value="--">&lt;</option>
-									<option value="-">&lt;=</option>
-									<option value="=" selected>=</option>
-									<option value="+">&gt;=</option>
-									<option value="++">&gt;</option>
-								</select>
-							</dt>
-							<dd>
-								<input type="number" name="mem_id" id="mem_id" value="" size="6">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="age">', Lang::getTxt('age', file: 'Admin'), '</label></strong>
-								<select name="types[age]">
-									<option value="--">&lt;</option>
-									<option value="-">&lt;=</option>
-									<option value="=" selected>=</option>
-									<option value="+">&gt;=</option>
-									<option value="++">&gt;</option>
-								</select>
-							</dt>
-							<dd>
-								<input type="number" name="age" id="age" value="" size="6">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="posts">', Lang::getTxt('member_postcount', file: 'General'), '</label></strong>
-								<select name="types[posts]">
-									<option value="--">&lt;</option>
-									<option value="-">&lt;=</option>
-									<option value="=" selected>=</option>
-									<option value="+">&gt;=</option>
-									<option value="++">&gt;</option>
-								</select>
-							</dt>
-							<dd>
-								<input type="number" name="posts" id="posts" value="" size="6">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="reg_date">', Lang::getTxt('date_registered', file: 'General'), '</label></strong>
-								<select name="types[reg_date]">
-									<option value="--">&lt;</option>
-									<option value="-">&lt;=</option>
-									<option value="=" selected>=</option>
-									<option value="+">&gt;=</option>
-									<option value="++">&gt;</option>
-								</select>
-							</dt>
-							<dd>
-								<input type="date" name="reg_date" id="reg_date" value="" size="10"><span class="smalltext"></span>
-							</dd>
-							<dt class="righttext">
-								<strong><label for="last_online">', Lang::getTxt('viewmembers_online', file: 'Admin'), '</label></strong>
-								<select name="types[last_online]">
-									<option value="--">&lt;</option>
-									<option value="-">&lt;=</option>
-									<option value="=" selected>=</option>
-									<option value="+">&gt;=</option>
-									<option value="++">&gt;</option>
-								</select>
-							</dt>
-							<dd>
-								<input type="date" name="last_online" id="last_online" value="" size="10"><span class="smalltext"></span>
-							</dd>
-						</dl>
-					</div><!-- .msearch_details -->
-					<div class="msearch_details floatright">
-						<dl class="settings right">
-							<dt class="righttext">
-								<strong><label for="membername">', Lang::getTxt('username', file: 'General'), '</label></strong>
-							</dt>
-							<dd>
-								<input type="text" name="membername" id="membername" value="">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="email">', Lang::getTxt('email_address', file: 'Admin'), '</label></strong>
-							</dt>
-							<dd>
-								<input type="email" name="email" id="email" value="">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="website">', Lang::getTxt('website', file: 'General'), '</label></strong>
-							</dt>
-							<dd>
-								<input type="url" name="website" id="website" value="">
-							</dd>
-							<dt class="righttext">
-								<strong><label for="ip">', Lang::getTxt('ip_address', file: 'General'), '</label></strong>
-							</dt>
-							<dd>
-								<input type="text" name="ip" id="ip" value="">
-							</dd>
-						</dl>
-					</div><!-- .msearch_details -->
-					<div class="msearch_details floatright">
-						<fieldset>
-							<legend>', Lang::getTxt('activation_status', file: 'Admin'), '</legend>
-							<label for="activated-0"><input type="checkbox" name="activated[]" value="1" id="activated-0" checked> ', Lang::getTxt('activated', file: 'Admin'), '</label>&nbsp;&nbsp;
-							<label for="activated-1"><input type="checkbox" name="activated[]" value="0" id="activated-1" checked> ', Lang::getTxt('not_activated', file: 'Admin'), '</label>
-						</fieldset>
-					</div>
-				</div><!-- .flow_hidden -->
-			</div><!-- ..windowbg -->
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('member_part_of_these_membergroups', file: 'Admin'), '</h3>
-			</div>
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th scope="col">', Lang::getTxt('membergroups', file: 'Admin'), '</th>
-						<th scope="col" class="centercol quarter_table">', Lang::getTxt('primary', file: 'Admin'), '</th>
-						<th scope="col" class="centercol quarter_table">', Lang::getTxt('additional', file: 'Admin'), '</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-	foreach (Utils::$context['membergroups'] as $membergroup) {
-		echo '
-					<tr class="windowbg">
-						<td>', $membergroup['name'], '</td>
-						<td class="centercol">
-							<input type="checkbox" name="membergroups[1][]" value="', $membergroup['id'], '" checked>
-						</td>
-						<td class="centercol">
-							', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked>' : '', '
-						</td>
-					</tr>';
-	}
-
-	echo '
-					<tr class="windowbg">
-						<td>
-							<em>', Lang::getTxt('check_all', file: 'General'), '</em>
-						</td>
-						<td class="centercol">
-							<input type="checkbox" onclick="invertAll(this, this.form, \'membergroups[1]\');" checked>
-						</td>
-						<td class="centercol">
-							<input type="checkbox" onclick="invertAll(this, this.form, \'membergroups[2]\');" checked>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th scope="col">
-							', Lang::getTxt('membergroups_postgroups', file: 'ManageMembers'), '
-						</th>
-						<th class="quarter_table"></th>
-					</tr>
-				</thead>
-				<tbody>';
-
-	foreach (Utils::$context['postgroups'] as $postgroup) {
-		echo '
-					<tr class="windowbg">
-						<td>
-							', $postgroup['name'], '
-						</td>
-						<td class="centercol">
-							<input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked>
-						</td>
-					</tr>';
-	}
-
-	echo '
-					<tr class="windowbg">
-						<td>
-							<em>', Lang::getTxt('check_all', file: 'General'), '</em>
-						</td>
-						<td class="centercol">
-							<input type="checkbox" onclick="invertAll(this, this.form, \'postgroups[]\');" checked>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			<br>
-			<input type="submit" value="', Lang::getTxt('search', file: 'General'), '" class="button">
-		</form>';
-}
-
-/**
- * The admin member list.
- */
-function template_admin_browse()
-{
-	template_show_list('approve_list');
-
-	// If we have lots of outstanding members try to make the admin's life easier.
-	if (Utils::$context['approve_list']['total_num_items'] > -1) {
-		Utils::$context['browse_type'] = 'activate';
-		echo '
-		<br>
-		<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=viewmembers" method="post" accept-charset="UTF-8" name="postFormOutstanding" id="postFormOutstanding" onsubmit="return onOutstandingSubmit();">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('admin_browse_outstanding', file: 'ManageMembers'), '</h3>
-			</div>
-			<script>
-				function onOutstandingSubmit()
-				{
-					if (document.forms.postFormOutstanding.todo.value == "")
-						return;
-
-					var message = "";
-					if (document.forms.postFormOutstanding.todo.value.indexOf("delete") != -1)
-						message = "', Lang::getTxt('admin_browse_w_delete', file: 'ManageMembers'), '";
-					else if (document.forms.postFormOutstanding.todo.value.indexOf("reject") != -1)
-						message = "', Lang::getTxt('admin_browse_w_reject', file: 'ManageMembers'), '";
-					else if (document.forms.postFormOutstanding.todo.value == "remind")
-						message = "', Lang::getTxt('admin_browse_w_remind', file: 'ManageMembers'), '";
-					else
-						message = "', Lang::getTxt(Utils::$context['browse_type'] == 'approve' ? 'admin_browse_w_approve' : 'admin_browse_w_activate', file: 'ManageMembers'), '";
-
-					if (confirm(message + " ', Lang::getTxt('admin_browse_outstanding_warn', file: 'ManageMembers'), '"))
-						return true;
-					else
-						return false;
-				}
-			</script>
-
-			<div class="windowbg">
-				<p class="settings">
-					',
-					Lang::getTxt(
-						'admin_browse_outstanding_days',
-						[
-							'input' => '<input type="number" name="time_passed" value="14">',
-							'number' => 14,
-						],
-						file: 'ManageMembers',
-					), '
-				</p>
-				<dl class="settings">
-					<dt>
-						', Lang::getTxt('admin_browse_outstanding_perform', file: 'ManageMembers'), ':
-					</dt>
-					<dd>
-						<select name="todo">
-							', Utils::$context['browse_type'] == 'activate' ? '
-							<option value="ok">' . Lang::getTxt('admin_browse_w_activate', file: 'ManageMembers') . '</option>' : '', '
-							<option value="okemail">', Lang::getTxt(Utils::$context['browse_type'] == 'approve' ? 'admin_browse_w_approve_send_email' : 'admin_browse_w_activate_send_email', file: 'ManageMembers'), '</option>', Utils::$context['browse_type'] == 'activate' ? '' : '
-							<option value="require_activation">' . Lang::getTxt('admin_browse_w_approve_require_activate', file: 'ManageMembers') . '</option>', '
-							<option value="reject">', Lang::getTxt('admin_browse_w_reject', file: 'ManageMembers'), '</option>
-							<option value="rejectemail">', Lang::getTxt('admin_browse_w_reject_send_email', file: 'ManageMembers'), '</option>
-							<option value="delete">', Lang::getTxt('admin_browse_w_delete', file: 'ManageMembers'), '</option>
-							<option value="deleteemail">', Lang::getTxt('admin_browse_w_delete_send_email', file: 'ManageMembers'), '</option>', Utils::$context['browse_type'] == 'activate' ? '
-							<option value="remind">' . Lang::getTxt('admin_browse_w_remind', file: 'ManageMembers') . '</option>' : '', '
-						</select>
-					</dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('admin_browse_outstanding_go', file: 'ManageMembers'), '" class="button">
-				<input type="hidden" name="type" value="', Utils::$context['browse_type'], '">
-				<input type="hidden" name="sort" value="', Utils::$context['approve_list']['sort']['id'], '">
-				<input type="hidden" name="start" value="', Utils::$context['approve_list']['start'], '">
-				<input type="hidden" name="orig_filter" value="', Utils::$context['current_filter'], '">
-				<input type="hidden" name="sa" value="approve">', !empty(Utils::$context['approve_list']['sort']['desc']) ? '
-				<input type="hidden" name="desc" value="1">' : '', '
-			</div><!-- .windowbg -->
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>';
-	}
-}
diff --git a/Themes/default/ManageNews.template.php b/Themes/default/ManageNews.template.php
deleted file mode 100644
index f539576deaf..00000000000
--- a/Themes/default/ManageNews.template.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * The template for sending newsletters
- */
-function template_email_members()
-{
-	// Are we done sending the newsletter?
-	if (!empty(Utils::$context['newsletter_sent'])) {
-		echo '
-	<div class="infobox">', Lang::getTxt('admin_news_newsletter_' . Utils::$context['newsletter_sent'], file: 'Admin'), '</div>';
-	}
-
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=news;sa=mailingcompose" method="post" id="admin_newsletters" class="flow_hidden" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('admin_newsletters', file: 'Admin'), '</h3>
-			</div>
-			<div class="information noup">
-				', Lang::getTxt('admin_news_select_recipients', file: 'Admin'), '
-			</div>
-			<div class="windowbg noup">
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('admin_news_select_group', file: 'Admin'), '</strong><br>
-						<span class="smalltext">', Lang::getTxt('admin_news_select_group_desc', file: 'Admin'), '</span>
-					</dt>
-					<dd>';
-
-	foreach (Utils::$context['groups'] as $group) {
-		echo '
-						<label for="groups_', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'] ?? Lang::getTxt('not_applicable', file: 'General'), ')</em><br>';
-	}
-
-	echo '
-						<br>
-						<label for="checkAllGroups"><input type="checkbox" id="checkAllGroups" checked onclick="invertAll(this, this.form, \'groups\');"> <em>', Lang::getTxt('check_all', file: 'General'), '</em></label>
-					</dd>
-				</dl>
-				<div id="advanced_panel_header" class="title_bar">
-					<h3 class="titlebg">
-						<a href="#" id="advanced_panel_link">', Lang::getTxt('advanced', file: 'Admin'), '</a>
-					</h3>
-					<span id="advanced_panel_toggle" class="toggle_down" style="display: none;"></span>
-				</div>
-				<div id="advanced_panel_div" class="padding">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('admin_news_select_email', file: 'Admin'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('admin_news_select_email_desc', file: 'Admin'), '</span>
-						</dt>
-						<dd>
-							<textarea name="emails" rows="5" cols="30" style="width: 98%;"></textarea>
-						</dd>
-						<dt>
-							<strong>', Lang::getTxt('admin_news_select_members', file: 'Admin'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('admin_news_select_members_desc', file: 'Admin'), '</span>
-						</dt>
-						<dd>
-							<input type="text" name="members" id="members" value="" size="30">
-							<span id="members_container"></span>
-						</dd>
-					</dl>
-					<hr class="bordercolor">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('admin_news_select_excluded_groups', file: 'Admin'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('admin_news_select_excluded_groups_desc', file: 'Admin'), '</span>
-						</dt>
-						<dd>';
-
-	foreach (Utils::$context['groups'] as $group) {
-		echo '
-							<label for="exclude_groups_', $group['id'], '"><input type="checkbox" name="exclude_groups[', $group['id'], ']" id="exclude_groups_', $group['id'], '" value="', $group['id'], '"> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em><br>';
-	}
-
-	echo '
-							<br>
-							<label for="checkAllGroupsExclude"><input type="checkbox" id="checkAllGroupsExclude" onclick="invertAll(this, this.form, \'exclude_groups\');"> <em>', Lang::getTxt('check_all', file: 'General'), '</em></label><br>
-						</dd>
-						<dt>
-							<strong>', Lang::getTxt('admin_news_select_excluded_members', file: 'Admin'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('admin_news_select_excluded_members_desc', file: 'Admin'), '</span>
-						</dt>
-							<dd>
-							<input type="text" name="exclude_members" id="exclude_members" value="" size="30">
-							<span id="exclude_members_container"></span>
-						</dd>
-					</dl>
-					<hr class="bordercolor">
-					<dl class="settings">
-						<dt>
-							<label for="email_force"><strong>', Lang::getTxt('admin_news_select_override_notify', file: 'Admin'), '</strong></label><br>
-							<span class="smalltext">', Lang::getTxt('email_force', file: 'Admin'), '</span>
-						</dt>
-						<dd>
-							<input type="checkbox" name="email_force" id="email_force" value="1">
-						</dd>
-					</dl>
-				</div><!-- #advanced_panel_div -->
-				<br>
-				<input type="submit" value="', Lang::getTxt('admin_next', file: 'Admin'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</div><!-- .windowbg -->
-		</form>';
-
-	// This is some javascript for the simple/advanced toggling and member suggest
-	echo '
-	<script>
-		var oAdvancedPanelToggle = new smc_Toggle({
-			bToggleEnabled: true,
-			bCurrentlyCollapsed: true,
-			aSwappableContainers: [
-				\'advanced_panel_div\'
-			],
-			aSwapImages: [
-				{
-					sId: \'advanced_panel_toggle\',
-					altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-					altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-				}
-			],
-			aSwapLinks: [
-				{
-					sId: \'advanced_panel_link\',
-					msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('advanced', file: 'Admin')), ',
-					msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('advanced', file: 'Admin')), '
-				}
-			]
-		});
-	</script>
-	<script>
-		var oMemberSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'members\',
-			sControlId: \'members\',
-			sSearchType: \'member\',
-			bItemList: true,
-			sPostName: \'member_list\',
-			sURLMask: \'action=profile;u=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			sItemListContainerId: \'members_container\',
-			aListItems: []
-		});
-		var oExcludeMemberSuggest = new smc_AutoSuggest({
-			sSessionId: \'', Utils::$context['session_id'], '\',
-			sSessionVar: \'', Utils::$context['session_var'], '\',
-			sSuggestId: \'exclude_members\',
-			sControlId: \'exclude_members\',
-			sSearchType: \'member\',
-			bItemList: true,
-			sPostName: \'exclude_member_list\',
-			sURLMask: \'action=profile;u=%item_id%\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-			sItemListContainerId: \'exclude_members_container\',
-			aListItems: []
-		});
-	</script>';
-}
-
-/**
- * The form for composing a newsletter
- */
-function template_email_members_compose()
-{
-	echo '
-	<div id="preview_section"', isset(Utils::$context['preview_message']) ? '' : ' class="hidden"', '>
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span id="preview_subject">', empty(Utils::$context['preview_subject']) ? '' : Utils::$context['preview_subject'], '</span>
-			</h3>
-		</div>
-		<div class="windowbg">
-			<div class="post" id="preview_body">
-				', empty(Utils::$context['preview_message']) ? '<br>' : Utils::$context['preview_message'], '
-			</div>
-		</div>
-	</div>
-	<br>';
-
-	echo '
-		<form name="newsmodify" action="', Config::$scripturl, '?action=admin;area=news;sa=mailingsend" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="', Config::$scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('admin_newsletters', file: 'Admin'), '
-				</h3>
-			</div>
-			<div class="information noup">
-				', Lang::getTxt('email_variables', ['scripturl' => Config::$scripturl], file: 'Admin'), '
-			</div>
-			<div class="windowbg noup">
-				<div class="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty(Utils::$context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
-					<dl>
-						<dt>
-							<strong id="error_serious">', Lang::getTxt('error_while_submitting', file: 'General'), '</strong>
-						</dt>
-						<dd class="error" id="error_list">
-							', empty(Utils::$context['post_error']['messages']) ? '' : implode('<br>', Utils::$context['post_error']['messages']), '
-						</dd>
-					</dl>
-				</div>
-				<dl id="post_header">
-					<dt>
-						<label', (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : ''), ' for="subject" id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</label>
-					</dt>
-					<dd id="pm_subject">
-						<input type="text" id="subject" name="subject" value="', Utils::$context['subject'], '" size="80" maxlength="84"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
-					</dd>
-				</dl>
-				<div id="bbcBox_message"></div>';
-
-	// What about smileys?
-	if (!empty(Utils::$context['smileys']['postform']) || !empty(Utils::$context['smileys']['popup'])) {
-		echo '
-				<div id="smileyBox_message"></div>';
-	}
-
-	// Show BBC buttons, smileys and textbox.
-	echo '
-				', template_control_richedit(Utils::$context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
-
-	echo '
-				<ul>
-					<li><label for="send_pm"><input type="checkbox" name="send_pm" id="send_pm"', !empty(Utils::$context['send_pm']) ? ' checked' : '', ' onclick="checkboxes_status(this);"> ', Lang::getTxt('email_as_pms', file: 'Admin'), '</label></li>
-					<li><label for="send_html"><input type="checkbox" name="send_html" id="send_html"', !empty(Utils::$context['send_html']) ? ' checked' : '', ' onclick="checkboxes_status(this);"> ', Lang::getTxt('email_as_html', file: 'Admin'), '</label></li>
-					<li><label for="parse_html"><input type="checkbox" name="parse_html" id="parse_html" checked disabled> ', Lang::getTxt('email_parsed_html', file: 'Admin'), '</label></li>
-				</ul>
-				<span id="post_confirm_buttons">
-					', template_control_richedit_buttons(Utils::$context['post_box_name']), '
-				</span>
-			</div><!-- .windowbg -->
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="email_force" value="', Utils::$context['email_force'], '">
-			<input type="hidden" name="total_emails" value="', Utils::$context['total_emails'], '">';
-
-	foreach (Utils::$context['recipients'] as $key => $values) {
-		echo '
-			<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
-	}
-
-	echo '
-			<script>';
-
-	// The functions used to preview a posts without loading a new page.
-	echo '
-				var txt_preview_title = "', Lang::getTxt('preview_title', file: 'General'), '";
-				var txt_preview_fetch = "', Lang::getTxt('preview_fetch', file: 'General'), '";
-				function previewPost()
-				{
-					if (window.XMLHttpRequest)
-					{
-						// Opera didn\'t support setRequestHeader() before 8.01.
-						// @todo Remove support for old browsers
-						if (\'opera\' in window)
-						{
-							// Handle the WYSIWYG editor.
-							if (textFields[i] == ', Utils::escapeJavaScript(Utils::$context['post_box_name']), ' && ', Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']), ' in window && oEditorHandle_', Utils::$context['post_box_name'], '.bRichTextEnabled)
-								x[x.length] = \'message_mode=1&\' + textFields[i] + \'=\' + oEditorHandle_', Utils::$context['post_box_name'], '.getText(false).php_to8bit().php_urlencode();
-							else
-								x[x.length] = textFields[i] + \'=\' + document.forms.newsmodify[textFields[i]].value.php_to8bit().php_urlencode();
-						}
-						// @todo Currently not sending poll options and option checkboxes.
-						var x = new Array();
-						var textFields = [\'subject\', ', Utils::escapeJavaScript(Utils::$context['post_box_name']), '];
-						var checkboxFields = [\'send_html\', \'send_pm\'];
-
-						for (var i = 0, n = textFields.length; i < n; i++)
-							if (textFields[i] in document.forms.newsmodify)
-							{
-								// Handle the WYSIWYG editor.
-								if (textFields[i] == ', Utils::escapeJavaScript(Utils::$context['post_box_name']), ' && ', Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']), ' in window && oEditorHandle_', Utils::$context['post_box_name'], '.bRichTextEnabled)
-									x[x.length] = \'message_mode=1&\' + textFields[i] + \'=\' + oEditorHandle_', Utils::$context['post_box_name'], '.getText(false).replace(/&#/g, \'&#38;#\').php_to8bit().php_urlencode();
-								else
-									x[x.length] = textFields[i] + \'=\' + document.forms.newsmodify[textFields[i]].value.replace(/&#/g, \'&#38;#\').php_to8bit().php_urlencode();
-							}
-						for (var i = 0, n = checkboxFields.length; i < n; i++)
-							if (checkboxFields[i] in document.forms.newsmodify && document.forms.newsmodify.elements[checkboxFields[i]].checked)
-								x[x.length] = checkboxFields[i] + \'=\' + document.forms.newsmodify.elements[checkboxFields[i]].value;
-
-						x[x.length] = \'item=newsletterpreview\';
-
-						sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + \'action=xmlhttp;sa=previews;xml\', x.join(\'&\'), onDocSent);
-
-						document.getElementById(\'preview_section\').style.display = \'\';
-						setInnerHTML(document.getElementById(\'preview_subject\'), txt_preview_title);
-						setInnerHTML(document.getElementById(\'preview_body\'), txt_preview_fetch);
-
-						return false;
-					}
-					else
-						return submitThisOnce(document.forms.newsmodify);
-				}
-				function onDocSent(XMLDoc)
-				{
-					if (!XMLDoc)
-					{
-						document.forms.newsmodify.preview.onclick = new function ()
-						{
-							return true;
-						}
-						document.forms.newsmodify.preview.click();
-					}
-
-					// Show the preview section.
-					var preview = XMLDoc.getElementsByTagName(\'smf\')[0].getElementsByTagName(\'preview\')[0];
-					setInnerHTML(document.getElementById(\'preview_subject\'), preview.getElementsByTagName(\'subject\')[0].firstChild.nodeValue);
-
-					var bodyText = \'\';
-					for (var i = 0, n = preview.getElementsByTagName(\'body\')[0].childNodes.length; i < n; i++)
-						bodyText += preview.getElementsByTagName(\'body\')[0].childNodes[i].nodeValue;
-
-					setInnerHTML(document.getElementById(\'preview_body\'), bodyText);
-					document.getElementById(\'preview_body\').className = \'post\';
-
-					// Show a list of errors (if any).
-					var errors = XMLDoc.getElementsByTagName(\'smf\')[0].getElementsByTagName(\'errors\')[0];
-					var errorList = new Array();
-					for (var i = 0, numErrors = errors.getElementsByTagName(\'error\').length; i < numErrors; i++)
-						errorList[errorList.length] = errors.getElementsByTagName(\'error\')[i].firstChild.nodeValue;
-					document.getElementById(\'errors\').style.display = numErrors == 0 ? \'none\' : \'\';
-					setInnerHTML(document.getElementById(\'error_list\'), numErrors == 0 ? \'\' : errorList.join(\'<br>\'));
-
-					// Adjust the color of captions if the given data is erroneous.
-					var captions = errors.getElementsByTagName(\'caption\');
-					for (var i = 0, numCaptions = errors.getElementsByTagName(\'caption\').length; i < numCaptions; i++)
-						if (document.getElementById(\'caption_\' + captions[i].getAttribute(\'name\')))
-							document.getElementById(\'caption_\' + captions[i].getAttribute(\'name\')).className = captions[i].getAttribute(\'class\');
-
-					if (errors.getElementsByTagName(\'post_error\').length == 1)
-						document.forms.newsmodify.', Utils::$context['post_box_name'], '.style.border = \'1px solid red\';
-					else if (document.forms.newsmodify.', Utils::$context['post_box_name'], '.style.borderColor == \'red\' || document.forms.newsmodify.', Utils::$context['post_box_name'], '.style.borderColor == \'red red red red\')
-					{
-						if (\'runtimeStyle\' in document.forms.newsmodify.', Utils::$context['post_box_name'], ')
-							document.forms.newsmodify.', Utils::$context['post_box_name'], '.style.borderColor = \'\';
-						else
-							document.forms.newsmodify.', Utils::$context['post_box_name'], '.style.border = null;
-					}
-					location.hash = \'#\' + \'preview_section\';
-				}
-			</script>';
-
-	echo '
-			<script>
-				function checkboxes_status (item)
-				{
-					if (item.id == \'send_html\')
-						document.getElementById(\'parse_html\').disabled = !document.getElementById(\'parse_html\').disabled;
-					if (item.id == \'send_pm\')
-					{
-						if (!document.getElementById(\'send_html\').checked)
-							document.getElementById(\'parse_html\').disabled = true;
-						else
-							document.getElementById(\'parse_html\').disabled = false;
-						document.getElementById(\'send_html\').disabled = !document.getElementById(\'send_html\').disabled;
-					}
-				}
-			</script>
-		</form>';
-}
-
-/**
- * The page shown while the newsletter is being sent
- */
-function template_email_members_send()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=news;sa=mailingsend" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="', Config::$scripturl, '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('admin_newsletters', file: 'Admin'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<div class="progress_bar">
-					<span>', Lang::getTxt('email_done', Utils::$context, file: 'Admin'), '</span>
-					<div class="bar" style="width: ', Utils::$context['percentage_done'], '%;"></div>
-				</div>
-				<hr>
-				<input type="submit" name="cont" value="', Lang::getTxt('email_continue', file: 'Admin'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="subject" value="', Utils::$context['subject'], '">
-				<input type="hidden" name="message" value="', Utils::$context['message'], '">
-				<input type="hidden" name="start" value="', Utils::$context['start'], '">
-				<input type="hidden" name="total_members" value="', Utils::$context['total_members'], '">
-				<input type="hidden" name="total_emails" value="', Utils::$context['total_emails'], '">
-				<input type="hidden" name="send_pm" value="', Utils::$context['send_pm'], '">
-				<input type="hidden" name="send_html" value="', Utils::$context['send_html'], '">
-				<input type="hidden" name="parse_html" value="', Utils::$context['parse_html'], '">';
-
-	// All the things we must remember!
-	foreach (Utils::$context['recipients'] as $key => $values) {
-		echo '
-				<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '">';
-	}
-
-	echo '
-			</div><!-- .windowbg -->
-		</form>
-
-		<script>
-			doAutoSubmit(2, ', Utils::escapeJavaScript(Lang::getTxt('email_continue', file: 'Admin')), ');
-		</script>';
-}
-
-/**
- * The settings page.
- */
-function template_news_lists()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-			<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	template_show_list('news_lists');
-}
diff --git a/Themes/default/ManagePaid.template.php b/Themes/default/ManagePaid.template.php
deleted file mode 100644
index ef42ca4bcd0..00000000000
--- a/Themes/default/ManagePaid.template.php
+++ /dev/null
@@ -1,603 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Profile;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * The template for adding or editing a subscription.
- */
-function template_modify_subscription()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modify;sid=', Utils::$context['sub_id'], '" method="post">';
-
-	if (!empty(Utils::$context['disable_groups'])) {
-		echo '
-		<div class="noticebox">', Lang::getTxt('paid_mod_edit_note', file: 'ManagePaid'), '</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('paid_' . Utils::$context['action_type'] . '_subscription', file: 'ManagePaid'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					', Lang::getTxt('paid_mod_name', file: 'ManagePaid'), '
-				</dt>
-				<dd>
-					<input type="text" name="name" value="', Utils::$context['sub']['name'], '" size="30">
-				</dd>
-				<dt>
-					', Lang::getTxt('paid_mod_desc', file: 'ManagePaid'), '
-				</dt>
-				<dd>
-					<textarea name="desc" rows="3" cols="40">', Utils::$context['sub']['desc'], '</textarea>
-				</dd>
-				<dt>
-					<label for="repeatable_check">', Lang::getTxt('paid_mod_repeatable', file: 'ManagePaid'), '</label>
-				</dt>
-				<dd>
-					<input type="checkbox" name="repeatable" id="repeatable_check"', empty(Utils::$context['sub']['repeatable']) ? '' : ' checked', '>
-				</dd>
-				<dt>
-					<label for="activated_check">', Lang::getTxt('paid_mod_active', file: 'ManagePaid'), '</label><br><span class="smalltext">', Lang::getTxt('paid_mod_active_desc', file: 'ManagePaid'), '</span>
-				</dt>
-				<dd>
-					<input type="checkbox" name="active" id="activated_check"', empty(Utils::$context['sub']['active']) ? '' : ' checked', '>
-				</dd>
-			</dl>
-			<hr>
-			<dl class="settings">
-				<dt>
-					', Lang::getTxt('paid_mod_prim_group', file: 'ManagePaid'), '<br>
-					<span class="smalltext">', Lang::getTxt('paid_mod_prim_group_desc', file: 'ManagePaid'), '</span>
-				</dt>
-				<dd>
-					<select name="prim_group"', !empty(Utils::$context['disable_groups']) ? ' disabled' : '', '>
-						<option value="0"', Utils::$context['sub']['prim_group'] == 0 ? ' selected' : '', '>', Lang::getTxt('paid_mod_no_group', file: 'ManagePaid'), '</option>';
-
-	// Put each group into the box.
-	foreach (Utils::$context['groups'] as $id => $name) {
-		echo '
-						<option value="', $id, '"', Utils::$context['sub']['prim_group'] == $id ? ' selected' : '', '>', $name, '</option>';
-	}
-
-	echo '
-					</select>
-				</dd>
-				<dt>
-					', Lang::getTxt('paid_mod_add_groups', file: 'ManagePaid'), ':<br>
-					<span class="smalltext">', Lang::getTxt('paid_mod_add_groups_desc', file: 'ManagePaid'), '</span>
-				</dt>
-				<dd>';
-
-	// Put a checkbox in for each group
-	foreach (Utils::$context['groups'] as $id => $name) {
-		echo '
-					<label for="addgroup_', $id, '">
-						<input type="checkbox" id="addgroup_', $id, '" name="addgroup[', $id, ']"', in_array($id, Utils::$context['sub']['add_groups']) ? ' checked' : '', !empty(Utils::$context['disable_groups']) ? ' disabled' : '', '>
-						<span class="smalltext">', $name, '</span>
-					</label><br>';
-	}
-
-	echo '
-				</dd>
-				<dt>
-					', Lang::getTxt('paid_mod_reminder', file: 'ManagePaid'), '<br>
-					<span class="smalltext">', Lang::getTxt('paid_mod_reminder_desc', file: 'ManagePaid'), ' ', Lang::getTxt('zero_to_disable', file: 'Admin'), '</span>
-				</dt>
-				<dd>
-					<input type="number" name="reminder" value="', Utils::$context['sub']['reminder'], '" size="6">
-				</dd>
-				<dt>
-					', Lang::getTxt('paid_mod_email', file: 'ManagePaid'), '<br>
-					<span class="smalltext">', Lang::getTxt('paid_mod_email_desc', file: 'ManagePaid'), '</span>
-				</dt>
-				<dd>
-					<textarea name="emailcomplete" rows="6" cols="40">', Utils::$context['sub']['email_complete'], '</textarea>
-				</dd>
-			</dl>
-			<hr>
-			<input type="radio" name="duration_type" id="duration_type_fixed" value="fixed"', empty(Utils::$context['sub']['duration']) || Utils::$context['sub']['duration'] == 'fixed' ? ' checked' : '', ' onclick="toggleDuration(\'fixed\');">
-			<strong><label for="duration_type_fixed">', Lang::getTxt('paid_mod_fixed_price', file: 'ManagePaid'), '</label></strong>
-			<br>
-			<div id="fixed_area" ', empty(Utils::$context['sub']['duration']) || Utils::$context['sub']['duration'] == 'fixed' ? '' : 'style="display: none;"', '>
-				<fieldset>
-					<dl class="settings">
-						<dt>
-							', Lang::getTxt('paid_cost', file: 'ManagePaid'), ' (', str_replace('%1.2f', '', Config::$modSettings['paid_currency_symbol']), ')
-						</dt>
-						<dd>
-							<input type="number" step="0.01" name="cost" value="', empty(Utils::$context['sub']['cost']['fixed']) ? '' : Utils::$context['sub']['cost']['fixed'], '" placeholder="0.00" size="4">
-						</dd>
-						<dt>
-							', Lang::getTxt('paid_mod_span', file: 'ManagePaid'), '
-						</dt>
-						<dd>
-							<input type="number" name="span_value" value="', Utils::$context['sub']['span']['value'], '" size="4">
-							<select name="span_unit">
-								<option value="D"', Utils::$context['sub']['span']['unit'] == 'D' ? ' selected' : '', '>', Lang::getTxt('paid_mod_span_days', file: 'ManagePaid'), '</option>
-								<option value="W"', Utils::$context['sub']['span']['unit'] == 'W' ? ' selected' : '', '>', Lang::getTxt('paid_mod_span_weeks', file: 'ManagePaid'), '</option>
-								<option value="M"', Utils::$context['sub']['span']['unit'] == 'M' ? ' selected' : '', '>', Lang::getTxt('paid_mod_span_months', file: 'ManagePaid'), '</option>
-								<option value="Y"', Utils::$context['sub']['span']['unit'] == 'Y' ? ' selected' : '', '>', Lang::getTxt('paid_mod_span_years', file: 'ManagePaid'), '</option>
-							</select>
-						</dd>
-					</dl>
-				</fieldset>
-			</div><!-- #fixed_area -->
-			<input type="radio" name="duration_type" id="duration_type_flexible" value="flexible"', !empty(Utils::$context['sub']['duration']) && Utils::$context['sub']['duration'] == 'flexible' ? ' checked' : '', ' onclick="toggleDuration(\'flexible\');">
-			<strong><label for="duration_type_flexible">', Lang::getTxt('paid_mod_flexible_price', file: 'ManagePaid'), '</label></strong>
-			<br>
-			<div id="flexible_area" ', !empty(Utils::$context['sub']['duration']) && Utils::$context['sub']['duration'] == 'flexible' ? '' : 'style="display: none;"', '>
-				<fieldset>';
-
-	echo '
-					<div class="information">
-						<strong>', Lang::getTxt('paid_mod_price_breakdown', file: 'ManagePaid'), '</strong><br>
-						', Lang::getTxt('paid_mod_price_breakdown_desc', file: 'ManagePaid'), '
-					</div>
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('paid_duration', file: 'ManagePaid'), '</strong>
-						</dt>
-						<dd>
-							<strong>', Lang::getTxt('paid_cost', file: 'ManagePaid'), ' (', preg_replace('~%[df\.\d]+~', '', Config::$modSettings['paid_currency_symbol']), ')</strong>
-						</dd>
-						<dt>
-							', Lang::getTxt('paid_per_day', file: 'ManagePaid'), '
-						</dt>
-						<dd>
-							<input type="number" step="0.01" name="cost_day" value="', empty(Utils::$context['sub']['cost']['day']) ? '0' : Utils::$context['sub']['cost']['day'], '" size="5">
-						</dd>
-						<dt>
-							', Lang::getTxt('paid_per_week', file: 'ManagePaid'), '
-						</dt>
-						<dd>
-							<input type="number" step="0.01" name="cost_week" value="', empty(Utils::$context['sub']['cost']['week']) ? '0' : Utils::$context['sub']['cost']['week'], '" size="5">
-						</dd>
-						<dt>
-							', Lang::getTxt('paid_per_month', file: 'ManagePaid'), '
-						</dt>
-						<dd>
-							<input type="number" step="0.01" name="cost_month" value="', empty(Utils::$context['sub']['cost']['month']) ? '0' : Utils::$context['sub']['cost']['month'], '" size="5">
-						</dd>
-						<dt>
-							', Lang::getTxt('paid_per_year', file: 'ManagePaid'), '
-						</dt>
-						<dd>
-							<input type="number" step="0.01" name="cost_year" value="', empty(Utils::$context['sub']['cost']['year']) ? '0' : Utils::$context['sub']['cost']['year'], '" size="5">
-						</dd>
-					</dl>
-				</fieldset>
-			</div><!-- #flexible_area -->
-			<input type="submit" name="save" value="', Lang::getTxt('paid_settings_save', file: 'ManagePaid'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-pms_token_var'], '" value="', Utils::$context['admin-pms_token'], '">
-		</div><!-- .windowbg -->
-	</form>';
-}
-
-/**
- * The page for deleting a subscription.
- */
-function template_delete_subscription()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modify;sid=', Utils::$context['sub_id'], ';delete" method="post">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('paid_delete_subscription', file: 'ManagePaid'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('paid_mod_delete_warning', file: 'ManagePaid'), '</p>
-			<input type="submit" name="delete_confirm" value="', Lang::getTxt('paid_delete_subscription', file: 'ManagePaid'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-pmsd_token_var'], '" value="', Utils::$context['admin-pmsd_token'], '">
-		</div>
-	</form>';
-}
-
-/**
- * Add or edit an existing subscriber.
- */
-function template_modify_user_subscription()
-{
-	// The year lists below have to reach whatever dates this subscription
-	// already carries, however far out they are, and leave room to pick
-	// something new either side of today.
-	$years = [
-		Utils::$context['sub']['start']['year'],
-		Utils::$context['sub']['end']['year'],
-		(int) date('Y'),
-	];
-
-	$first_year = min($years) - 10;
-	$last_year = max($years) + 10;
-
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;sid=', Utils::$context['sub_id'], ';lid=', Utils::$context['log_id'], '" method="post">
-		<div class="cat_bar">
-			<h3 class="catbg">',
-				Lang::getTxt(
-					'paid_' . Utils::$context['action_type'] . '_subscription_name' . (empty(Utils::$context['sub']['username']) ? '' : '_for_member'),
-					[
-						'name' => Utils::$context['current_subscription']['name'],
-						'member' => Utils::$context['sub']['username'] ?? '',
-					],
-					file: 'ManagePaid',
-				),
-			'</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">';
-
-	// Do we need a username?
-	if (Utils::$context['action_type'] == 'add') {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('paid_username', file: 'ManagePaid'), '</strong><br>
-					<span class="smalltext">', Lang::getTxt('one_username', file: 'ManagePaid'), '</span>
-				</dt>
-				<dd>
-					<input type="text" name="name" id="name_control" value="', Utils::$context['sub']['username'], '" size="30">
-				</dd>';
-	}
-
-	echo '
-				<dt>
-					<strong>', Lang::getTxt('paid_status', file: 'ManagePaid'), '</strong>
-				</dt>
-				<dd>
-					<select name="status">
-						<option value="0"', Utils::$context['sub']['status'] == 0 ? ' selected' : '', '>', Lang::getTxt('paid_finished', file: 'ManagePaid'), '</option>
-						<option value="1"', Utils::$context['sub']['status'] == 1 ? ' selected' : '', '>', Lang::getTxt('paid_active', file: 'ManagePaid'), '</option>
-					</select>
-				</dd>
-			</dl>
-			<fieldset>
-				<legend>', Lang::getTxt('start_date_and_time', file: 'ManagePaid'), '</legend>
-				<select name="year" id="year">';
-
-	// Show a list of all the years we allow...
-	for ($year = $first_year; $year <= $last_year; $year++) {
-		echo '
-					<option value="', $year, '"', $year == Utils::$context['sub']['start']['year'] ? ' selected' : '', '>', $year, '</option>';
-	}
-
-	echo '
-				</select>
-				<select name="month" id="month">';
-
-	// There are 12 months per year - ensure that they all get listed.
-	for ($month = 1; $month <= 12; $month++) {
-		echo '
-					<option value="', $month, '"', $month == Utils::$context['sub']['start']['month'] ? ' selected' : '', '>', Lang::getTxt(['months', $month], file: 'General'), '</option>';
-	}
-
-	echo '
-				</select>
-				<select name="day" id="day">';
-
-	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= Utils::$context['sub']['start']['last_day']; $day++) {
-		echo '
-					<option value="', $day, '"', $day == Utils::$context['sub']['start']['day'] ? ' selected' : '', '>', $day, '</option>';
-	}
-
-	echo '
-				</select>
-				&nbsp;&nbsp;&nbsp;
-				<input type="number" name="hour" value="', Utils::$context['sub']['start']['hour'], '" size="2" min="0" max="23">
-				:
-				<input type="number" name="minute" value="', Utils::$context['sub']['start']['min'], '" size="2" min="0" max="59">
-			</fieldset>
-			<fieldset>
-				<legend>', Lang::getTxt('end_date_and_time', file: 'ManagePaid'), '</legend>
-				<select name="yearend" id="yearend">';
-
-	// Show a list of all the years we allow...
-	for ($year = $first_year; $year <= $last_year; $year++) {
-		echo '
-					<option value="', $year, '"', $year == Utils::$context['sub']['end']['year'] ? ' selected' : '', '>', $year, '</option>';
-	}
-
-	echo '
-				</select>
-				<select name="monthend" id="monthend">';
-
-	// There are 12 months per year - ensure that they all get listed.
-	for ($month = 1; $month <= 12; $month++) {
-		echo '
-					<option value="', $month, '"', $month == Utils::$context['sub']['end']['month'] ? ' selected' : '', '>', Lang::getTxt(['months', $month], file: 'General'), '</option>';
-	}
-
-	echo '
-				</select>
-				<select name="dayend" id="dayend">';
-
-	// This prints out all the days in the current month - this changes dynamically as we switch months.
-	for ($day = 1; $day <= Utils::$context['sub']['end']['last_day']; $day++) {
-		echo '
-					<option value="', $day, '"', $day == Utils::$context['sub']['end']['day'] ? ' selected' : '', '>', $day, '</option>';
-	}
-
-	echo '
-				</select>
-				&nbsp;&nbsp;&nbsp;
-				<input type="number" name="hourend" value="', Utils::$context['sub']['end']['hour'], '" size="2" min="0" max="23">
-				:
-				<input type="number" name="minuteend" value="', Utils::$context['sub']['end']['min'], '" size="2" min="0" max="59">
-			</fieldset>
-			<input type="submit" name="save_sub" value="', Lang::getTxt('paid_settings_save', file: 'ManagePaid'), '" class="button">
-		</div><!-- .windowbg -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<script>
-		var oAddMemberSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'name_subscriber\',
-			sControlId: \'name_control\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-		});
-	</script>';
-
-	if (!empty(Utils::$context['pending_payments'])) {
-		echo '
-	<div class="cat_bar">
-		<h3 class="catbg">', Lang::getTxt('pending_payments', file: 'ManagePaid'), '</h3>
-	</div>
-	<div class="information">
-		', Lang::getTxt('pending_payments_desc', file: 'ManagePaid'), '
-	</div>
-	<div class="cat_bar">
-		<h3 class="catbg">', Lang::getTxt('pending_payments_value', file: 'ManagePaid'), '</h3>
-	</div>
-	<div class="windowbg">
-		<ul>';
-
-		foreach (Utils::$context['pending_payments'] as $id => $payment) {
-			echo '
-			<li>
-				', $payment['desc'], '
-				<span class="floatleft">
-					<a href="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', Utils::$context['log_id'], ';pending=', $id, ';accept">', Lang::getTxt('pending_payments_accept', file: 'ManagePaid'), '</a>
-				</span>
-				<span class="floatright">
-					<a href="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', Utils::$context['log_id'], ';pending=', $id, ';remove">', Lang::getTxt('pending_payments_remove', file: 'ManagePaid'), '</a>
-				</span>
-			</li>';
-		}
-
-		echo '
-		</ul>';
-	}
-
-	echo '
-	</div>';
-}
-
-/**
- * Template for a user to edit/pick their subscriptions.
- */
-function template_user_subscription()
-{
-	echo '
-	<div id="paid_subscription">
-		<form action="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=subscriptions;confirm" method="post">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('subscriptions', file: 'ManagePaid'), '</h3>
-			</div>';
-
-	if (empty(Utils::$context['subscriptions'])) {
-		echo '
-			<div class="information">
-				', Lang::getTxt('paid_subs_none', file: 'ManagePaid'), '
-			</div>';
-	} else {
-		echo '
-			<div class="information">
-				', Lang::getTxt('paid_subs_desc', file: 'ManagePaid'), '
-			</div>';
-
-		// Print out all the subscriptions.
-		foreach (Utils::$context['subscriptions'] as $id => $subscription) {
-			// Ignore the inactive ones...
-			if (empty($subscription['active'])) {
-				continue;
-			}
-
-			echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', $subscription['name'], '</h3>
-			</div>
-			<div class="windowbg">
-				<p><strong>', $subscription['name'], '</strong></p>
-				<p class="smalltext">', $subscription['desc'], '</p>';
-
-			if (!$subscription['flexible']) {
-				echo '
-				<div><strong>', Lang::getTxt('paid_duration', file: 'ManagePaid'), '</strong> ', $subscription['length'], '</div>';
-			}
-
-			if (Profile::$member->is_me) {
-				echo '
-				<strong>', Lang::getTxt('paid_cost', file: 'ManagePaid'), '</strong>';
-
-				if ($subscription['flexible']) {
-					echo '
-				<select name="cur[', $subscription['id'], ']">';
-
-					// Print out the costs for this one.
-					foreach ($subscription['costs'] as $duration => $value) {
-						echo '
-					<option value="', $duration, '">', sprintf(Config::$modSettings['paid_currency_symbol'], $value), '/', Lang::getTxt($duration, file: 'ManagePaid'), '</option>';
-					}
-
-					echo '
-				</select>';
-				} else {
-				echo '
-				', sprintf(Config::$modSettings['paid_currency_symbol'], $subscription['costs']['fixed']);
-				}
-
-				echo '
-				<hr>
-				<input type="submit" name="sub_id[', $subscription['id'], ']" value="', Lang::getTxt('paid_order', file: 'ManagePaid'), '" class="button">';
-			} else {
-			echo '
-				<a href="', Config::$scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;sid=', $subscription['id'], ';uid=', Utils::$context['member']['id'], (empty(Utils::$context['current'][$subscription['id']]) ? '' : ';lid=' . Utils::$context['current'][$subscription['id']]['id']), '">', Lang::getTxt(empty(Utils::$context['current'][$subscription['id']]) ? 'paid_admin_add' : 'paid_edit_subscription', file: 'ManagePaid'), '</a>';
-			}
-
-			echo '
-			</div><!-- .windowbg -->';
-		}
-	}
-
-	echo '
-		</form>
-		<br class="clear">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('paid_current', file: 'ManagePaid'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('paid_current_desc', file: 'ManagePaid'), '
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th style="width: 30%">', Lang::getTxt('paid_name', file: 'ManagePaid'), '</th>
-					<th>', Lang::getTxt('paid_status', file: 'ManagePaid'), '</th>
-					<th>', Lang::getTxt('start_date', file: 'ManagePaid'), '</th>
-					<th>', Lang::getTxt('end_date', file: 'ManagePaid'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	if (empty(Utils::$context['current'])) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="4">
-						', Lang::getTxt('paid_none_yet', file: 'ManagePaid'), '
-					</td>
-				</tr>';
-	}
-
-	foreach (Utils::$context['current'] as $sub) {
-		if (!$sub['hide']) {
-			echo '
-				<tr class="windowbg">
-					<td>
-						', (User::$me->is_admin ? '<a href="' . Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $sub['id'] . '">' . $sub['name'] . '</a>' : $sub['name']), '
-					</td>
-					<td>
-						<span style="color: ', ($sub['status'] == 2 ? 'green' : ($sub['status'] == 1 ? 'red' : 'orange')), '"><strong>', $sub['status_text'], '</strong></span>
-					</td>
-					<td>', $sub['start'], '</td>
-					<td>', $sub['end'], '</td>
-				</tr>';
-		}
-	}
-
-	echo '
-			</tbody>
-		</table>
-	</div><!-- #paid_subscription -->';
-}
-
-/**
- * The "choose payment" dialog.
- */
-function template_choose_payment()
-{
-	echo '
-	<div id="paid_subscription">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('paid_confirm_payment', file: 'ManagePaid'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('paid_confirm_desc', file: 'ManagePaid'), '
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<strong>', Lang::getTxt('subscription', file: 'ManagePaid'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['sub']['name'], '
-				</dd>
-				<dt>
-					<strong>', Lang::getTxt('paid_cost', file: 'ManagePaid'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['cost'], '
-				</dd>
-			</dl>
-		</div>';
-
-	// Do all the gateway options.
-	foreach (Utils::$context['gateways'] as $gateway) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', $gateway['title'], '</h3>
-		</div>
-		<div class="windowbg">
-			', $gateway['desc'], '<br>
-			<form action="', $gateway['form'], '" method="post">';
-
-		if (!empty($gateway['javascript'])) {
-			echo '
-				<script>
-					', $gateway['javascript'], '
-				</script>';
-		}
-
-		foreach ($gateway['hidden'] as $name => $value) {
-			echo '
-				<input type="hidden" id="', $gateway['id'], '_', $name, '" name="', $name, '" value="', $value, '">';
-		}
-
-		echo '
-				<br>
-				<input type="submit" value="', $gateway['submit'], '" class="button">
-			</form>
-		</div>';
-	}
-
-	echo '
-	</div><!-- #paid_subscription -->
-	<br class="clear">';
-}
-
-/**
- * The "thank you" bit...
- */
-function template_paid_done()
-{
-	echo '
-	<div id="paid_subscription">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('paid_done', file: 'ManagePaid'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('paid_done_desc', file: 'ManagePaid'), '</p>
-			<br>
-			<a href="', Config::$scripturl, '?action=profile;u=', Utils::$context['member']['id'], ';area=subscriptions">', Lang::getTxt('paid_sub_return', file: 'ManagePaid'), '</a>
-		</div>
-	</div>';
-}
diff --git a/Themes/default/ManagePermissions.template.php b/Themes/default/ManagePermissions.template.php
deleted file mode 100644
index 2fc379da13d..00000000000
--- a/Themes/default/ManagePermissions.template.php
+++ /dev/null
@@ -1,938 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * The main manage permissions page
- */
-function template_permission_index()
-{
-	// Not allowed to edit?
-	if (!Utils::$context['can_modify']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('permission_cannot_edit', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles'], file: 'ManagePermissions'), '
-	</div>';
-	}
-
-	echo '
-	<div id="admin_form_wrapper">
-		<form action="', Config::$scripturl, '?action=admin;area=permissions;sa=quick" method="post" accept-charset="UTF-8" name="permissionForm" id="permissionForm">';
-
-	if (!empty(Utils::$context['profile'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('permissions_for_profile', Utils::$context['profile'], file: 'ManagePermissions'), '</h3>
-			</div>';
-	} else {
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('permissions_title', file: 'ManagePermissions'), '</h3>
-			</div>';
-	}
-
-	echo '
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th>', Lang::getTxt('membergroups_name', file: 'ManageMembers'), '</th>
-						<th class="small_table">', Lang::getTxt('membergroups_members_top', file: 'ManageMembers'), '</th>';
-
-	if (empty(Config::$modSettings['permission_enable_deny'])) {
-		echo '
-						<th class="small_table">', Lang::getTxt('membergroups_permissions', file: 'Admin'), '</th>';
-	} else {
-	echo '
-						<th class="small_table">', Lang::getTxt('permissions_allowed', file: 'ManagePermissions'), '</th>
-						<th class="small_table">', Lang::getTxt('permissions_denied', file: 'ManagePermissions'), '</th>';
-	}
-
-	echo '
-						<th class="small_table">', Lang::getTxt(Utils::$context['can_modify'] ? 'permissions_modify' : 'permissions_view', file: 'ManagePermissions'), '</th>
-						<th class="table_icon centercol">
-							', Utils::$context['can_modify'] ? '<input type="checkbox" onclick="invertAll(this, this.form, \'group\');">' : '', '
-						</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-	foreach (Utils::$context['groups'] as $group) {
-		echo '
-					<tr class="windowbg">
-						<td>
-							', !empty($group['help']) ? ' <a class="help" href="' . Config::$scripturl . '?action=helpadmin;help=' . $group['help'] . '" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a> ' : '<img class="icon" src="' . Theme::$current->settings['images_url'] . '/blank.png" alt="' . Lang::getTxt('help', file: 'General') . '">', '<span>', $group['name'], '</span>';
-
-		if (!empty($group['children'])) {
-			echo '
-							<br>
-							<span class="smalltext">', Lang::getTxt('permissions_includes_inherited', ['list' => Lang::sentenceList(array_map(fn($grp) => '"' . $grp . '"', $group['children']))], file: 'ManagePermissions'), '</span>';
-		}
-
-		echo '
-						</td>
-						<td>', $group['can_search'] ? $group['link'] : ($group['num_members'] ?? Lang::getTxt('not_applicable', file: 'General')), '</td>';
-
-		if (empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-						<td>', $group['num_permissions']['allowed'], '</td>';
-		} else {
-		echo '
-						<td ', $group['id'] == 1 ? ' style="font-style: italic;"' : '', '>
-							', $group['num_permissions']['allowed'], '
-						</td>
-						<td ', $group['id'] == 1 || $group['id'] == -1 ? ' style="font-style: italic;"' : (!empty($group['num_permissions']['denied']) ? ' class="red"' : ''), '>
-							', $group['num_permissions']['denied'], '
-						</td>';
-		}
-
-		echo '
-						<td>
-							', $group['allow_modify'] ? '<a href="' . Config::$scripturl . '?action=admin;area=permissions;sa=modify;group=' . $group['id'] . (empty(Utils::$context['profile']) ? '' : ';pid=' . Utils::$context['profile']['id']) . '">' . Lang::getTxt(Utils::$context['can_modify'] ? 'permissions_modify' : 'permissions_view', file: 'ManagePermissions') . '</a>' : '', '
-						</td>
-						<td class="centercol">
-							', $group['allow_modify'] && Utils::$context['can_modify'] ? '<input type="checkbox" name="group[]" value="' . $group['id'] . '">' : '', '
-						</td>
-					</tr>';
-	}
-
-	echo '
-				</tbody>
-			</table>
-			<br>';
-
-	// Advanced stuff...
-	if (Utils::$context['can_modify']) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="#" id="permissions_panel_link">', Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions'), '</a>
-				</h3>
-				<span id="permissions_panel_toggle" class="', empty(Utils::$context['show_advanced_options']) ? 'toggle_down' : 'toggle_up', '" style="display: none;"></span>
-			</div>
-			<div id="permissions_panel_advanced" class="windowbg">
-				<fieldset>
-					<legend>', Lang::getTxt('permissions_with_selection', file: 'ManagePermissions'), '</legend>
-					<dl class="settings">
-						<dt>
-							<a class="help" href="', Config::$scripturl, '?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-							', Lang::getTxt('permissions_apply_pre_defined', file: 'ManagePermissions'), '
-						</dt>
-						<dd>
-							<select name="predefined">
-								<option value="">(', Lang::getTxt('permissions_select_pre_defined', file: 'ManagePermissions'), ')</option>
-								<option value="restrict">', Lang::getTxt('permitgroups_restrict', file: 'Admin'), '</option>
-								<option value="standard">', Lang::getTxt('permitgroups_standard', file: 'Admin'), '</option>
-								<option value="moderator">', Lang::getTxt('permitgroups_moderator', file: 'Admin'), '</option>
-								<option value="maintenance">', Lang::getTxt('permitgroups_maintenance', file: 'Admin'), '</option>
-							</select>
-						</dd>
-						<dt>
-							', Lang::getTxt('permissions_like_group', file: 'ManagePermissions'), '
-						</dt>
-						<dd>
-							<select name="copy_from">
-								<option value="empty">(', Lang::getTxt('permissions_select_membergroup', file: 'ManagePermissions'), ')</option>';
-
-		foreach (Utils::$context['groups'] as $group) {
-			if ($group['id'] != 1) {
-				echo '
-								<option value="', $group['id'], '">', $group['name'], '</option>';
-			}
-		}
-
-		echo '
-							</select>
-						</dd>
-						<dt>
-							<select name="add_remove">
-								<option value="add">', Lang::getTxt('permissions_add', file: 'ManagePermissions'), '</option>
-								<option value="clear">', Lang::getTxt('permissions_remove', file: 'ManagePermissions'), '</option>';
-
-		if (!empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-								<option value="deny">', Lang::getTxt('permissions_deny', file: 'ManagePermissions'), '</option>';
-		}
-
-		echo '
-							</select>
-						</dt>
-						<dd style="overflow:auto;">
-							<select name="permissions">
-								<option value="">(', Lang::getTxt('permissions_select_permission', file: 'ManagePermissions'), ')</option>';
-
-		foreach (Utils::$context['permissions'] as $permissionType) {
-			if (($permissionType['id'] == 'global') == (!empty(Utils::$context['profile']))) {
-				continue;
-			}
-
-			foreach ($permissionType['columns'] as $column) {
-				foreach ($column as $permissionGroup) {
-					if ($permissionGroup['hidden']) {
-						continue;
-					}
-
-					echo '
-								<option value="" disabled>[', $permissionGroup['name'], ']</option>';
-
-					foreach ($permissionGroup['permissions'] as $perm) {
-						if ($perm['hidden']) {
-							continue;
-						}
-
-						if ($perm['has_own_any']) {
-							echo '
-								<option value="', $permissionType['id'], '/', $perm['own']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['own']['name'], ')</option>
-								<option value="', $permissionType['id'], '/', $perm['any']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['any']['name'], ')</option>';
-						} else {
-						echo '
-								<option value="', $permissionType['id'], '/', $perm['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], '</option>';
-						}
-					}
-				}
-			}
-		}
-		echo '
-							</select>
-						</dd>
-					</dl>
-				</fieldset>
-				<input type="submit" value="', Lang::getTxt('permissions_set_permissions', file: 'ManagePermissions'), '" onclick="return checkSubmit();" class="button">
-			</div><!-- #permissions_panel_advanced -->';
-
-		// Javascript for the advanced stuff.
-		echo '
-			<script>
-				var oPermissionsPanelToggle = new smc_Toggle({
-					bToggleEnabled: true,
-					bCurrentlyCollapsed: ', empty(Utils::$context['show_advanced_options']) ? 'true' : 'false', ',
-					aSwappableContainers: [
-						\'permissions_panel_advanced\'
-					],
-					aSwapImages: [
-						{
-							sId: \'permissions_panel_toggle\',
-							altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-							altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-						}
-					],
-					aSwapLinks: [
-						{
-							sId: \'permissions_panel_link\',
-							msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions')), ',
-							msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions')), '
-						}
-					],
-					oThemeOptions: {
-						bUseThemeSettings: true,
-						sOptionName: \'admin_preferences\',
-						sSessionVar: smf_session_var,
-						sSessionId: smf_session_id,
-						sThemeId: \'1\',
-						sAdditionalVars: \';admin_key=app\'
-					}
-				});
-
-				function checkSubmit()
-				{
-					if ((document.forms.permissionForm.predefined.value != "" && (document.forms.permissionForm.copy_from.value != "empty" || document.forms.permissionForm.permissions.value != "")) || (document.forms.permissionForm.copy_from.value != "empty" && document.forms.permissionForm.permissions.value != ""))
-					{
-						alert("', Lang::getTxt('permissions_only_one_option', file: 'ManagePermissions'), '");
-						return false;
-					}
-					if (document.forms.permissionForm.predefined.value == "" && document.forms.permissionForm.copy_from.value == "" && document.forms.permissionForm.permissions.value == "")
-					{
-						alert("', Lang::getTxt('permissions_no_action', file: 'ManagePermissions'), '");
-						return false;
-					}
-					if (document.forms.permissionForm.permissions.value != "" && document.forms.permissionForm.add_remove.value == "deny")
-						return confirm("', Lang::getTxt('permissions_deny_dangerous', file: 'ManagePermissions'), '");
-
-					return true;
-				}
-			</script>';
-
-		if (!empty(Utils::$context['profile'])) {
-			echo '
-			<input type="hidden" name="pid" value="', Utils::$context['profile']['id'], '">';
-		}
-
-		echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-mpq_token_var'], '" value="', Utils::$context['admin-mpq_token'], '">';
-	}
-
-	echo '
-		</form>
-	</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * THe page that shows which permissions profile applies to each board
- */
-function template_by_board()
-{
-	echo '
-		<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=permissions;sa=board" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('permissions_boards', file: 'Admin'), '</h3>
-			</div>
-			<div class="information">
-				', Lang::getTxt('permissions_boards_desc', file: 'ManagePermissions'), '
-			</div>
-
-			<div class="cat_bar">
-				<h3 id="board_permissions" class="catbg flow_hidden">
-					<span class="perm_name floatleft">', Lang::getTxt('board_name', file: 'General'), '</span>
-					<span class="perm_profile floatleft">', Lang::getTxt('permission_profile', file: 'ManagePermissions'), '</span>';
-	echo '
-				</h3>
-			</div>
-			<div class="windowbg">';
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-				<div class="sub_bar">
-					<h3 class="subbg">', $category['name'], '</h3>
-				</div>';
-
-		if (!empty($category['boards'])) {
-			echo '
-				<ul class="perm_boards flow_hidden">';
-		}
-
-		foreach ($category['boards'] as $board) {
-			echo '
-					<li class="flow_hidden">
-						<span class="perm_board floatleft">
-							<a href="', Config::$scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], ';rid=permissions;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', str_repeat('-', $board['child_level']), ' ', $board['name'], '</a>
-						</span>
-						<span class="perm_boardprofile floatleft">';
-
-			if (Utils::$context['edit_all']) {
-				echo '
-							<select name="boardprofile[', $board['id'], ']">';
-
-				foreach (Utils::$context['profiles'] as $id => $profile) {
-					echo '
-								<option value="', $id, '"', $id == $board['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
-				}
-
-				echo '
-							</select>';
-			} else {
-			echo '
-							<a href="', Config::$scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', $board['profile_name'], '</a>';
-			}
-
-			echo '
-						</span>
-					</li>';
-		}
-
-		if (!empty($category['boards'])) {
-			echo '
-				</ul>';
-		}
-	}
-
-	if (Utils::$context['edit_all']) {
-		echo '
-				<input type="submit" name="save_changes" value="', Lang::getTxt('save', file: 'General'), '" class="button">';
-	} else {
-	echo '
-				<a class="button" href="', Config::$scripturl, '?action=admin;area=permissions;sa=board;edit;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('permissions_board_all', file: 'ManagePermissions'), '</a>';
-	}
-
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-mpb_token_var'], '" value="', Utils::$context['admin-mpb_token'], '">
-			</div><!-- .windowbg -->
-		</form>';
-}
-
-/**
- * Edit permission profiles (predefined).
- */
-function template_edit_profiles()
-{
-	echo '
-	<div id="admin_form_wrapper">
-		<form action="', Config::$scripturl, '?action=admin;area=permissions;sa=profiles" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('permissions_profile_edit', file: 'ManagePermissions'), '</h3>
-			</div>
-
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th>', Lang::getTxt('permissions_profile_name', file: 'ManagePermissions'), '</th>
-						<th>', Lang::getTxt('permissions_profile_used_by', file: 'ManagePermissions'), '</th>
-						<th class="table_icon"', !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '', '>', Lang::getTxt('delete', file: 'General'), '</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-	foreach (Utils::$context['profiles'] as $profile) {
-		echo '
-					<tr class="windowbg">
-						<td>';
-
-		if (!empty(Utils::$context['show_rename_boxes']) && $profile['can_rename']) {
-			echo '
-							<input type="text" name="rename_profile[', $profile['id'], ']" value="', $profile['name'], '">';
-		} else {
-		echo '
-							<a href="', Config::$scripturl, '?action=admin;area=permissions;sa=index;pid=', $profile['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', $profile['name'], '</a>';
-		}
-
-		echo '
-						</td>
-						<td>
-							', !empty($profile['boards_text']) ? $profile['boards_text'] : Lang::getTxt('permissions_profile_used_by_count', [0], file: 'ManagePermissions'), '
-						</td>
-						<td', !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '', '>
-							<input type="checkbox" name="delete_profile[]" value="', $profile['id'], '" ', $profile['can_delete'] ? '' : 'disabled', '>
-						</td>
-					</tr>';
-	}
-
-	echo '
-				</tbody>
-			</table>
-			<div class="flow_auto righttext padding">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-mpp_token_var'], '" value="', Utils::$context['admin-mpp_token'], '">';
-
-	if (Utils::$context['can_rename_something']) {
-		echo '
-				<input type="submit" name="rename" value="', Lang::getTxt(empty(Utils::$context['show_rename_boxes']) ? 'permissions_profile_rename' : 'permissions_commit', file: 'ManagePermissions'), '" class="button">';
-	}
-
-	echo '
-				<input type="submit" name="delete" value="', Lang::getTxt('quickmod_delete_selected', file: 'General'), '" class="button" ', !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '', '>
-			</div>
-		</form>
-		<br>
-		<form action="', Config::$scripturl, '?action=admin;area=permissions;sa=profiles" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('permissions_profile_new', file: 'ManagePermissions'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('permissions_profile_name', file: 'ManagePermissions'), '</strong>
-					</dt>
-					<dd>
-						<input type="text" name="profile_name" value="">
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('permissions_profile_copy_from', file: 'ManagePermissions'), '</strong>
-					</dt>
-					<dd>
-						<select name="copy_from">';
-
-	foreach (Utils::$context['profiles'] as $id => $profile) {
-		echo '
-							<option value="', $id, '">', $profile['name'], '</option>';
-	}
-
-	echo '
-						</select>
-					</dd>
-				</dl>
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-mpp_token_var'], '" value="', Utils::$context['admin-mpp_token'], '">
-				<input type="submit" name="create" value="', Lang::getTxt('permissions_profile_new_create', file: 'ManagePermissions'), '" class="button">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * Modify a group's permissions
- */
-function template_modify_group()
-{
-	// Cannot be edited?
-	if (!Utils::$context['profile']['can_modify']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('permission_cannot_edit', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles'], file: 'ManagePermissions'), '
-	</div>';
-	} else {
-	echo '
-	<script>
-		window.smf_usedDeny = false;
-
-		function warnAboutDeny()
-		{
-			if (window.smf_usedDeny)
-				return confirm("', Lang::getTxt('permissions_deny_dangerous', file: 'ManagePermissions'), '");
-			else
-				return true;
-		}
-	</script>';
-	}
-
-	echo '
-		<form id="permissions" action="', Config::$scripturl, '?action=admin;area=permissions;sa=modify2;group=', Utils::$context['group']['id'], ';pid=', Utils::$context['profile']['id'], '" method="post" accept-charset="UTF-8" name="permissionForm" onsubmit="return warnAboutDeny();">';
-
-	if (!empty(Config::$modSettings['permission_enable_deny']) && Utils::$context['group']['id'] != -1) {
-		echo '
-			<div class="noticebox">
-				', Lang::getTxt('permissions_option_desc', file: 'ManagePermissions'), '
-			</div>';
-	}
-
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">';
-
-	if (Utils::$context['permission_type'] == 'board') {
-		echo '
-				', Lang::getTxt('permissions_for_in', ['group' => Utils::$context['group']['name'], 'profile' => Utils::$context['profile']['name']], file: 'ManagePermissions');
-	} else {
-	echo '
-				', Lang::getTxt(Utils::$context['permission_type'] == 'global' ? 'permissions_general_for' : 'permissions_board_for', ['name' => Utils::$context['group']['name']], file: 'ManagePermissions');
-	}
-
-	echo '
-				</h3>
-			</div>';
-
-	// Draw out the main bits.
-	template_modify_group_display(Utils::$context['permission_type']);
-
-	if (Utils::$context['profile']['can_modify']) {
-		echo '
-			<div class="padding">
-				<input type="submit" value="', Lang::getTxt('permissions_commit', file: 'ManagePermissions'), '" class="button">
-			</div>';
-	}
-
-	foreach (Utils::$context['hidden_perms'] as $hidden_perm) {
-		echo '
-			<input type="hidden" name="perm[', $hidden_perm[0], '][', $hidden_perm[1], ']" value="', $hidden_perm[2], '">';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-mp_token_var'], '" value="', Utils::$context['admin-mp_token'], '">
-		</form>';
-}
-
-/**
- * The way of looking at permissions.
- *
- * @param string $type The permissions type
- */
-function template_modify_group_display($type)
-{
-	$permission_type = &Utils::$context['permissions'][$type];
-	$disable_field = Utils::$context['profile']['can_modify'] ? '' : 'disabled ';
-
-	foreach ($permission_type['columns'] as $column) {
-		echo '
-					<table class="table_grid half_content">';
-
-		foreach ($column as $permissionGroup) {
-			if (empty($permissionGroup['permissions'])) {
-				continue;
-			}
-
-			// Are we likely to have something in this group to display or is it all hidden?
-			$has_display_content = false;
-
-			if (!$permissionGroup['hidden']) {
-				// Before we go any further check we are going to have some data to print otherwise we just have a silly heading.
-				foreach ($permissionGroup['permissions'] as $permission) {
-					if (!$permission['hidden']) {
-						$has_display_content = true;
-					}
-				}
-
-				if ($has_display_content) {
-					echo '
-						<tr class="title_bar">
-							<th></th>
-							<th', Utils::$context['group']['id'] == -1 ? ' colspan="2"' : '', ' class="smalltext">', $permissionGroup['name'], '</th>';
-
-					if (Utils::$context['group']['id'] != -1) {
-						echo '
-							<th>', Lang::getTxt('permissions_option_own', file: 'ManagePermissions'), '</th>
-							<th>', Lang::getTxt('permissions_option_any', file: 'ManagePermissions'), '</th>';
-					}
-
-					echo '
-						</tr>';
-				}
-			}
-
-			foreach ($permissionGroup['permissions'] as $permission) {
-				if (!$permission['hidden'] && !$permissionGroup['hidden']) {
-					echo '
-						<tr class="windowbg">
-							<td>
-								', $permission['show_help'] ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=permissionhelp_' . $permission['id'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : '', '
-							</td>
-							<td class="lefttext full_width">
-								', $permission['name'], (!empty($permission['note']) ? '<br>
-								<strong class="smalltext">' . $permission['note'] . '</strong>' : ''), '
-							</td>
-							<td>';
-
-					if ($permission['has_own_any']) {
-						// Guests can't do their own thing.
-						if (Utils::$context['group']['id'] != -1) {
-							if (empty(Config::$modSettings['permission_enable_deny'])) {
-								echo '
-								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']"', $permission['own']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" id="', $permission['own']['id'], '_on" ', $disable_field, '>';
-							} else {
-								echo '
-								<select name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']" ', $disable_field, '>';
-
-								foreach (['on', 'off', 'deny'] as $c) {
-									echo '
-									<option ', $permission['own']['select'] == $c ? ' selected' : '', ' value="', $c, '">', Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions'), '</option>';
-								}
-
-								echo '
-								</select>';
-							}
-
-							echo '
-							</td>
-							<td>';
-						}
-
-						if (empty(Config::$modSettings['permission_enable_deny']) || Utils::$context['group']['id'] == -1) {
-							echo '
-								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']"', $permission['any']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
-						} else {
-							echo '
-								<select name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']" ', $disable_field, '>';
-
-							foreach (['on', 'off', 'deny'] as $c) {
-								echo '
-									<option ', $permission['any']['select'] == $c ? ' selected' : '', ' value="', $c, '">', Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions'), '</option>';
-							}
-
-							echo '
-								</select>';
-						}
-					} else {
-						if (Utils::$context['group']['id'] != -1) {
-							echo '
-							</td>
-							<td>';
-						}
-
-						if (empty(Config::$modSettings['permission_enable_deny']) || Utils::$context['group']['id'] == -1) {
-							echo '
-								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['id'], ']"', $permission['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
-						} else {
-							echo '
-								<select name="perm[', $permission_type['id'], '][', $permission['id'], ']" ', $disable_field, '>';
-
-							foreach (['on', 'off', 'deny'] as $c) {
-								echo '
-									<option ', $permission['select'] == $c ? ' selected' : '', ' value="', $c, '">', Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions'), '</option>';
-							}
-
-							echo '
-								</select>';
-						}
-					}
-					echo '
-							</td>
-						</tr>';
-				}
-			}
-		}
-
-		echo '
-					</table>';
-	}
-
-	echo '
-					<br class="clear">';
-}
-
-/**
- * A form for displaying inline permissions, such as on a settings page.
- */
-function template_inline_permissions()
-{
-	// This looks really weird, but it keeps things nested properly...
-	echo '
-											<fieldset id="', Utils::$context['current_permission'], '">
-												<legend><a href="javascript:void(0);" onclick="document.getElementById(\'', Utils::$context['current_permission'], '\').style.display = \'none\';document.getElementById(\'', Utils::$context['current_permission'], '_groups_link\').style.display = \'block\'; return false;" class="toggle_up"> ', Lang::getTxt('avatar_select_permission', file: 'Admin'), '</a></legend>';
-
-	if (empty(Config::$modSettings['permission_enable_deny'])) {
-		echo '
-												<ul>';
-	} else {
-	echo '
-												<div class="information">', Lang::getTxt('permissions_option_desc', file: 'ManagePermissions'), '</div>
-												<dl class="settings">
-													<dt>
-														<span class="perms"><strong>', Lang::getTxt('permissions_option_on', file: 'ManagePermissions'), '</strong></span>
-														<span class="perms"><strong>', Lang::getTxt('permissions_option_off', file: 'ManagePermissions'), '</strong></span>
-														<span class="perms red"><strong>', Lang::getTxt('permissions_option_deny', file: 'ManagePermissions'), '</strong></span>
-													</dt>
-													<dd>
-													</dd>';
-	}
-
-	foreach (Utils::$context['member_groups'] as $group) {
-		if (!empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-													<dt>';
-		} else {
-		echo '
-													<li>';
-		}
-
-		if (empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-														<input type="checkbox" name="', Utils::$context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '>';
-		} else {
-		echo '
-														<span class="perms"><input type="radio" name="', Utils::$context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '></span>
-														<span class="perms"><input type="radio" name="', Utils::$context['current_permission'], '[', $group['id'], ']" value="off"', $group['status'] == 'off' ? ' checked' : '', '></span>
-														<span class="perms"><input type="radio" name="', Utils::$context['current_permission'], '[', $group['id'], ']" value="deny"', $group['status'] == 'deny' ? ' checked' : '', '></span>';
-		}
-
-		if (!empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-													</dt>
-													<dd>
-														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
-													</dd>';
-		} else {
-		echo '
-														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
-													</li>';
-		}
-	}
-
-	if (empty(Config::$modSettings['permission_enable_deny'])) {
-		echo '
-													<li>
-														<input type="checkbox" onclick="invertAll(this, this.form, \'' . Utils::$context['current_permission'] . '[\');">
-														<span>', Lang::getTxt('check_all', file: 'General'), '</span>
-													</li>
-												</ul>';
-	} else {
-	echo '
-												</dl>';
-	}
-
-	echo '
-											</fieldset>
-
-											<a href="javascript:void(0);" onclick="document.getElementById(\'', Utils::$context['current_permission'], '\').style.display = \'block\'; document.getElementById(\'', Utils::$context['current_permission'], '_groups_link\').style.display = \'none\'; return false;" id="', Utils::$context['current_permission'], '_groups_link" style="display: none;" class="toggle_down"> ', Lang::getTxt('avatar_select_permission', file: 'Admin'), '</a>
-
-											<script>
-												document.getElementById("', Utils::$context['current_permission'], '").style.display = "none";
-												document.getElementById("', Utils::$context['current_permission'], '_groups_link").style.display = "";
-											</script>';
-}
-
-/**
- * Edit post moderation permissions.
- */
-function template_postmod_permissions()
-{
-	echo '
-					<div id="admin_form_wrapper">
-						<form action="', Config::$scripturl, '?action=admin;area=permissions;sa=postmod;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" name="postmodForm" id="postmodForm" accept-charset="UTF-8">
-							<div class="cat_bar">
-								<h3 class="catbg">', Lang::getTxt('permissions_post_moderation', file: 'Admin'), '</h3>
-							</div>';
-
-	// First, we have the bit where we can enable or disable this bad boy.
-	echo '
-							<div class="windowbg">
-								<dl class="settings">
-									<dt>', Lang::getTxt('permissions_post_moderation_enable', file: 'ManagePermissions'), '</dt>
-									<dd><input type="checkbox" name="postmod_active"', !empty(Config::$modSettings['postmod_active']) ? ' checked' : '', '></dd>
-								</dl>
-							</div>';
-
-	// If we're not active, there's a bunch of stuff we don't need to show.
-	if (!empty(Config::$modSettings['postmod_active'])) {
-		// Got advanced permissions - if so warn!
-		if (!empty(Config::$modSettings['permission_enable_deny'])) {
-			echo '
-							<div class="information">', Lang::getTxt('permissions_post_moderation_deny_note', file: 'ManagePermissions'), '</div>';
-		}
-
-		echo '
-							<div class="padding">
-								<strong>', Lang::getTxt('permissions_post_moderation_legend', file: 'ManagePermissions'), '</strong>
-								<ul class="floatleft smalltext block">
-									<li><span class="main_icons post_moderation_allow"></span>', Lang::getTxt('permissions_post_moderation_allow', file: 'ManagePermissions'), '</li>
-									<li><span class="main_icons post_moderation_moderate"></span>', Lang::getTxt('permissions_post_moderation_moderate', file: 'ManagePermissions'), '</li>
-									<li><span class="main_icons post_moderation_deny"></span>', Lang::getTxt('permissions_post_moderation_disallow', file: 'ManagePermissions'), '</li>
-								</ul>
-								<br><br><br>
-								<p class="righttext floatright block">
-									', Lang::getTxt('permissions_post_moderation_select', file: 'ManagePermissions'), '
-									<select name="pid" onchange="document.forms.postmodForm.submit();">';
-
-		foreach (Utils::$context['profiles'] as $profile) {
-			if ($profile['can_modify']) {
-				echo '
-										<option value="', $profile['id'], '"', $profile['id'] == Utils::$context['current_profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
-			}
-		}
-
-		echo '
-									</select>
-									<input type="submit" value="', Lang::getTxt('go', file: 'General'), '" class="button">
-								</p>
-							</div><!-- .padding -->
-							<table class="table_grid" id="postmod">
-								<thead>
-									<tr class="title_bar">
-										<th></th>
-										<th class="centercol" colspan="3">
-											', Lang::getTxt('permissions_post_moderation_new_topics', file: 'ManagePermissions'), '
-										</th>
-										<th class="centercol" colspan="3">
-											', Lang::getTxt('permissions_post_moderation_replies_own', file: 'ManagePermissions'), '
-										</th>
-										<th class="centercol" colspan="3">
-											', Lang::getTxt('permissions_post_moderation_replies_any', file: 'ManagePermissions'), '
-										</th>';
-
-		if (Config::$modSettings['attachmentEnable'] == 1) {
-			echo '
-										<th class="centercol" colspan="3">
-											', Lang::getTxt('permissions_post_moderation_attachments', file: 'ManagePermissions'), '
-										</th>';
-		}
-
-		echo '
-									</tr>
-									<tr class="windowbg">
-										<th class="quarter_table">
-											', Lang::getTxt('permissions_post_moderation_group', file: 'ManagePermissions'), '
-										</th>
-										<th><span class="main_icons post_moderation_allow"></span></th>
-										<th><span class="main_icons post_moderation_moderate"></span></th>
-										<th><span class="main_icons post_moderation_deny"></span></th>
-										<th><span class="main_icons post_moderation_allow"></span></th>
-										<th><span class="main_icons post_moderation_moderate"></span></th>
-										<th><span class="main_icons post_moderation_deny"></span></th>
-										<th><span class="main_icons post_moderation_allow"></span></th>
-										<th><span class="main_icons post_moderation_moderate"></span></th>
-										<th><span class="main_icons post_moderation_deny"></span></th>';
-
-		if (Config::$modSettings['attachmentEnable'] == 1) {
-			echo '
-										<th><span class="main_icons post_moderation_allow"></span></th>
-										<th><span class="main_icons post_moderation_moderate"></span></th>
-										<th><span class="main_icons post_moderation_deny"></span></th>';
-		}
-
-		echo '
-									</tr>
-								</thead>
-								<tbody>';
-
-		foreach (Utils::$context['profile_groups'] as $group) {
-			echo '
-									<tr class="windowbg">
-										<td class="half_table">
-											<span ', ($group['color'] ? 'style="color: ' . $group['color'] . '"' : ''), '>', $group['name'], '</span>';
-
-			if (!empty($group['children'])) {
-				echo '
-											<br>
-											<span class="smalltext">', Lang::getTxt('permissions_includes_inherited', ['list' => Lang::sentenceList(array_map(fn($grp) => '"' . $grp . '"', $group['children']))], file: 'ManagePermissions'), '</span>';
-			}
-
-			echo '
-										</td>
-										<td class="centercol">
-											<input type="radio" name="new_topic[', $group['id'], ']" value="allow"', $group['new_topic'] == 'allow' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="new_topic[', $group['id'], ']" value="moderate"', $group['new_topic'] == 'moderate' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="new_topic[', $group['id'], ']" value="disallow"', $group['new_topic'] == 'disallow' ? ' checked' : '', '>
-										</td>';
-
-			// Guests can't have "own" permissions
-			if ($group['id'] == '-1') {
-				echo '
-										<td colspan="3"></td>';
-			} else {
-			echo '
-										<td class="centercol">
-											<input type="radio" name="replies_own[', $group['id'], ']" value="allow"', $group['replies_own'] == 'allow' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="replies_own[', $group['id'], ']" value="moderate"', $group['replies_own'] == 'moderate' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="replies_own[', $group['id'], ']" value="disallow"', $group['replies_own'] == 'disallow' ? ' checked' : '', '>
-										</td>';
-			}
-
-			echo '
-										<td class="centercol">
-											<input type="radio" name="replies_any[', $group['id'], ']" value="allow"', $group['replies_any'] == 'allow' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="replies_any[', $group['id'], ']" value="moderate"', $group['replies_any'] == 'moderate' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="replies_any[', $group['id'], ']" value="disallow"', $group['replies_any'] == 'disallow' ? ' checked' : '', '>
-										</td>';
-
-			if (Config::$modSettings['attachmentEnable'] == 1) {
-				echo '
-										<td class="centercol">
-											<input type="radio" name="attachment[', $group['id'], ']" value="allow"', $group['attachment'] == 'allow' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="attachment[', $group['id'], ']" value="moderate"', $group['attachment'] == 'moderate' ? ' checked' : '', '>
-										</td>
-										<td class="centercol">
-											<input type="radio" name="attachment[', $group['id'], ']" value="disallow"', $group['attachment'] == 'disallow' ? ' checked' : '', '>
-										</td>';
-			}
-
-			echo '
-									</tr>';
-		}
-
-		echo '
-								</tbody>
-							</table>';
-	}
-
-	echo '
-								<input type="submit" name="save_changes" value="', Lang::getTxt('permissions_commit', file: 'ManagePermissions'), '" class="button">
-								<input type="hidden" name="', Utils::$context['admin-mppm_token_var'], '" value="', Utils::$context['admin-mppm_token'], '">
-						</form>
-					</div><!-- #admin_form_wrapper -->';
-}
diff --git a/Themes/default/ManageScheduledTasks.template.php b/Themes/default/ManageScheduledTasks.template.php
deleted file mode 100644
index f61501acf3c..00000000000
--- a/Themes/default/ManageScheduledTasks.template.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Template for listing all scheduled tasks.
- */
-function template_view_scheduled_tasks()
-{
-	// We completed some tasks?
-	if (!empty(Utils::$context['tasks_were_run'])) {
-		if (empty(Utils::$context['scheduled_errors'])) {
-			echo '
-	<div class="infobox">
-		', Lang::getTxt('scheduled_tasks_were_run', file: 'ManageScheduledTasks'), '
-	</div>';
-		} else {
-			echo '
-	<div class="errorbox" id="errors">
-		<dl>
-			<dt>
-				<strong id="error_serious">', Lang::getTxt('scheduled_tasks_were_run_errors', file: 'ManageScheduledTasks'), '</strong>
-			</dt>';
-
-			foreach (Utils::$context['scheduled_errors'] as $task => $errors) {
-				echo '
-			<dd class="error">
-				<strong>', Lang::txtExists('scheduled_task_' . $task, file: 'ManageScheduledTasks') ? Lang::getTxt('scheduled_task_' . $task, file: 'ManageScheduledTasks') : $task, '</strong>
-				<ul>
-					<li>', implode('</li><li>', $errors), '</li>
-				</ul>
-			</dd>';
-			}
-
-			echo '
-		</dl>
-	</div>';
-		}
-	}
-
-	template_show_list('scheduled_tasks');
-}
-
-/**
- * A template for, you guessed it, editing a task!
- */
-function template_edit_scheduled_tasks()
-{
-	// Starts off with general maintenance procedures.
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=scheduledtasks;sa=taskedit;save;tid=', Utils::$context['task']['id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('scheduled_task_edit', file: 'ManageScheduledTasks'), '</h3>
-			</div>
-			<div class="information">
-				<em>', Lang::getTxt('scheduled_task_time_offset', Utils::$context, file: 'ManageScheduledTasks'), ' </em>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('scheduled_tasks_name', file: 'ManageScheduledTasks'), '</strong>
-					</dt>
-					<dd>
-						', Utils::$context['task']['name'], '<br>
-						<span class="smalltext">', Utils::$context['task']['desc'], '</span>
-					</dd>
-					<dt>
-						<strong><label for="regularity">', Lang::getTxt('scheduled_task_edit_interval', file: 'ManageScheduledTasks'), '</label></strong>
-					</dt>
-					<dd>
-						', Lang::getTxt('scheduled_task_edit_repeat', file: 'ManageScheduledTasks'), '
-						<input type="number" name="regularity" id="regularity" value="', empty(Utils::$context['task']['regularity']) ? 1 : Utils::$context['task']['regularity'], '" onchange="if (this.value < 1) this.value = 1;" size="2" min="0">
-						<select name="unit">
-							<option value="m"', empty(Utils::$context['task']['unit']) || Utils::$context['task']['unit'] == 'm' ? ' selected' : '', '>', Lang::getTxt('scheduled_task_reg_unit_m', file: 'ManageScheduledTasks'), '</option>
-							<option value="h"', Utils::$context['task']['unit'] == 'h' ? ' selected' : '', '>', Lang::getTxt('scheduled_task_reg_unit_h', file: 'ManageScheduledTasks'), '</option>
-							<option value="d"', Utils::$context['task']['unit'] == 'd' ? ' selected' : '', '>', Lang::getTxt('scheduled_task_reg_unit_d', file: 'ManageScheduledTasks'), '</option>
-							<option value="w"', Utils::$context['task']['unit'] == 'w' ? ' selected' : '', '>', Lang::getTxt('scheduled_task_reg_unit_w', file: 'ManageScheduledTasks'), '</option>
-						</select>
-					</dd>
-					<dt>
-						<strong><label for="start_time">', Lang::getTxt('scheduled_task_edit_start_time', file: 'ManageScheduledTasks'), '</label></strong><br>
-						<span class="smalltext">', Lang::getTxt('scheduled_task_edit_start_time_desc', file: 'ManageScheduledTasks'), '</span>
-					</dt>
-					<dd>
-						<input type="time" name="offset" id="start_time" value="', Utils::$context['task']['offset_formatted'], '">
-					</dd>
-					<dt>
-						<strong><label for="enabled">', Lang::getTxt('scheduled_tasks_enabled', file: 'ManageScheduledTasks'), '</label></strong>
-					</dt>
-					<dd>
-						<input type="checkbox" name="enabled" id="enabled"', !Utils::$context['task']['disabled'] ? ' checked' : '', '>
-					</dd>
-				</dl>
-				<div class="righttext">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['admin-st_token_var'], '" value="', Utils::$context['admin-st_token'], '">
-					<input type="submit" name="save" value="', Lang::getTxt('scheduled_tasks_save_changes', file: 'ManageScheduledTasks'), '" class="button">
-				</div>
-			</div><!-- .windowbg -->
-		</form>';
-}
diff --git a/Themes/default/ManageSearch.template.php b/Themes/default/ManageSearch.template.php
deleted file mode 100644
index a69771ff785..00000000000
--- a/Themes/default/ManageSearch.template.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Modify the search weights.
- */
-function template_modify_weights()
-{
-	echo '
-	<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=managesearch;sa=weights" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('search_weights', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_frequency" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a><label for="weight1_val">
-					', Lang::getTxt('search_weight_frequency', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_frequency" id="weight1_val" value="', empty(Config::$modSettings['search_weight_frequency']) ? '0' : Config::$modSettings['search_weight_frequency'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight1" class="search_weight">', Utils::$context['relative_weights']['search_weight_frequency'], '%</span>
-				</dd>
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_age" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-					<label for="weight2_val">', Lang::getTxt('search_weight_age', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_age" id="weight2_val" value="', empty(Config::$modSettings['search_weight_age']) ? '0' : Config::$modSettings['search_weight_age'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight2" class="search_weight">', Utils::$context['relative_weights']['search_weight_age'], '%</span>
-				</dd>
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_length" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-					<label for="weight3_val">', Lang::getTxt('search_weight_length', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_length" id="weight3_val" value="', empty(Config::$modSettings['search_weight_length']) ? '0' : Config::$modSettings['search_weight_length'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight3" class="search_weight">', Utils::$context['relative_weights']['search_weight_length'], '%</span>
-				</dd>
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_subject" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-					<label for="weight4_val">', Lang::getTxt('search_weight_subject', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_subject" id="weight4_val" value="', empty(Config::$modSettings['search_weight_subject']) ? '0' : Config::$modSettings['search_weight_subject'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight4" class="search_weight">', Utils::$context['relative_weights']['search_weight_subject'], '%</span>
-				</dd>
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_first_message" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-					<label for="weight5_val">', Lang::getTxt('search_weight_first_message', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_first_message" id="weight5_val" value="', empty(Config::$modSettings['search_weight_first_message']) ? '0' : Config::$modSettings['search_weight_first_message'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight5" class="search_weight">', Utils::$context['relative_weights']['search_weight_first_message'], '%</span>
-				</dd>
-				<dt>
-					<a href="', Config::$scripturl, '?action=helpadmin;help=search_weight_sticky" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-					<label for="weight6_val">', Lang::getTxt('search_weight_sticky', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<span class="search_weight">
-						<input type="text" name="search_weight_sticky" id="weight6_val" value="', empty(Config::$modSettings['search_weight_sticky']) ? '0' : Config::$modSettings['search_weight_sticky'], '" onchange="calculateNewValues()" size="3">
-					</span>
-					<span id="weight6" class="search_weight">', Utils::$context['relative_weights']['search_weight_sticky'], '%</span>
-				</dd>
-				<dt>
-					<strong>', Lang::getTxt('search_weights_total', file: 'Search'), '</strong>
-				</dt>
-				<dd>
-					<span id="weighttotal" class="search_weight">
-						<strong>', Utils::$context['relative_weights']['total'], '</strong>
-					</span>
-					<span class="search_weight"><strong>100%</strong></span>
-				</dd>
-			</dl>
-			<input type="submit" name="save" value="', Lang::getTxt('search_weights_save', file: 'Search'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-msw_token_var'], '" value="', Utils::$context['admin-msw_token'], '">
-		</div><!-- .windowbg -->
-	</form>';
-}
-
-/**
- * Select the search method.
- */
-function template_select_search_method()
-{
-	echo '
-	<div class="cat_bar">
-		<h3 class="catbg">', Lang::getTxt('search_method', file: 'Admin'), '</h3>
-	</div>
-	<div class="information">
-		<div class="smalltext">
-			<a href="', Config::$scripturl, '?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);">', Lang::getTxt('search_create_index_why', file: 'Search'), '</a>
-		</div>
-	</div>
-	<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=managesearch;sa=method" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('search_method', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">';
-
-	if (!empty(Utils::$context['table_info'])) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('search_method_messages_table_space', file: 'Search'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['table_info']['data_length'], '
-				</dd>
-				<dt>
-					<strong>', Lang::getTxt('search_method_messages_index_space', file: 'Search'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['table_info']['index_length'], '
-				</dd>';
-	}
-	echo '
-			</dl>
-			', Utils::$context['double_index'] ? '<div class="noticebox">
-			' . Lang::getTxt('search_double_index', file: 'Search') . '</div>' : '', '
-			<fieldset class="search_settings floatleft">
-				<legend>', Lang::getTxt('search_index', file: 'Search'), '</legend>
-				<dl>
-					<dt>
-						<label>
-							<input type="radio" name="search_index" value=""', empty(Config::$modSettings['search_index']) ? ' checked' : '', '>
-							', Lang::getTxt('search_index_none', file: 'Search'), '
-						</label>
-					</dt>';
-
-	foreach (Utils::$context['search_apis'] as $api) {
-		if ($api['has_template'] || $api['instance']->getStatus() === 'hidden') {
-			continue;
-		}
-
-		echo '
-					<hr>
-					<dt>
-						<label>
-							<input type="radio" name="search_index" value="', $api['setting_index'], '"', !empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == $api['setting_index'] ? ' checked' : '', !in_array($api['instance']->getStatus(), [null, 'exists']) ? ' onclick="alert(\'' . Lang::getTxt('search_index_custom_warning', file: 'Search') . '\'); return false;"' : '', '>
-							', Lang::txtExists($api['instance']->getLabel(), file: 'Search') ? Lang::getTxt($api['instance']->getLabel(), file: 'Search') : Lang::getTxt('search_index_generic', ['index' => substr(strrchr($api['class'], '\\'), 1)], file: 'Search'), '
-						</label>
-					</dt>
-					<dd>
-						<span class="smalltext">';
-
-		if (Lang::txtExists($api['instance']->getDescription(), file: 'Search')) {
-			echo Lang::getTxt($api['instance']->getDescription(), file: 'Search');
-		}
-
-		if ($api['instance']->getStatus() !== null) {
-			if (Lang::txtExists($api['instance']->getDescription(), file: 'Search')) {
-				echo '
-						<br>';
-			}
-
-			$admin_subactions = $api['instance']->getAdminSubactions();
-
-			switch ($api['instance']->getStatus()) {
-				case 'exists':
-					$index_status = 'search_method_index_already_exists';
-					$buttons = [];
-
-					$sa = $admin_subactions['remove']['sa'];
-
-					foreach ($admin_subactions['remove']['extra_params'] as $key => $value) {
-						$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
-					}
-
-					$buttons[$sa] = 'search_index_remove';
-					break;
-
-				case 'partial':
-					$index_status = 'search_method_index_partial';
-					$buttons = [];
-
-					foreach (['resume', 'remove'] as $type) {
-						$sa = $admin_subactions[$type]['sa'];
-
-						foreach ($admin_subactions[$type]['extra_params'] as $key => $value) {
-							$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
-						}
-
-						$buttons[$sa] = 'search_index_' . $type;
-					}
-					break;
-
-				default:
-					$index_status = 'search_method_no_index_exists';
-					$buttons = [];
-
-					$sa = $admin_subactions['build']['sa'];
-
-					foreach ($admin_subactions['build']['extra_params'] as $key => $value) {
-						$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
-					}
-
-					$buttons[$sa] = 'search_create_index_start';
-					break;
-			}
-
-			echo Lang::getTxt(
-				$index_status,
-				[
-					'index' => Lang::getTxt(
-						Lang::txtExists($api['instance']->getLabel(), file: 'Search') ? $api['instance']->getLabel() : 'search_index_generic',
-						[
-							'index' => substr(strrchr($api['instance']::class, '\\'), 1),
-						],
-						file: 'Search',
-					),
-				],
-				file: 'Search',
-			);
-
-			foreach ($buttons as $sa => $label) {
-				echo ' <a href="' . Config::$scripturl . '?action=admin;area=managesearch;sa=' . $sa . '" class="button">' . Lang::getTxt($label, file: 'Search') . '</a>';
-			}
-		}
-
-		if (
-			in_array($api['instance']->getStatus(), ['exists', null])
-			&& !empty($api['instance']->getSize())
-		) {
-			echo '
-						<br>
-						<strong>' . Lang::getTxt('search_index_size', file: 'Search') . '</strong> ' . Lang::getTxt('size_kilobyte', [$api['instance']->getSize() / 1024], file: 'General');
-		}
-
-		echo '
-						</span>
-					</dd>';
-	}
-
-	echo '
-				</dl>
-			</fieldset>
-			<fieldset class="search_settings floatright">
-			<legend>', Lang::getTxt('search_method', file: 'Admin'), '</legend>
-				<input type="checkbox" name="search_force_index" id="search_force_index_check" value="1"', empty(Config::$modSettings['search_force_index']) ? '' : ' checked', '><label for="search_force_index_check">', Lang::getTxt('search_force_index', file: 'Search'), '</label><br>
-				<input type="checkbox" name="search_match_words" id="search_match_words_check" value="1"', empty(Config::$modSettings['search_match_words']) ? '' : ' checked', '><label for="search_match_words_check">', Lang::getTxt('search_match_words', file: 'Search'), '</label>
-			</fieldset>
-			<br class="clear">
-			<input type="submit" name="save" value="', Lang::getTxt('search_method_save', file: 'Search'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-msmpost_token_var'], '" value="', Utils::$context['admin-msmpost_token'], '">
-		</div><!-- .windowbg -->
-	</form>';
-}
-
-/**
- * Create a search index.
- */
-function template_create_index()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=managesearch;sa=createmsgindex;step=1" method="post" accept-charset="UTF-8" name="create_index">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('search_create_index', file: 'Search'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<label for="predefine_select">', Lang::getTxt('search_predefined', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<select name="bytes_per_word" id="predefine_select">
-						<option value="2">', Lang::getTxt('search_predefined_small', file: 'Search'), '</option>
-						<option value="4" selected>', Lang::getTxt('search_predefined_moderate', file: 'Search'), '</option>
-						<option value="5">', Lang::getTxt('search_predefined_large', file: 'Search'), '</option>
-					</select>
-				</dd>
-			</dl>
-			<hr>
-			<input type="submit" name="save" value="', Lang::getTxt('search_create_index_start', file: 'Search'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</div>
-	</form>';
-}
-
-/**
- * Display a progress page while creating a search index.
- */
-function template_create_index_progress()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=managesearch;sa=createmsgindex;step=1" name="autoSubmit" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('search_create_index', file: 'Search'), '</h3>
-		</div>
-		<div class="windowbg">
-			<div>
-				<p>', Lang::getTxt('search_create_index_not_ready', file: 'Search'), '</p>
-				<div class="progress_bar">
-					<span>', Utils::$context['percentage'], '%</span>
-					<div class="bar" style="width: ', Utils::$context['percentage'], '%;"></div>
-				</div>
-			</div>
-			<hr>
-			<input type="submit" name="cont" value="', Lang::getTxt('search_create_index_continue', file: 'Search'), '" class="button">
-		</div>
-		<input type="hidden" name="step" value="', Utils::$context['step'], '">
-		<input type="hidden" name="start" value="', Utils::$context['start'], '">
-		<input type="hidden" name="bytes_per_word" value="', Utils::$context['index_settings']['bytes_per_word'], '">
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<script>
-		doAutoSubmit(10, ', Utils::escapeJavaScript(Lang::getTxt('search_create_index_continue', file: 'Search')), ');
-	</script>';
-}
-
-/**
- * Done creating a search index.
- */
-function template_create_index_done()
-{
-	echo '
-	<div class="cat_bar">
-		<h3 class="catbg">', Lang::getTxt('search_create_index', file: 'Search'), '</h3>
-	</div>
-	<div class="windowbg">
-		<p>', Lang::getTxt('search_create_index_done', file: 'Search'), '</p>
-		<p>
-			<strong><a href="', Config::$scripturl, '?action=admin;area=managesearch;sa=method">', Lang::getTxt('search_create_index_done_link', file: 'Search'), '</a></strong>
-		</p>
-	</div>';
-}
-
-/**
- * Add or edit a search engine spider.
- */
-function template_spider_edit()
-{
-	echo '
-	<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=sengines;sa=editspiders;sid=', Utils::$context['spider']['id'], '" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="information noup">
-			', Lang::getTxt('add_spider_desc', file: 'Search'), '
-		</div>
-		<div class="windowbg noup">
-			<dl class="settings">
-				<dt>
-					<strong><label for="spider_name">', Lang::getTxt('spider_name', file: 'Search'), '</label></strong><br>
-					<span class="smalltext">', Lang::getTxt('spider_name_desc', file: 'Search'), '</span>
-				</dt>
-				<dd>
-					<input type="text" name="spider_name" id="spider_name" value="', Utils::$context['spider']['name'], '">
-				</dd>
-				<dt>
-					<strong><label for="spider_agent">', Lang::getTxt('spider_agent', file: 'Search'), '</label></strong><br>
-					<span class="smalltext">', Lang::getTxt('spider_agent_desc', file: 'Search'), '</span>
-				</dt>
-				<dd>
-					<input type="text" name="spider_agent" id="spider_agent" value="', Utils::$context['spider']['agent'], '">
-				</dd>
-				<dt>
-					<strong><label for="spider_ip">', Lang::getTxt('spider_ip_info', file: 'Search'), '</label></strong><br>
-					<span class="smalltext">', Lang::getTxt('spider_ip_info_desc', file: 'Search'), '</span>
-				</dt>
-				<dd>
-					<textarea name="spider_ip" id="spider_ip" rows="4" cols="20">', Utils::$context['spider']['ip_info'], '</textarea>
-				</dd>
-			</dl>
-			<hr>
-			<input type="submit" name="save" value="', Utils::$context['page_title'], '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-ses_token_var'], '" value="', Utils::$context['admin-ses_token'], '">
-		</div><!-- .windowbg -->
-	</form>';
-}
-
-/**
- * Show... spider... logs...
- */
-function template_show_spider_logs()
-{
-	// Standard fields.
-	template_show_list('spider_logs');
-
-	echo '
-	<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=sengines;sa=logs" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('spider_logs_delete', file: 'Search'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>
-				', Lang::getTxt('spider_logs_delete_older', file: 'Search'), '
-				<input type="text" name="older" id="older" value="7" size="3">
-				', Lang::getTxt('spider_logs_delete_day', file: 'Search'), '
-			</p>
-			<input type="submit" name="delete_entries" value="', Lang::getTxt('spider_logs_delete_submit', file: 'Search'), '" onclick="if (document.getElementById(\'older\').value &lt; 1 &amp;&amp; !confirm(\'' . addcslashes(Lang::getTxt('spider_logs_delete_confirm', file: 'Search'), "'") . '\')) return false; return true;" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['admin-sl_token_var'], '" value="', Utils::$context['admin-sl_token'], '">
-		</div>
-	</form>';
-}
-
-/**
- * Show... spider... stats...
- */
-function template_show_spider_stats()
-{
-	// Standard fields.
-	template_show_list('spider_stat_list');
-
-	echo '
-		<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=sengines;sa=stats" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('spider_logs_delete', file: 'Search'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>
-					', Lang::getTxt('spider_stats_delete_older', ['input' => '<input type="number" name="older" id="older" value="90" size="3">'], file: 'Search'), '
-				</p>
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-ss_token_var'], '" value="', Utils::$context['admin-ss_token'], '">
-				<input type="submit" name="delete_entries" value="', Lang::getTxt('spider_logs_delete_submit', file: 'Search'), '" onclick="if (document.getElementById(\'older\').value &lt; 1 &amp;&amp; !confirm(\'' . addcslashes(Lang::getTxt('spider_logs_delete_confirm', file: 'Search'), "'") . '\')) return false; return true;" class="button">
-				<br>
-			</div>
-		</form>';
-}
diff --git a/Themes/default/ManageSmileys.template.php b/Themes/default/ManageSmileys.template.php
deleted file mode 100644
index 817c0e3340e..00000000000
--- a/Themes/default/ManageSmileys.template.php
+++ /dev/null
@@ -1,481 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Shows a list of smiley sets so you can edit them.
- */
-function template_editsets()
-{
-	template_show_list('smiley_set_list');
-}
-
-/**
- * Modifying a smiley set.
- */
-function template_modifyset()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=smileys;sa=editsets" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">
-			', Lang::getTxt(Utils::$context['current_set']['is_new'] ? 'smiley_set_new' : 'smiley_set_modify_existing', file: 'ManageSmileys'), '
-			</h3>
-		</div>';
-
-	if (Utils::$context['current_set']['is_new'] && !empty(Config::$modSettings['smiley_enable'])) {
-		echo '
-		<div class="information noup">
-			', Lang::getTxt('smiley_set_import_info', file: 'ManageSmileys'), '
-		</div>';
-	}
-	// If this is an existing set, and there are still un-added smileys - offer an import opportunity.
-	elseif (!empty(Utils::$context['current_set']['can_import'])) {
-		echo '
-		<div class="information noup">
-			', Utils::$context['smiley_set_unused_message'], '
-		</div>';
-	}
-
-	echo '
-		<div class="windowbg noup">
-			<dl class="settings">
-				<dt>
-					<strong><label for="smiley_sets_name">', Lang::getTxt('smiley_sets_name', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="smiley_sets_name" id="smiley_sets_name" value="', Utils::$context['current_set']['name'], '">
-				</dd>
-				<dt>
-					<strong><label for="smiley_sets_path">', Lang::getTxt('smiley_sets_url', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					', Config::$modSettings['smileys_url'], '/';
-
-	if (empty(Utils::$context['smiley_set_dirs']) || !empty(Utils::$context['make_new'])) {
-		echo '
-					<input type="text" name="smiley_sets_path" id="smiley_sets_path" value="', Utils::$context['current_set']['path'], '"> ';
-	} else {
-		echo '
-					<select name="smiley_sets_path" id="smiley_sets_path">';
-
-		foreach (Utils::$context['smiley_set_dirs'] as $smiley_set_dir) {
-			echo '
-						<option value="', $smiley_set_dir['id'], '"', $smiley_set_dir['current'] ? ' selected' : '', $smiley_set_dir['selectable'] ? '' : ' disabled', '>', $smiley_set_dir['id'], '</option>';
-		}
-		echo '
-					</select> ';
-	}
-	echo '
-					/..
-				</dd>
-				<dt>
-					<strong><label for="smiley_sets_default">', Lang::getTxt('smiley_set_select_default', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="checkbox" name="smiley_sets_default" id="smiley_sets_default" value="1"', Utils::$context['current_set']['is_default'] ? ' checked' : '', '>
-				</dd>
-			</dl>
-			<input type="submit" name="smiley_save" value="', Lang::getTxt('smiley_sets_save', file: 'ManageSmileys'), '" class="button">
-		</div><!-- .windowbg -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		<input type="hidden" name="', Utils::$context['admin-mss_token_var'], '" value="', Utils::$context['admin-mss_token'], '">
-		<input type="hidden" name="set" value="', Utils::$context['current_set']['path'], '">
-	</form>';
-}
-
-/**
- * Editing an individual smiley
- */
-function template_modifysmiley()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=smileys;sa=editsmileys" method="post" accept-charset="UTF-8" name="smileyForm" id="smileyForm" enctype="multipart/form-data">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('smiley_modify_existing', file: 'ManageSmileys'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<strong>', Lang::getTxt('smiley_preview_using_set', file: 'ManageSmileys'), '</strong>
-					<select id="set" onchange="updatePreview($(\'#smiley_filename_\' + $(\'#set\').val()).val(), $(\'#set\').val());">';
-
-	foreach (Utils::$context['smiley_sets'] as $smiley_set) {
-		echo '
-					<option value="', $smiley_set['path'], '"', Utils::$context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
-	}
-
-	echo '
-					</select>
-				</dt>
-				<dd>
-					<img src="', Config::$modSettings['smileys_url'], '/', Config::$modSettings['smiley_sets_default'], '/', Utils::$context['current_smiley']['filename'], '" id="preview" alt="">
-				</dd>
-				<dt>
-					<strong><label for="smiley_filename">', Lang::getTxt('smileys_filename', file: 'ManageSmileys'), '</label></strong>
-				</dt>';
-
-	if (empty(Utils::$context['filenames'])) {
-		echo '
-				<dd>
-					<input type="text" name="smiley_filename" id="smiley_filename" value="', Utils::$context['current_smiley']['filename'], '">
-				</dd>';
-	} else {
-		foreach (Utils::$context['smiley_sets'] as $set => $smiley_set) {
-			echo '
-				<dt>
-					', $smiley_set['name'], '
-				</dt>
-				<dd', in_array($set, Utils::$context['missing_sets']) ? ' class="errorbox"' : '', '>
-					<select name="smiley_filename[', $set, ']" id="smiley_filename_', $set, '" onchange="$(\'#set\').val(\'', $set, '\');updatePreview($(\'#smiley_filename_\' + $(\'#set\').val()).val(), $(\'#set\').val());">';
-
-			foreach (Utils::$context['filenames'][$set] as $filename) {
-				echo '
-						<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', $filename['disabled'] ? ' disabled' : '', '>', $filename['id'], '</option>';
-			}
-
-			echo '
-					</select>
-					<input type="file" name="smiley_upload[', $set, ']" id="smiley_upload_', $set, '">
-				</dd>';
-		}
-	}
-
-	echo '
-			</dl>
-			<dl class="settings">
-				<dt>
-					<strong><label for="smiley_code">', Lang::getTxt('smileys_code', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="smiley_code" id="smiley_code" value="', Utils::$context['current_smiley']['code'], '">
-				</dd>
-				<dt>
-					<strong><label for="smiley_description">', Lang::getTxt('smileys_description', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="smiley_description" id="smiley_description" value="', Utils::$context['current_smiley']['description'], '">
-				</dd>
-				<dt>
-					<strong><label for="smiley_location">', Lang::getTxt('smileys_location', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<select name="smiley_location" id="smiley_location">
-						<option value="0"', Utils::$context['current_smiley']['location'] == 0 ? ' selected' : '', '>
-							', Lang::getTxt('smileys_location_form', file: 'ManageSmileys'), '
-						</option>
-						<option value="1"', Utils::$context['current_smiley']['location'] == 1 ? ' selected' : '', '>
-							', Lang::getTxt('smileys_location_hidden', file: 'ManageSmileys'), '
-						</option>
-						<option value="2"', Utils::$context['current_smiley']['location'] == 2 ? ' selected' : '', '>
-							', Lang::getTxt('smileys_location_popup', file: 'ManageSmileys'), '
-						</option>
-					</select>
-				</dd>
-			</dl>
-			<input type="submit" name="smiley_save" value="', Lang::getTxt('smileys_save', file: 'ManageSmileys'), '" class="button">
-			<input type="submit" name="deletesmiley" value="', Lang::getTxt('smileys_delete', file: 'ManageSmileys'), '" data-confirm="', Lang::getTxt('smileys_delete_confirm', file: 'ManageSmileys'), '" class="button you_sure">
-		</div><!-- .windowbg -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		<input type="hidden" name="smiley" value="', Utils::$context['current_smiley']['id'], '">
-	</form>';
-}
-
-/**
- * Adding a new smiley.
- */
-function template_addsmiley()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=smileys;sa=addsmiley" method="post" accept-charset="UTF-8" name="smileyForm" id="smileyForm" enctype="multipart/form-data">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('smileys_add_method', file: 'ManageSmileys'), '</h3>
-		</div>
-		<div class="windowbg">
-			<ul>
-				<li>
-					<label for="method-existing"><input type="radio" onclick="switchType();" name="method" id="method-existing" value="existing" checked> ', Lang::getTxt('smileys_add_existing', file: 'ManageSmileys'), '</label>
-				</li>
-				<li>
-					<label for="method-upload"><input type="radio" onclick="switchType();" name="method" id="method-upload" value="upload"> ', Lang::getTxt('smileys_add_upload', file: 'ManageSmileys'), '</label>
-				</li>
-			</ul>
-			<br>
-			<fieldset id="ex_settings">
-				<dl class="settings">
-					<dt>
-						<strong><label for="preview">', Lang::getTxt('smiley_preview', file: 'ManageSmileys'), '</label></strong>
-					</dt>
-					<dd>
-						<img src="', Config::$modSettings['smileys_url'], '/', Config::$modSettings['smiley_sets_default'], '/', Utils::$context['filenames'][Utils::$context['selected_set']]['smiley']['id'], '" id="preview" alt="">
-					</dd>
-					<dt>
-						<strong><label for="smiley_filename">', Lang::getTxt('smileys_filename', file: 'ManageSmileys'), '</label></strong>
-					</dt>
-					<dd>';
-
-	if (empty(Utils::$context['filenames'])) {
-		echo '
-						<input type="text" name="smiley_filename" id="smiley_filename" value="', Utils::$context['current_smiley']['filename'], '" onchange="selectMethod(\'existing\');">';
-	} else {
-		echo '
-						<select name="smiley_filename" id="smiley_filename" onchange="updatePreview($(\'#smiley_filename\').val());selectMethod(\'existing\');">';
-
-		foreach (Utils::$context['smiley_sets'] as $smiley_set) {
-			echo '
-							<optgroup label="', $smiley_set['name'], '">';
-
-			if (!empty(Utils::$context['filenames'][$smiley_set['path']])) {
-				foreach (Utils::$context['filenames'][$smiley_set['path']] as $filename) {
-					echo '
-								<option value="', $smiley_set['path'], '/', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
-				}
-			}
-
-			echo '
-							</optgroup>';
-		}
-
-		echo '
-						</select>';
-	}
-
-	echo '
-					</dd>
-				</dl>
-			</fieldset>
-			<fieldset id="ul_settings" style="display: none;">
-				<dl class="settings">
-					<dt>
-						<a href="', Config::$scripturl, '?action=helpadmin;help=smiley_sameall" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-						<strong><label for="sameall">', Lang::getTxt('smileys_add_upload_all', file: 'ManageSmileys'), '</label></strong>
-					</dt>
-					<dd>
-						<input type="checkbox" name="sameall" id="sameall" onclick="swapUploads(); selectMethod(\'upload\');" checked>
-					</dd>
-					<dt>
-						<strong>', Lang::getTxt('smileys_add_upload_choose', file: 'ManageSmileys'), '</strong>
-					</dt>
-					<dt class="upload_sameall">
-						', Lang::getTxt('smileys_add_upload_choose_desc', file: 'ManageSmileys'), '
-					</dt>
-					<dd class="upload_sameall">
-						<input type="file" name="uploadSmiley" id="uploadSmiley" onchange="selectMethod(\'upload\');">
-					</dd>';
-
-	foreach (Utils::$context['smiley_sets'] as $smiley_set) {
-		echo '
-					<dt class="upload_more" style="display: none;">
-						', Lang::getTxt('smileys_add_upload_for', ['name' => '<strong>' . $smiley_set['name'] . '</strong>'], file: 'ManageSmileys'), ':
-					</dt>
-					<dd class="upload_more" style="display: none;">
-						<input type="file" name="individual_', $smiley_set['path'], '" disabled onchange="selectMethod(\'upload\');">
-					</dd>';
-	}
-
-	echo '
-				</dl>
-			</fieldset>
-		</div><!-- .windowbg -->
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('smiley_new', file: 'ManageSmileys'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<strong><label for="smiley_code">', Lang::getTxt('smileys_code', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="smiley_code" id="smiley_code" value="">
-				</dd>
-				<dt>
-					<strong><label for="smiley_description">', Lang::getTxt('smileys_description', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="smiley_description" id="smiley_description" value="">
-				</dd>
-				<dt>
-					<strong><label for="smiley_location">', Lang::getTxt('smileys_location', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<select name="smiley_location" id="smiley_location">
-						<option value="0" selected>
-							', Lang::getTxt('smileys_location_form', file: 'ManageSmileys'), '
-						</option>
-						<option value="1">
-							', Lang::getTxt('smileys_location_hidden', file: 'ManageSmileys'), '
-						</option>
-						<option value="2">
-							', Lang::getTxt('smileys_location_popup', file: 'ManageSmileys'), '
-						</option>
-					</select>
-				</dd>
-			</dl>
-			<input type="submit" name="smiley_save" value="', Lang::getTxt('smileys_save', file: 'ManageSmileys'), '" class="button">
-		</div><!-- .windowbg -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>';
-}
-
-/**
- * Ordering smileys.
- */
-function template_setorder()
-{
-	foreach (Utils::$context['smileys'] as $location) {
-		echo '
-	<form action="', Config::$scripturl, '?action=admin;area=smileys;sa=editsmileys" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', $location['title'], '</h3>
-		</div>
-		<div class="information noup">
-			', $location['description'], '
-		</div>
-		<div class="move_smileys windowbg noup">
-			<strong>', Lang::getTxt(empty(Utils::$context['move_smiley']) ? 'smileys_move_select_smiley' : 'smileys_move_select_destination', file: 'ManageSmileys'), '</strong><br>';
-
-		foreach ($location['rows'] as $row) {
-			if (!empty(Utils::$context['move_smiley'])) {
-				echo '
-			<a href="', Config::$scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', Utils::$context['move_smiley'], ';row=', $row[0]['row'], ';reorder=1;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="main_icons select_below" title="', Lang::getTxt('smileys_move_here', file: 'ManageSmileys'), '"></span></a>';
-			}
-
-			foreach ($row as $smiley) {
-				if (empty(Utils::$context['move_smiley'])) {
-					echo '
-			<a href="', Config::$scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', Config::$modSettings['smileys_url'], '/', Config::$modSettings['smiley_sets_default'], '/', $smiley['filename'], '" alt="', $smiley['description'], '"></a>';
-				} else {
-				echo '
-			<img src="', Config::$modSettings['smileys_url'], '/', Config::$modSettings['smiley_sets_default'], '/', $smiley['filename'], '" alt="', $smiley['description'], '" ', $smiley['selected'] ? 'class="selected_item"' : '', '>
-			<a href="', Config::$scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', Utils::$context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" title="', Lang::getTxt('smileys_move_here', file: 'ManageSmileys'), '"><span class="main_icons select_below" title="', Lang::getTxt('smileys_move_here', file: 'ManageSmileys'), '"></span></a>';
-				}
-			}
-
-			echo '
-			<br>';
-		}
-
-		if (!empty(Utils::$context['move_smiley'])) {
-			echo '
-			<a href="', Config::$scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', Utils::$context['move_smiley'], ';row=', $location['last_row'], ';reorder=1;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="main_icons select_below" title="', Lang::getTxt('smileys_move_here', file: 'ManageSmileys'), '"></span></a>';
-		}
-		echo '
-		</div><!-- .windowbg -->
-		<input type="hidden" name="reorder" value="1">
-	</form>';
-	}
-}
-
-/**
- * Editing Message Icons
- */
-function template_editicons()
-{
-	template_show_list('message_icon_list');
-}
-
-/**
- * Editing an individual message icon
- */
-function template_editicon()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=admin;area=smileys;sa=editicon;icon=', Utils::$context['new_icon'] ? '0' : Utils::$context['icon']['id'], '" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Utils::$context['new_icon'] ? Lang::getTxt('icons_new_icon', file: 'ManageSmileys') : Lang::getTxt('icons_edit_icon', file: 'ManageSmileys'), '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">';
-
-	if (!Utils::$context['new_icon']) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('smiley_preview', file: 'ManageSmileys'), '</strong>
-				</dt>
-				<dd>
-					<img src="', Utils::$context['icon']['image_url'], '" alt="', Utils::$context['icon']['title'], '">
-				</dd>';
-	}
-
-	echo '
-				<dt>
-					<strong><label for="icon_filename">', Lang::getTxt('smileys_filename', file: 'ManageSmileys'), '</label>: </strong><br><span class="smalltext">', Lang::getTxt('icons_extension_must_be', ['extension' => '.png'], file: 'ManageSmileys'), '</span>
-				</dt>
-				<dd>
-					<input type="text" name="icon_filename" id="icon_filename" value="', !empty(Utils::$context['icon']['filename']) ? Utils::$context['icon']['filename'] . '.png' : '', '">
-				</dd>
-				<dt>
-					<strong><label for="icon_description">', Lang::getTxt('smileys_description', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="icon_description" id="icon_description" value="', !empty(Utils::$context['icon']['title']) ? Utils::$context['icon']['title'] : '', '">
-				</dd>
-				<dt>
-					<strong><label for="icon_board_select">', Lang::getTxt('icons_board', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<select name="icon_board" id="icon_board_select">
-						<option value="0"', empty(Utils::$context['icon']['board_id']) ? ' selected' : '', '>', Lang::getTxt('icons_edit_icons_all_boards', file: 'ManageSmileys'), '</option>';
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-						<optgroup label="', $category['name'], '">';
-
-		foreach ($category['boards'] as $board) {
-			echo '
-							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
-		}
-
-		echo '
-						</optgroup>';
-	}
-
-	echo '
-					</select>
-				</dd>
-				<dt>
-					<strong><label for="icon_location">', Lang::getTxt('smileys_location', file: 'ManageSmileys'), '</label></strong>
-				</dt>
-				<dd>
-					<select name="icon_location" id="icon_location">
-						<option value="0"', empty(Utils::$context['icon']['after']) ? ' selected' : '', '>', Lang::getTxt('icons_location_first_icon', file: 'ManageSmileys'), '</option>';
-
-	// Print the list of all the icons it can be put after...
-	foreach (Utils::$context['icons'] as $id => $data) {
-		if (empty(Utils::$context['icon']['id']) || $id != Utils::$context['icon']['id']) {
-			echo '
-						<option value="', $id, '"', !empty(Utils::$context['icon']['after']) && $id == Utils::$context['icon']['after'] ? ' selected' : '', '>', Lang::getTxt('icons_location_after', ['icon' => $data['title']], file: 'ManageSmileys'), '</option>';
-		}
-	}
-
-	echo '
-					</select>
-				</dd>
-			</dl>';
-
-	if (!Utils::$context['new_icon']) {
-		echo '
-			<input type="hidden" name="icon" value="', Utils::$context['icon']['id'], '">';
-	}
-
-	echo '
-			<input type="submit" name="icons_save" value="', Lang::getTxt('smileys_save', file: 'ManageSmileys'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</div><!-- .windowbg -->
-	</form>';
-}
diff --git a/Themes/default/Memberlist.template.php b/Themes/default/Memberlist.template.php
deleted file mode 100644
index 02f1717783c..00000000000
--- a/Themes/default/Memberlist.template.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Displays a sortable listing of all members registered on the forum.
- */
-function template_main()
-{
-	echo '
-	<div class="main_section" id="memberlist">
-		<div class="pagesection">
-			<div class="pagelinks floatleft">', Utils::$context['page_index'], '</div>
-			', template_button_strip(Utils::$context['memberlist_buttons'], 'right'), '
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="floatleft">', Lang::getTxt('members_list', file: 'General'), '</span>
-			</h3>
-		</div>';
-
-	echo '
-		<div id="mlist">
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">';
-
-	// Display each of the column headers of the table.
-	foreach (Utils::$context['columns'] as $key => $column) {
-		// @TODO maybe find something nicer?
-		if ($key == 'email_address' && !Utils::$context['can_send_email']) {
-			continue;
-		}
-
-		// This is a selected column, so underline it or some such.
-		if ($column['selected']) {
-			echo '
-						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
-							<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span></th>';
-		}
-
-		// This is just some column... show the link and be done with it.
-		else {
-		echo '
-						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
-						', $column['link'], '</th>';
-		}
-	}
-
-	echo '
-					</tr>
-				</thead>
-				<tbody>';
-
-	// Assuming there are members loop through each one displaying their data.
-	if (!empty(Utils::$context['members'])) {
-		foreach (Utils::$context['members'] as $member) {
-			echo '
-					<tr class="windowbg">
-						<td class="is_online centertext">
-							', Utils::$context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '', '<span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span>', Utils::$context['can_send_pm'] ? '</a>' : '', '
-						</td>
-						<td class="real_name lefttext">', $member['link'], '</td>';
-
-			if (!isset(Utils::$context['disabled_fields']['website'])) {
-				echo '
-						<td class="website_url centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" rel="noopener"><span class="main_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
-			}
-
-			// Group and date.
-			echo '
-						<td class="id_group centertext">', empty($member['group']) ? $member['post_group'] : $member['group'], '</td>
-						<td class="registered centertext">', $member['registered_date'], '</td>';
-
-			if (!isset(Utils::$context['disabled_fields']['posts'])) {
-				echo '
-						<td class="post_count centertext">';
-
-				if (!empty($member['posts'])) {
-					echo '
-							<div class="generic_bar">
-								<div class="bar" style="width: ', $member['post_percent'], '%;"></div>
-								<span>', $member['posts'], '</span>
-							</div>';
-				}
-
-				echo '
-						</td>';
-			}
-
-			// Show custom fields marked to be shown here
-			if (!empty(Utils::$context['custom_profile_fields']['columns'])) {
-				foreach (Utils::$context['custom_profile_fields']['columns'] as $key => $column) {
-					echo '
-						<td class="', $key, ' centertext">', $member['options'][$key], '</td>';
-				}
-			}
-
-			echo '
-					</tr>';
-		}
-	}
-	// No members?
-	else {
-	echo '
-					<tr>
-						<td colspan="', Utils::$context['colspan'], '" class="windowbg">', Lang::getTxt('search_no_results', file: 'General'), '</td>
-					</tr>';
-	}
-
-	echo '
-				</tbody>
-			</table>
-		</div><!-- #mlist -->';
-
-	// Show the page numbers again. (makes 'em easier to find!)
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks floatleft">', Utils::$context['page_index'], '</div>';
-
-	// If it is displaying the result of a search show a "search again" link to edit their criteria.
-	if (isset(Utils::$context['old_search'])) {
-		echo '
-			<div class="buttonlist floatright">
-				<a class="button" href="', Config::$scripturl, '?action=mlist;sa=search;search=', Utils::$context['old_search_value'], '">', Lang::getTxt('mlist_search_again', file: 'General'), '</a>
-			</div>';
-	}
-	echo '
-		</div>
-	</div><!-- #memberlist -->';
-
-}
-
-/**
- * A page allowing people to search the member list.
- */
-function template_search()
-{
-	// Start the submission form for the search!
-	echo '
-	<form action="', Config::$scripturl, '?action=mlist;sa=search" method="post" accept-charset="UTF-8">
-		<div id="memberlist">
-			<div class="pagesection">
-				', template_button_strip(Utils::$context['memberlist_buttons'], 'right'), '
-			</div>
-			<div class="cat_bar">
-				<h3 class="catbg mlist">
-					<span class="main_icons filter"></span>', Lang::getTxt('mlist_search', file: 'General'), '
-				</h3>
-			</div>
-			<div id="advanced_search" class="roundframe">
-				<dl id="mlist_search" class="settings">
-					<dt>
-						<label for="search"><strong>', Lang::getTxt('search_for', file: 'General'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="search" id="search" value="', Utils::$context['old_search'], '" size="40">
-					</dd>
-					<dt>
-						<label><strong>', Lang::getTxt('mlist_search_filter', file: 'General'), '</strong></label>
-					</dt>
-					<dd>
-						<ul>';
-
-	foreach (Utils::$context['search_fields'] as $id => $title) {
-		echo '
-							<li>
-								<input type="checkbox" name="fields[]" id="fields-', $id, '" value="', $id, '"', in_array($id, Utils::$context['search_defaults']) ? ' checked' : '', '>
-								<label for="fields-', $id, '">', $title, '</label>
-							</li>';
-	}
-
-	echo '
-						</ul>
-					</dd>
-				</dl>
-				<input type="submit" name="submit" value="' . Lang::getTxt('search', file: 'General') . '" class="button floatright">
-			</div><!-- #advanced_search -->
-		</div><!-- #memberlist -->
-	</form>';
-}
diff --git a/Themes/default/MessageIndex.template.php b/Themes/default/MessageIndex.template.php
deleted file mode 100644
index d1dd8e162a1..00000000000
--- a/Themes/default/MessageIndex.template.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * The main messageindex.
- */
-function template_main()
-{
-	echo '<div id="display_head" class="information">
-			<h2 class="display_title">', Utils::$context['name'], '</h2>';
-
-	if (isset(Utils::$context['description']) && Utils::$context['description'] != '') {
-		echo '
-			<p>', Utils::$context['description'], '</p>';
-	}
-
-	if (!empty(Utils::$context['moderators'])) {
-		echo '
-			<p>', Lang::getTxt('moderators_list', ['num' => count(Utils::$context['link_moderators']), 'list' => Lang::sentenceList(Utils::$context['link_moderators'])], file: 'General'), '.</p>';
-	}
-
-	if (!empty(Theme::$current->settings['display_who_viewing'])) {
-		// Show just numbers...?
-		if (Theme::$current->settings['display_who_viewing'] == 1 || empty(Utils::$context['view_members_list'])) {
-			// Count the ones this member is allowed to see. Any hidden ones get
-			// their own mention below, so counting those here as well would say
-			// the same people twice.
-			$list_of_viewers = [
-				Lang::getTxt('number_of_members', [count(Utils::$context['view_members_list'])], file: 'General'),
-			];
-		}
-		// Or show the actual people viewing the topic?
-		else {
-			$list_of_viewers = Utils::$context['view_members_list'];
-		}
-
-		if (!empty(Utils::$context['view_num_hidden']) && !Utils::$context['can_moderate_forum']) {
-			$list_of_viewers[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['view_num_hidden']], file: 'General');
-		}
-
-		// Now show how many guests are here too.
-		if (!empty(Utils::$context['view_num_guests'])) {
-			$list_of_viewers[] = Lang::getTxt('guest_plural', [Utils::$context['view_num_guests']], file: 'General');
-		}
-
-		echo '
-			<p>
-				', Lang::getTxt(
-			'who_viewing_board',
-			[
-				'list_of_viewers' => Lang::sentenceList(array_values($list_of_viewers)),
-				'num_viewing' => count(Utils::$context['view_members_list'] ?? []) + (int) (Utils::$context['view_num_guests'] ?? 0) + (int) (Utils::$context['view_num_hidden'] ?? 0),
-			],
-			file: 'General',
-		), '
-			</p>';
-	}
-
-	echo '
-		</div>';
-
-	if (!empty(Utils::$context['boards']) && (!empty(Theme::$current->options['show_children']) || Utils::$context['start'] == 0)) {
-		echo '
-	<div id="board_', Utils::$context['current_board'], '_childboards" class="boardindex_table main_container">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('sub_boards', file: 'General'), '</h3>
-		</div>';
-
-		template_bi_board_list(Utils::$context['boards']);
-
-		echo '
-	</div><!-- #board_[current_board]_childboards -->';
-	}
-
-	// Let them know why their message became unapproved.
-	if (Utils::$context['becomesUnapproved']) {
-		echo '
-	<div class="noticebox">
-		', Lang::getTxt('post_becomes_unapproved', file: 'General'), '
-	</div>';
-	}
-
-	// If this person can approve items and we have some awaiting approval tell them.
-	if (!empty(Utils::$context['unapproved_posts_message'])) {
-		echo '
-	<div class="noticebox">
-		', Utils::$context['unapproved_posts_message'], '
-	</div>';
-	}
-
-	if (!Utils::$context['no_topic_listing']) {
-		echo '
-	<div class="pagesection">
-		', Utils::$context['menu_separator'], '
-		<div class="pagelinks floatleft">
-			<a href="#bot" class="button">', Lang::getTxt('go_down', file: 'General'), '</a>
-			', Utils::$context['page_index'], '
-		</div>
-		', template_button_strip(Utils::$context['normal_buttons'], 'right');
-
-		// Mobile action buttons (top)
-		if (!empty(Utils::$context['normal_buttons'])) {
-			echo '
-		<div class="mobile_buttons floatright">
-			<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-		</div>';
-		}
-
-		echo '
-	</div>';
-
-		// If Quick Moderation is enabled start the form.
-		if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] > 0 && !empty(Utils::$context['topics'])) {
-			echo '
-	<form action="', Config::$scripturl, '?action=quickmod;board=', Utils::$context['current_board'], '.', Utils::$context['start'], '" method="post" accept-charset="UTF-8" class="clear" name="quickModForm" id="quickModForm">';
-		}
-
-		echo '
-		<div id="messageindex">';
-
-		echo '
-			<div class="title_bar" id="topic_header">';
-
-		// Are there actually any topics to show?
-		if (!empty(Utils::$context['topics'])) {
-			echo '
-				<div class="board_icon"></div>
-				<div class="info">', Utils::$context['topics_headers']['subject'], ' / ', Utils::$context['topics_headers']['starter'], '</div>
-				<div class="board_stats centertext">', Utils::$context['topics_headers']['replies'], ' / ', Utils::$context['topics_headers']['views'], '</div>
-				<div class="lastpost">', Utils::$context['topics_headers']['last_post'], '</div>';
-
-			// Show a "select all" box for quick moderation?
-			if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-				echo '
-				<div class="moderation">
-					<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
-				</div>';
-			}
-
-			// If it's on in "image" mode, don't show anything but the column.
-			elseif (!empty(Utils::$context['can_quick_mod'])) {
-				echo '
-				<div class="moderation"></div>';
-			}
-		}
-
-		// No topics... just say, "sorry bub".
-		else {
-		echo '
-				<h3 class="titlebg">', Lang::getTxt('topic_alert_none', file: 'General'), '</h3>';
-		}
-
-		echo '
-			</div><!-- #topic_header -->';
-
-		// Contain the topic list
-		echo '
-			<div id="topic_container">';
-
-		foreach (Utils::$context['topics'] as $topic) {
-			echo '
-				<div class="', $topic['css_class'], '">
-					<div class="board_icon">
-						<img src="', $topic['first_post']['icon_url'], '" alt="">
-						', $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '', '
-					</div>
-					<div class="info', !empty(Utils::$context['can_quick_mod']) ? '' : ' info_block', '">
-						<div', !empty($topic['quick_mod']['modify']) ? ' data-msg-id="' . $topic['first_post']['id'] . '"' : '', '>';
-
-			// Now we handle the icons
-			echo '
-							<div id="icons', $topic['first_post']['id'], '" class="icons floatright">';
-
-			if ($topic['is_watched']) {
-				echo '
-								<span class="main_icons watch" title="', Lang::getTxt('watching_this_topic', file: 'General'), '"></span>';
-			}
-
-			if ($topic['is_locked']) {
-				echo '
-								<span class="main_icons lock"></span>';
-			}
-
-			if ($topic['is_sticky']) {
-				echo '
-								<span class="main_icons sticky"></span>';
-			}
-
-			if ($topic['is_redirect']) {
-				echo '
-								<span class="main_icons move"></span>';
-			}
-
-			if ($topic['is_poll']) {
-				echo '
-								<span class="main_icons poll"></span>';
-			}
-
-			echo '
-							</div>';
-
-			echo '
-							<div class="message_index_title">
-								', $topic['new'] && !User::$me->is_guest ? '<a href="' . $topic['new_href'] . '" id="newicon' . $topic['first_post']['id'] . '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a>' : '', '
-								<span class="preview', $topic['is_sticky'] ? ' bold_text' : '', '" title="', $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '">
-									<span id="msg', $topic['first_post']['id'], '">', $topic['first_post']['link'], (!$topic['approved'] ? '&nbsp;<em>(' . Lang::getTxt('awaiting_approval', file: 'General') . ')</em>' : ''), '</span>
-								</span>
-							</div>
-							<p class="floatleft">
-								', Lang::getTxt('started_by_member', ['member' => $topic['first_post']['member']['link']], file: 'General'), '
-							</p>
-							', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '', '
-						</div><!-- #topic_[first_post][id] -->
-					</div><!-- .info -->
-					<div class="board_stats centertext">
-						<p>', Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General'), '<br>', Lang::getTxt('number_of_views', [$topic['views']], file: 'General'), '</p>
-					</div>
-					<div class="lastpost">
-						<p>', Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General'), '</p>
-					</div>';
-
-			// Show the quick moderation options?
-			if (!empty(Utils::$context['can_quick_mod'])) {
-				echo '
-					<div class="moderation">';
-
-				if (Theme::$current->options['display_quick_mod'] == 1) {
-					echo '
-						<input type="checkbox" name="topics[]" value="', $topic['id'], '">';
-				} else {
-					// Check permissions on each and show only the ones they are allowed to use.
-					if ($topic['quick_mod']['remove']) {
-						echo '<a href="', Config::$scripturl, '?action=quickmod;board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';actions%5B', $topic['id'], '%5D=remove;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="you_sure"><span class="main_icons delete" title="', Lang::getTxt('remove_topic', file: 'General'), '"></span></a>';
-					}
-
-					if ($topic['quick_mod']['lock']) {
-						echo '<a href="', Config::$scripturl, '?action=quickmod;board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';actions%5B', $topic['id'], '%5D=lock;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="you_sure"><span class="main_icons lock" title="', Lang::getTxt($topic['is_locked'] ? 'set_unlock' : 'set_lock', file: 'General'), '"></span></a>';
-					}
-
-					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
-						echo '<br>';
-					}
-
-					if ($topic['quick_mod']['sticky']) {
-						echo '<a href="', Config::$scripturl, '?action=quickmod;board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="you_sure"><span class="main_icons sticky" title="', Lang::getTxt($topic['is_sticky'] ? 'set_nonsticky' : 'set_sticky', file: 'General'), '"></span></a>';
-					}
-
-					if ($topic['quick_mod']['move']) {
-						echo '<a href="', Config::$scripturl, '?action=movetopic;current_board=', Utils::$context['current_board'], ';board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';topic=', $topic['id'], '.0"><span class="main_icons move" title="', Lang::getTxt('move_topic', file: 'General'), '"></span></a>';
-					}
-				}
-				echo '
-					</div><!-- .moderation -->';
-			}
-			echo '
-				</div><!-- $topic[css_class] -->';
-		}
-		echo '
-			</div><!-- #topic_container -->';
-
-		if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && !empty(Utils::$context['topics'])) {
-			echo '
-			<div class="righttext" id="quick_actions">
-				<select class="qaction" name="qaction"', Utils::$context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
-					<option value="">--------</option>';
-
-			foreach (Utils::$context['qmod_actions'] as $qmod_action) {
-				if (Utils::$context['can_' . $qmod_action]) {
-					echo '
-					<option value="' . $qmod_action . '">' . Lang::getTxt('quick_mod_' . $qmod_action, file: 'General') . '</option>';
-				}
-			}
-
-			echo '
-				</select>';
-
-			// Show a list of boards they can move the topic to.
-			if (Utils::$context['can_move']) {
-				echo '
-				<span id="quick_mod_jump_to"></span>';
-			}
-
-			echo '
-				<input type="submit" value="', Lang::getTxt('quick_mod_go', file: 'General'), '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', Lang::getTxt('quickmod_confirm', file: 'General'), '\');" class="button qaction">
-			</div><!-- #quick_actions -->';
-		}
-
-		echo '
-		</div><!-- #messageindex -->';
-
-		// Finish off the form - again.
-		if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] > 0 && !empty(Utils::$context['topics'])) {
-			echo '
-		<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-	</form>';
-		}
-
-		echo '
-	<div class="pagesection">
-		', Utils::$context['menu_separator'], '
-		<div class="pagelinks floatleft">
-			<a href="#main_content_section" class="button" id="bot">', Lang::getTxt('go_up', file: 'General'), '</a>
-			', Utils::$context['page_index'], '
-		</div>
-		', template_button_strip(Utils::$context['normal_buttons'], 'right');
-
-		// Mobile action buttons (bottom)
-		if (!empty(Utils::$context['normal_buttons'])) {
-			echo '
-			<div class="mobile_buttons floatright">
-				<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-			</div>';
-		}
-
-		echo '
-	</div>';
-	}
-
-	// Show breadcrumbs at the bottom too.
-	theme_linktree();
-
-		echo '
-	<script>
-		window.addEventListener("DOMContentLoaded", function() {';
-
-	if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && !empty(Utils::$context['topics']) && Utils::$context['can_move']) {
-		echo '
-			new JumpTo({
-				sContainerId: "quick_mod_jump_to",
-				sClassName: "qaction",
-				sJumpToTemplate: "%dropdown_list%",
-				iCurBoardId: ', Utils::$context['current_board'], ',
-				iCurBoardChildLevel: ', Utils::$context['jump_to']['child_level'], ',
-				sCurBoardName: "', Utils::$context['jump_to']['board_name'], '",
-				sBoardChildLevelIndicator: "==",
-				sBoardPrefix: "=> ",
-				sCatSeparator: "-----------------------------",
-				sCatPrefix: "",
-				bNoRedirect: true,
-				bDisabled: true,
-				sCustomName: "move_to"
-			});';
-	}
-
-	// Javascript for inline editing.
-	echo '
-			new QuickModifyTopic({
-				aHidePrefixes: ["icons", "msg", "pages", "newicon"],
-				sTopicContainer: "topic_container",
-			});
-		});
-	</script>';
-
-	template_topic_legend();
-
-	// Lets pop the...
-	echo '
-	<div id="mobile_action" class="popup_container">
-		<div class="popup_window description">
-			<div class="popup_heading">', Lang::getTxt('mobile_action', file: 'General'), '
-				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-			</div>
-			', template_button_strip(Utils::$context['normal_buttons']), '
-		</div>
-	</div>';
-}
-
-/**
- * Shows a legend for topic icons.
- */
-function template_topic_legend()
-{
-	echo '
-	<div class="tborder" id="topic_icons">
-		<div class="information">
-			<p id="message_index_jump_to"></p>';
-
-	if (empty(Utils::$context['no_topic_listing'])) {
-		echo '
-			<p class="floatleft">', !empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest ? '
-				<span class="main_icons profile_sm"></span> ' . Lang::getTxt('participation_caption', file: 'General') . '<br>' : '', '
-				' . (Config::$modSettings['pollMode'] == '1' ? '<span class="main_icons poll"></span> ' . Lang::getTxt('poll', file: 'General') . '<br>' : '') . '
-				<span class="main_icons move"></span> ' . Lang::getTxt('moved_topic', file: 'General') . '<br>
-			</p>
-			<p>
-				<span class="main_icons lock"></span> ' . Lang::getTxt('locked_topic', file: 'General') . '<br>
-				<span class="main_icons sticky"></span> ' . Lang::getTxt('sticky_topic', file: 'General') . '<br>
-				<span class="main_icons watch"></span> ' . Lang::getTxt('watching_topic', file: 'General') . '<br>
-			</p>';
-	}
-
-	if (!empty(Utils::$context['jump_to'])) {
-		echo '
-			<script>
-				window.addEventListener("DOMContentLoaded", function() {
-					new JumpTo({
-						sContainerId: "message_index_jump_to",
-						sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">', Utils::$context['jump_to']['label'], '<" + "/label> %dropdown_list%",
-						iCurBoardId: ', Utils::$context['current_board'], ',
-						iCurBoardChildLevel: ', Utils::$context['jump_to']['child_level'], ',
-						sCurBoardName: "', Utils::$context['jump_to']['board_name'], '",
-						sBoardChildLevelIndicator: "==",
-						sBoardPrefix: "=> ",
-						sCatSeparator: "-----------------------------",
-						sCatPrefix: "",
-						sGoButtonLabel: "', Lang::getTxt('quick_mod_go', file: 'General'), '"
-					});
-				});
-			</script>';
-	}
-
-	echo '
-		</div><!-- .information -->
-	</div><!-- #topic_icons -->';
-}
diff --git a/Themes/default/ModerationCenter.template.php b/Themes/default/ModerationCenter.template.php
deleted file mode 100644
index 53699f57ab9..00000000000
--- a/Themes/default/ModerationCenter.template.php
+++ /dev/null
@@ -1,679 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * The main moderation center.
- */
-function template_moderation_center()
-{
-	// Show moderators notes.
-	template_notes();
-
-	// Show a welcome message to the user.
-	echo '
-	<div id="modcenter">';
-
-	// Show all the blocks they want to see.
-	foreach (Utils::$context['mod_blocks'] as $block) {
-		$block_function = 'template_' . $block;
-
-		echo '
-		<div class="half_content">', function_exists($block_function) ? $block_function() : '', '</div>';
-	}
-
-	echo '
-	</div><!-- #modcenter -->';
-}
-
-/**
- * Show all the group requests the user can see.
- */
-function template_group_requests_block()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=groups;sa=requests" id="group_requests_link">', Lang::getTxt('mc_group_requests', file: 'ModerationCenter'), '</a>
-			</h3>
-			<span id="group_requests_toggle" class="', !empty(Utils::$context['admin_prefs']['mcgr']) ? 'toggle_down' : 'toggle_up', '" title="', Lang::getTxt(empty(Utils::$context['admin_prefs']['mcgr']) ? 'hide' : 'show', file: 'General'), '" style="display: none;"></span>
-		</div>
-		<div class="windowbg" id="group_requests_panel">
-			<ul>';
-
-	foreach (Utils::$context['group_requests'] as $request) {
-		echo '
-				<li class="smalltext">
-					', Lang::getTxt('mc_groupr_by', ['group_link' => '<a href="' . $request['request_href'] . '">' . $request['group']['name'] . '</a>', 'member_link' => $request['member']['link']], file: 'ModerationCenter') ,'
-				</li>';
-	}
-
-	// Don't have any watched users right now?
-	if (empty(Utils::$context['group_requests'])) {
-		echo '
-				<li>
-					<strong class="smalltext">', Lang::getTxt('mc_group_requests_none', file: 'ModerationCenter'), '</strong>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- #group_requests_panel -->
-
-		<script>
-			var oGroupRequestsPanelToggle = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: ', !empty(Utils::$context['admin_prefs']['mcgr']) ? 'true' : 'false', ',
-				aSwappableContainers: [
-					\'group_requests_panel\'
-				],
-				aSwapImages: [
-					{
-						sId: \'group_requests_toggle\',
-						altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-						altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'group_requests_link\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('mc_group_requests', file: 'ModerationCenter')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('mc_group_requests', file: 'ModerationCenter')), '
-					}
-				],
-				oThemeOptions: {
-					bUseThemeSettings: true,
-					sOptionName: \'admin_preferences\',
-					sSessionVar: smf_session_var,
-					sSessionId: smf_session_id,
-					sThemeId: \'1\',
-					sAdditionalVars: \';admin_key=mcgr\'
-				}
-			});
-		</script>';
-}
-
-/**
- * A list of watched users
- */
-function template_watched_users()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=moderate;area=userwatch" id="watched_users_link">', Lang::getTxt('mc_watched_users', file: 'ModerationCenter'), '</a>
-			</h3>
-			<span id="watched_users_toggle" class="', !empty(Utils::$context['admin_prefs']['mcwu']) ? 'toggle_down' : 'toggle_up', '" title="', Lang::getTxt(empty(Utils::$context['admin_prefs']['mcwu']) ? 'hide' : 'show', file: 'General'), '" style="display: none;"></span>
-		</div>
-		<div class="windowbg" id="watched_users_panel">
-			<ul>';
-
-	foreach (Utils::$context['watched_users'] as $user) {
-		echo '
-				<li>
-					<span class="smalltext">', Lang::getTxt(!empty($user['last_login']) ? 'mc_seen' : 'mc_seen_never', $user, file: 'ModerationCenter'), '</span>
-				</li>';
-	}
-
-	// Don't have any watched users right now?
-	if (empty(Utils::$context['watched_users'])) {
-		echo '
-				<li>
-					<strong class="smalltext">', Lang::getTxt('mc_watched_users_none', file: 'ModerationCenter'), '</strong>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- #watched_users_panel -->
-
-		<script>
-			var oWatchedUsersToggle = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: ', !empty(Utils::$context['admin_prefs']['mcwu']) ? 'true' : 'false', ',
-				aSwappableContainers: [
-					\'watched_users_panel\'
-				],
-				aSwapImages: [
-					{
-						sId: \'watched_users_toggle\',
-						altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-						altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'watched_users_link\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('mc_watched_users', file: 'ModerationCenter')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('mc_watched_users', file: 'ModerationCenter')), '
-					}
-				],
-				oThemeOptions: {
-					bUseThemeSettings: true,
-					sOptionName: \'admin_preferences\',
-					sSessionVar: smf_session_var,
-					sSessionId: smf_session_id,
-					sThemeId: \'1\',
-					sAdditionalVars: \';admin_key=mcwu\'
-				}
-			});
-		</script>';
-}
-
-/**
- * A list of reported posts
- */
-function template_reported_posts_block()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=moderate;area=reportedposts" id="reported_posts_link">', Lang::getTxt('mc_recent_reports', file: 'ModerationCenter'), '</a>
-			</h3>
-			<span id="reported_posts_toggle" class="', !empty(Utils::$context['admin_prefs']['mcrp']) ? 'toggle_down' : 'toggle_up', '" title="', Lang::getTxt(empty(Utils::$context['admin_prefs']['mcrp']) ? 'hide' : 'show', file: 'General'), '" style="display: none;"></span>
-		</div>
-		<div class="windowbg" id="reported_posts_panel">
-			<ul>';
-
-	foreach (Utils::$context['reported_posts'] as $post) {
-		echo '
-				<li>
-					<span class="smalltext">', Lang::getTxt('mc_post_report', ['report_link' => $post['report_link'], 'author_link' => $post['author']['link']], file: 'ModerationCenter'), '</span>
-				</li>';
-	}
-
-	// Don't have any watched users right now?
-	if (empty(Utils::$context['reported_posts'])) {
-		echo '
-				<li>
-					<strong class="smalltext">', Lang::getTxt('mc_recent_reports_none', file: 'ModerationCenter'), '</strong>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- #reported_posts_panel -->
-
-		<script>
-			var oReportedPostsToggle = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: ', !empty(Utils::$context['admin_prefs']['mcrp']) ? 'true' : 'false', ',
-				aSwappableContainers: [
-					\'reported_posts_panel\'
-				],
-				aSwapImages: [
-					{
-						sId: \'reported_posts_toggle\',
-						altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-						altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'reported_posts_link\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('mc_recent_reports', file: 'ModerationCenter')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('mc_recent_reports', file: 'ModerationCenter')), '
-					}
-				],
-				oThemeOptions: {
-					bUseThemeSettings: true,
-					sOptionName: \'admin_preferences\',
-					sSessionVar: smf_session_var,
-					sSessionId: smf_session_id,
-					sThemeId: \'1\',
-					sAdditionalVars: \';admin_key=mcrp\'
-				}
-			});
-		</script>';
-}
-
-/**
- * A list of reported users
- */
-function template_reported_users_block()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=moderate;area=reportedmembers" id="reported_users_link">', Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter'), '</a>
-			</h3>
-			<span id="reported_users_toggle" class="', !empty(Utils::$context['admin_prefs']['mcur']) ? 'toggle_down' : 'toggle_up', '" title="', Lang::getTxt(empty(Utils::$context['admin_prefs']['mcur']) ? 'hide' : 'show', file: 'General'), '" style="display: none;"></span>
-		</div>
-		<div class="windowbg" id="reported_users_panel">
-			<ul>';
-
-	foreach (Utils::$context['reported_users'] as $user) {
-		echo '
-				<li>
-					<span class="smalltext">', $user['user']['link'], '</span>
-				</li>';
-	}
-
-	// Don't have any watched users right now?
-	if (empty(Utils::$context['reported_users'])) {
-		echo '
-				<li>
-					<strong class="smalltext">', Lang::getTxt('mc_reported_users_none', file: 'ModerationCenter'), '</strong>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- #reported_users_panel -->
-
-		<script>
-			var oReportedUsersToggle = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: ', !empty(Utils::$context['admin_prefs']['mcur']) ? 'true' : 'false', ',
-				aSwappableContainers: [
-					\'reported_users_panel\'
-				],
-				aSwapImages: [
-					{
-						sId: \'reported_users_toggle\',
-						altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-						altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'reported_users_link\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter')), '
-					}
-				],
-				oThemeOptions: {
-					bUseThemeSettings: true,
-					sOptionName: \'admin_preferences\',
-					sSessionVar: smf_session_var,
-					sSessionId: smf_session_id,
-					sThemeId: \'1\',
-					sAdditionalVars: \';admin_key=mcur\'
-				}
-			});
-		</script>';
-}
-
-/**
- * Little section for making... notes.
- */
-function template_notes()
-{
-	// Let them know the action was a success.
-	if (!empty(Utils::$context['report_post_action'])) {
-		echo '
-		<div class="infobox">
-			', Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter'), '
-		</div>';
-	}
-
-	echo '
-		<div id="modnotes">
-			<form action="', Config::$scripturl, '?action=moderate;area=index;modnote" method="post">
-				<div class="cat_bar">
-					<h3 class="catbg">', Lang::getTxt('mc_notes', file: 'ModerationCenter'), '</h3>
-				</div>
-				<div class="windowbg">';
-
-	if (!empty(Utils::$context['notes'])) {
-		echo '
-					<ul class="moderation_notes">';
-
-		// Cycle through the notes.
-		foreach (Utils::$context['notes'] as $note) {
-			echo '
-						<li class="smalltext">
-							', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . Utils::$context['mod-modnote-del_token_var'] . '=' . Utils::$context['mod-modnote-del_token'] . '" data-confirm="' . Lang::getTxt('mc_reportedp_delete_confirm', file: 'ModerationCenter') . '" class="you_sure"><span class="main_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', Utils::adjustHeadingLevels($note['text'], 4), '
-						</li>';
-		}
-
-		echo '
-					</ul>
-					<div class="pagesection notes">
-						<div class="pagelinks">', Utils::$context['page_index'], '</div>
-					</div>';
-	}
-
-	echo '
-					<div class="floatleft post_note">
-						<input type="text" name="new_note" placeholder="', Lang::getTxt('mc_click_add_note', file: 'ModerationCenter'), '">
-					</div>
-					<input type="hidden" name="', Utils::$context['mod-modnote-add_token_var'], '" value="', Utils::$context['mod-modnote-add_token'], '">
-					<input type="submit" name="makenote" value="', Lang::getTxt('mc_add_note', file: 'ModerationCenter'), '" class="button">
-				</div><!-- .windowbg -->
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>
-		</div><!-- #modnotes -->';
-}
-
-/**
- * Show a list of all the unapproved posts
- */
-function template_unapproved_posts()
-{
-	// Just a big table of it all really...
-	echo '
-	<div id="modcenter">
-		<form action="', Config::$scripturl, '?action=moderate;area=postmod;start=', Utils::$context['start'], ';sa=', Utils::$context['current_view'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar', !empty(Utils::$context['unapproved_items']) ? ' cat_bar_round' : '', '">
-				<h3 class="catbg">', Lang::getTxt('mc_unapproved_posts', file: 'ModerationCenter'), '</h3>
-			</div>';
-
-	// No posts?
-	if (empty(Utils::$context['unapproved_items'])) {
-		echo '
-			<div class="windowbg">
-				<p class="centertext">
-					', Lang::getTxt('mc_unapproved_' . Utils::$context['current_view'] . '_none_found', file: 'ModerationCenter'), '
-				</p>
-			</div>';
-	} else {
-		echo '
-			<div class="pagesection">
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>';
-
-		if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-			echo '
-				<ul class="buttonlist floatright">
-					<li class="inline_mod_check">
-						<input type="checkbox" onclick="invertAll(this, this.form, \'item[]\');" checked>
-					</li>
-				</ul>';
-		}
-
-		echo '
-			</div>';
-
-	}
-
-	foreach (Utils::$context['unapproved_items'] as $item) {
-		// The buttons
-		$quickbuttons = [
-			'approve' => [
-				'label' => Lang::getTxt('approve', file: 'General'),
-				'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';approve=' . $item['id'],
-				'icon' => 'approve',
-			],
-			'delete' => [
-				'label' => Lang::getTxt('remove', file: 'General'),
-				'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';delete=' . $item['id'],
-				'icon' => 'remove_button',
-				'show' => $item['can_delete'],
-			],
-			'quickmod' => [
-				'class' => 'inline_mod_check',
-				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
-				'show' => !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1,
-			],
-		];
-		echo '
-			<div class="windowbg clear">
-				<div class="page_number floatright"> #', $item['counter'], '</div>
-				<div class="topic_details">
-					<h5>
-						<strong>', $item['category']['link'], ' / ', $item['board']['link'], ' / ', $item['link'], '</strong>
-					</h5>
-					<span class="smalltext">', str_replace('<br>', ' ', Lang::getTxt('last_post_topic', ['post_link' => $item['time'], 'member_link' => '<strong>' . $item['poster']['link'] . '</strong>'], file: 'General')), '</span>
-				</div>
-				<div class="list_posts">
-					<div class="post">', Utils::adjustHeadingLevels($item['body'], 5), '</div>
-				</div>
-				', template_quickbuttons($quickbuttons, 'unapproved_posts'), '
-			</div><!-- .windowbg -->';
-	}
-
-	echo '
-			<div class="pagesection">';
-
-	if (!empty(Utils::$context['unapproved_items'])) {
-		echo '
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>';
-	}
-
-	if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-		echo '
-				<div class="floatright">
-					<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'', Lang::getTxt('mc_unapproved_sure', file: 'ModerationCenter'), '\')) submit();">
-						<option value="0">', Lang::getTxt('with_selected', file: 'ModerationCenter'), ':</option>
-						<option value="0" disabled>-------------------</option>
-						<option value="approve">&nbsp;--&nbsp;', Lang::getTxt('approve', file: 'General'), '</option>
-						<option value="delete">&nbsp;--&nbsp;', Lang::getTxt('delete', file: 'General'), '</option>
-					</select>
-					<noscript>
-						<input type="submit" name="mc_go" value="', Lang::getTxt('go', file: 'General'), '" class="button">
-					</noscript>
-				</div>';
-	}
-
-	echo '
-			</div><!-- .pagesection -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>
-	</div><!-- #modcenter -->';
-}
-
-/**
- * Callback function for showing a watched users post in the table.
- *
- * @param array $post An array of data about the post.
- * @return string An array of HTML for showing the post info.
- */
-function template_user_watch_post_callback($post)
-{
-	// We'll have a delete and a checkbox please bob.
-	// @todo Discuss this with the team and rewrite if required.
-	$quickbuttons = [
-		'delete' => [
-			'label' => Lang::getTxt('remove_message', file: 'General'),
-			'href' => Config::$scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-			'javascript' => 'data-confirm="' . Lang::getTxt('mc_watched_users_delete_post', file: 'ModerationCenter') . '"',
-			'class' => 'you_sure',
-			'icon' => 'remove_button',
-			'show' => $post['can_delete'],
-		],
-		'quickmod' => [
-			'class' => 'inline_mod_check',
-			'content' => '<input type="checkbox" name="delete[]" value="' . $post['id'] . '">',
-			'show' => $post['can_delete'],
-		],
-	];
-
-	$output_html = '
-					<div>
-						<div class="floatleft">
-							' . Lang::getTxt('mc_post_report', ['report_link' => '<a href="' . Config::$scripturl . '?topic=' . $post['id_topic'] . '.' . $post['id'] . '#msg' . $post['id'] . '">' . $post['subject'] . '</a>', 'author_link' => $post['author_link']], file: 'ModerationCenter') . '
-						</div>
-					</div>
-					<br>
-					<div class="smalltext">
-						' . Lang::getTxt('mc_watched_users_posted', ['time' => $post['poster_time']], file: 'ModerationCenter') . '
-					</div>
-					<div class="list_posts">
-						' . $post['body'] . '
-					</div>';
-
-	$output_html .= template_quickbuttons($quickbuttons, 'user_watch_post', 'return');
-
-	return $output_html;
-}
-
-/**
- * The moderation settings page.
- */
-function template_moderation_settings()
-{
-	echo '
-	<div id="modcenter">';
-
-	echo '
-		<div class="windowbg">
-			<div class="centertext">', Lang::getTxt('mc_no_settings', file: 'ModerationCenter'), '</div>
-		</div>';
-
-	echo '
-	</div><!-- #modcenter -->';
-}
-
-/**
- * Show a notice sent to a user.
- */
-function template_show_notice()
-{
-	// We do all the HTML for this one!
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Utils::$context['page_title'], '</title>
-		', Theme::template_css(), '
-	</head>
-	<body>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('show_notice', file: 'ModerationCenter'), '</h3>
-		</div>
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('show_notice_subject', ['subject' => Utils::$context['notice_subject']], file: 'ModerationCenter'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl>
-				<dt>
-					<strong>', Lang::getTxt('show_notice_text', file: 'ModerationCenter'), '</strong>
-				</dt>
-				<dd>
-					', Utils::adjustHeadingLevels(Utils::$context['notice_body'], 3), '
-				</dd>
-			</dl>
-		</div>
-	</body>
-</html>';
-
-}
-
-/**
- * Add or edit a warning template.
- */
-function template_warn_template()
-{
-	echo '
-	<div id="modcenter">
-		<form action="', Config::$scripturl, '?action=moderate;area=warnings;sa=templateedit;tid=', Utils::$context['id_template'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="information">
-				', Lang::getTxt('mc_warning_template_desc', file: 'ModerationCenter'), '
-			</div>
-			<div class="windowbg">
-				<div class="errorbox"', empty(Utils::$context['warning_errors']) ? ' style="display: none"' : '', ' id="errors">
-					<dl>
-						<dt>
-							<strong id="error_serious">', Lang::getTxt('error_while_submitting', file: 'General'), '</strong>
-						</dt>
-						<dd class="error" id="error_list">
-							', empty(Utils::$context['warning_errors']) ? '' : implode('<br>', Utils::$context['warning_errors']), '
-						</dd>
-					</dl>
-				</div>
-				<div id="box_preview"', !empty(Utils::$context['template_preview']) ? '' : ' style="display:none"', '>
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('preview', file: 'General'), '</strong>
-						</dt>
-						<dd id="template_preview">
-							', !empty(Utils::$context['template_preview']) ? Utils::$context['template_preview'] : '', '
-						</dd>
-					</dl>
-				</div>
-				<dl class="settings">
-					<dt>
-						<strong><label for="template_title">', Lang::getTxt('mc_warning_template_title', file: 'ModerationCenter'), '</label></strong>
-					</dt>
-					<dd>
-						<input type="text" id="template_title" name="template_title" value="', Utils::$context['template_data']['title'], '" size="30">
-					</dd>
-					<dt>
-						<strong><label for="template_body">', Lang::getTxt('profile_warning_notify_body', file: 'Profile'), '</label></strong><br>
-						<span class="smalltext">', Lang::getTxt('mc_warning_template_body_desc', file: 'ModerationCenter'), '</span>
-					</dt>
-					<dd>
-						<textarea id="template_body" name="template_body" rows="10" cols="45" class="smalltext">', Utils::$context['template_data']['body'], '</textarea>
-					</dd>
-				</dl>';
-
-	if (Utils::$context['template_data']['can_edit_personal']) {
-		echo '
-				<input type="checkbox" name="make_personal" id="make_personal"', Utils::$context['template_data']['personal'] ? ' checked' : '', '>
-					<label for="make_personal">
-						<strong>', Lang::getTxt('mc_warning_template_personal', file: 'ModerationCenter'), '</strong>
-					</label>
-					<p class="smalltext">', Lang::getTxt('mc_warning_template_personal_desc', file: 'ModerationCenter'), '</p>';
-	}
-
-	echo '
-				<input type="submit" name="preview" id="preview_button" value="', Lang::getTxt('preview', file: 'General'), '" class="button">
-				<input type="submit" name="save" value="', Utils::$context['page_title'], '" class="button">
-			</div><!-- .windowbg -->
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['mod-wt_token_var'], '" value="', Utils::$context['mod-wt_token'], '">
-		</form>
-	</div><!-- #modcenter -->
-
-	<script>
-		$(document).ready(function() {
-			$("#preview_button").click(function() {
-				return ajax_getTemplatePreview();
-			});
-		});
-
-		function ajax_getTemplatePreview ()
-		{
-			$.ajax({
-				type: "POST",
-				headers: {
-					"X-SMF-AJAX": 1
-				},
-				xhrFields: {
-					withCredentials: typeof allow_xhjr_credentials !== "undefined" ? allow_xhjr_credentials : false
-				},
-				url: "' . Config::$scripturl . '?action=xmlhttp;sa=previews;xml",
-				data: {item: "warning_preview", title: $("#template_title").val(), body: $("#template_body").val(), user: $(\'input[name="u"]\').attr("value")},
-				context: document.body,
-				success: function(request){
-					$("#box_preview").css({display:""});
-					$("#template_preview").html($(request).find(\'body\').text());
-					if ($(request).find("error").text() != \'\')
-					{
-						$("#errors").css({display:""});
-						var errors_html = \'\';
-						var errors = $(request).find(\'error\').each(function() {
-							errors_html += $(this).text() + \'<br>\';
-						});
-
-						$(document).find("#error_list").html(errors_html);
-					}
-					else
-					{
-						$("#errors").css({display:"none"});
-						$("#error_list").html(\'\');
-					}
-				return false;
-				},
-			});
-			return false;
-		}
-	</script>';
-}
diff --git a/Themes/default/MoveTopic.template.php b/Themes/default/MoveTopic.template.php
deleted file mode 100644
index 916b0b18f44..00000000000
--- a/Themes/default/MoveTopic.template.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Show an interface for selecting which board to move a post to.
- */
-function template_move()
-{
-	echo '
-	<div id="move_topic" class="lower_padding">
-		<form action="', Config::$scripturl, '?action=movetopic2;current_board=' . Utils::$context['current_board'] . ';topic=', Utils::$context['current_topic'], '.0" method="post" accept-charset="UTF-8" onsubmit="submitonce(this);">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('move_topic', file: 'General'), '</h3>
-			</div>
-			<div class="windowbg centertext">
-				<div class="move_topic">
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('move_to', file: 'General'), '</strong>
-						</dt>
-						<dd>
-							<select name="toboard">';
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-								<optgroup label="', $category['name'], '">';
-
-		foreach ($category['boards'] as $board) {
-			echo '
-									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == Utils::$context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
-		}
-		echo '
-								</optgroup>';
-	}
-
-	echo '
-							</select>
-						</dd>';
-
-	// Disable the reason textarea when the postRedirect checkbox is unchecked...
-	echo '
-					</dl>
-					<label for="reset_subject">
-						<input type="checkbox" name="reset_subject" id="reset_subject" onclick="document.getElementById(\'subjectArea\').classList.toggle(\'hidden\');"> ', Lang::getTxt('movetopic_change_subject', file: 'General'), '
-					</label><br>
-					<fieldset id="subjectArea" class="hidden">
-						<dl class="settings">
-							<dt><strong>', Lang::getTxt('movetopic_new_subject', file: 'General'), '</strong></dt>
-							<dd><input type="text" name="custom_subject" size="30" value="', Utils::$context['subject'], '"></dd>
-						</dl>
-						<label for="enforce_subject"><input type="checkbox" name="enforce_subject" id="enforce_subject"> ', Lang::getTxt('movetopic_change_all_subjects', file: 'General'), '</label>
-					</fieldset>';
-
-	// Stick our "create a redirection topic" template in here...
-	template_redirect_options('move');
-
-	echo '
-					<input type="submit" value="', Lang::getTxt('move_topic', file: 'General'), '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
-				</div><!-- .move_topic -->
-			</div><!-- .windowbg -->';
-
-	if (Utils::$context['back_to_topic']) {
-		echo '
-			<input type="hidden" name="goback" value="1">';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="seqnum" value="', Utils::$context['form_sequence_number'], '">
-		</form>
-	</div><!-- #move_topic -->';
-}
-
-/**
- * Redirection topic options
- *
- * @param string $type What type of topic this is for - currently 'merge' or 'move'. Used to display appropriate text strings...
- */
-function template_redirect_options($type)
-{
-	echo '
-					<label for="postRedirect" class="block">
-						<input type="checkbox" name="postRedirect" id="postRedirect"', Utils::$context['is_approved'] ? ' checked' : '', ' onclick="', Utils::$context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . Lang::getTxt($type . '_topic_unapproved_js', file: 'General') . '\')) return false; ', 'document.getElementById(\'reasonArea\').classList.toggle(\'hidden\');"> ', Lang::getTxt('post_redirection', file: 'General'), '
-					</label>
-					<fieldset id="reasonArea"', Utils::$context['is_approved'] ? '' : 'class="hidden"', '>
-						<dl class="settings">
-							<dt>
-								', Lang::getTxt($type . '_why', file: 'General'), '
-							</dt>
-							<dd>
-								<textarea name="reason">', Lang::getTxt($type . 'topic_default', ['board_link' => Lang::getTxt('movetopic_auto_board', file: 'General'), 'topic_link' => Lang::getTxt('movetopic_auto_topic', file: 'General')]), '</textarea>
-							</dd>
-							<dt>
-								<label for="redirect_topic">', Lang::getTxt($type . 'topic_redirect', file: 'General'), '</label>
-							</dt>
-							<dd>
-								<input type="checkbox" name="redirect_topic" id="redirect_topic" checked>
-							</dd>';
-
-	if (!empty(Config::$modSettings['allow_expire_redirect'])) {
-		echo '
-							<dt>
-								', Lang::getTxt('redirect_topic_expires', file: 'General'), '
-							</dt>
-							<dd>
-								<select name="redirect_expires">
-									<option value="0">', Lang::getTxt('never', file: 'General'), '</option>
-									<option value="1440">', Lang::getTxt('one_day', file: 'General'), '</option>
-									<option value="10080" selected>', Lang::getTxt('one_week', file: 'General'), '</option>
-									<option value="20160">', Lang::getTxt('two_weeks', file: 'General'), '</option>
-									<option value="43200">', Lang::getTxt('one_month', file: 'General'), '</option>
-									<option value="86400">', Lang::getTxt('two_months', file: 'General'), '</option>
-								</select>
-							</dd>';
-	} else {
-	echo '
-							<input type="hidden" name="redirect_expires" value="0">';
-	}
-
-	echo '
-						</dl>
-					</fieldset>';
-}
-
-/**
- * Confirmation page shown when finished merging topics.
- */
-function template_merge_done()
-{
-	echo '
-		<div id="merge_topics">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('merge', file: 'General'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Lang::getTxt('merge_successful', file: 'General'), '</p>
-				<br>
-				<ul>
-					<li>
-						<a href="', Config::$scripturl, '?board=', Utils::$context['target_board'], '.0">', Lang::getTxt('message_index', file: 'General'), '</a>
-					</li>
-					<li>
-						<a href="', Config::$scripturl, '?topic=', Utils::$context['target_topic'], '.0">', Lang::getTxt('new_merged_topic', file: 'General'), '</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<br class="clear">';
-}
-
-/**
- * Merge topic page.
- */
-function template_merge()
-{
-	echo '
-		<div id="merge_topics">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('merge', file: 'General'), '</h3>
-			</div>
-			<div class="information">
-				', Lang::getTxt('merge_desc', file: 'General'), '
-			</div>
-			<div class="windowbg">
-				<dl class="settings merge_topic">
-					<dt>
-						<strong>', Lang::getTxt('topic_to_merge', file: 'General'), '</strong>
-					</dt>
-					<dd>
-						', Utils::$context['origin_subject'], '
-					</dd>
-				</dl>
-			</div>
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('target_topic', file: 'General'), '</h3>
-			</div>
-			<div class="title_bar">
-				<h4 class="titlebg">';
-
-	if (isset(Utils::$context['merge_categories'])) {
-		echo '
-					<form action="' . Config::$scripturl . '?action=mergetopics;from=' . Utils::$context['origin_topic'] . ';targetboard=' . Utils::$context['target_board'] . ';board=' . Utils::$context['current_board'] . '.0" method="post" accept-charset="UTF-8" id="mergeSelectBoard">
-						', Lang::getTxt('target_below', file: 'General'), ' (', Lang::getTxt('board', file: 'General'), ':
-						<select name="targetboard" onchange="this.form.submit();">';
-
-		foreach (Utils::$context['merge_categories'] as $cat) {
-			echo '
-							<optgroup label="', $cat['name'], '">';
-
-			foreach ($cat['boards'] as $board) {
-				echo '
-								<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
-			}
-
-			echo '
-							</optgroup>';
-		}
-		echo '
-						</select>)
-						<input type="hidden" name="from" value="' . Utils::$context['origin_topic'] . '">
-						<input type="submit" value="', Lang::getTxt('go', file: 'General'), '" class="button">
-					</form>';
-	} else {
-	echo Lang::getTxt('target_below', file: 'General');
-	}
-
-	echo '		</h4>
-			</div><!-- .title_bar -->
-			<form action="', Config::$scripturl, '?action=mergetopics;sa=options" method="post" accept-charset="UTF-8">';
-
-	// Don't show this if there aren't any topics...
-	if (!empty(Utils::$context['topics'])) {
-		echo '
-				<div class="pagesection">
-					<div class="pagelinks">', Utils::$context['page_index'], '</div>
-				</div>
-				<div class="windowbg">
-					<ul class="merge_topics">';
-
-		foreach (Utils::$context['topics'] as $topic) {
-			echo '
-						<li>
-							<a href="', Config::$scripturl, '?action=mergetopics;sa=options;board=', Utils::$context['current_board'], '.0;from=', Utils::$context['origin_topic'], ';to=', $topic['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="main_icons merge"></span></a>
-							<a href="', Config::$scripturl, '?topic=', $topic['id'], '.0" target="_blank" rel="noopener">', $topic['subject'], '</a> ', Lang::getTxt('started_by_member', ['member' => $topic['poster']['link']], file: 'General'), '
-						</li>';
-		}
-
-		echo '
-					</ul>
-				</div>
-				<div class="pagesection">
-					<div class="pagelinks">', Utils::$context['page_index'], '</div>
-				</div>';
-	}
-	// Just a nice "There aren't any topics" message
-	else {
-	echo '
-				<div class="windowbg">', Lang::getTxt('topic_alert_none', file: 'General'), '</div>';
-	}
-
-	echo '
-				<br>
-				<div class="title_bar">
-					<h4 class="titlebg">', Lang::getTxt('target_id', file: 'General'), '</h4>
-				</div>
-				<div class="windowbg">
-					<dl class="settings merge_topic">
-						<dt>
-							<strong>', Lang::getTxt('merge_to_topic_id', file: 'General'), '</strong>
-						</dt>
-						<dd>
-							<input type="hidden" name="topics[]" value="', Utils::$context['origin_topic'], '">
-							<input type="text" name="topics[]">
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-
-						</dd>
-					</dl>
-					<input type="submit" value="', Lang::getTxt('merge', file: 'General'), '" class="button">
-				</div>
-			</form>
-		</div><!-- #merge_topics -->';
-}
-
-/**
- * Extra options related to merging topics.
- */
-function template_merge_extra_options()
-{
-	echo '
-	<div id="merge_topics">
-		<form action="', Config::$scripturl, '?action=mergetopics;sa=merge;" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('merge_topic_list', file: 'General'), '</h3>
-			</div>
-			<table class="bordercolor table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th scope="col" style="width:10px;">', Lang::getTxt('merge_check', file: 'General'), '</th>
-						<th scope="col" class="lefttext">', Lang::getTxt('subject', file: 'General'), '</th>
-						<th scope="col" class="lefttext">', Lang::getTxt('started_by', file: 'General'), '</th>
-						<th scope="col" class="lefttext">', Lang::getTxt('last_post', file: 'General'), '</th>
-						<th scope="col" style="width:20px;">' . Lang::getTxt('merge_include_notifications', file: 'General') . '</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-	foreach (Utils::$context['topics'] as $topic) {
-		echo '
-					<tr class="windowbg">
-						<td>
-							<input type="checkbox" name="topics[]" value="' . $topic['id'] . '" checked>
-						</td>
-						<td>
-							<a href="' . Config::$scripturl . '?topic=' . $topic['id'] . '.0" target="_blank" rel="noopener">' . $topic['subject'] . '</a>
-						</td>
-						<td>
-							', $topic['started']['link'], '<br>
-							<span class="smalltext">', $topic['started']['time'], '</span>
-						</td>
-						<td>
-							' . $topic['updated']['link'] . '<br>
-							<span class="smalltext">', $topic['updated']['time'], '</span>
-						</td>
-						<td>
-							<input type="checkbox" name="notifications[]" value="' . $topic['id'] . '" checked>
-						</td>
-					</tr>';
-	}
-	echo '
-				</tbody>
-			</table>
-			<br>
-			<div class="windowbg">
-				<fieldset id="merge_subject" class="merge_options">
-					<legend>', Lang::getTxt('merge_select_subject', file: 'General'), '</legend>
-					<select name="subject" onchange="this.form.custom_subject.style.display = (this.options[this.selectedIndex].value != 0) ? \'none\': \'\' ;">';
-
-	foreach (Utils::$context['topics'] as $topic) {
-		echo '
-						<option value="', $topic['id'], '"' . ($topic['selected'] ? ' selected' : '') . '>', $topic['subject'], '</option>';
-	}
-	echo '
-						<option value="0">', Lang::getTxt('merge_custom_subject', file: 'General'), '</option>
-					</select>
-					<br>
-					<input type="text" name="custom_subject" size="60" id="custom_subject" class="custom_subject" style="display: none;"><br>
-					<label for="enforce_subject"><input type="checkbox" name="enforce_subject" id="enforce_subject" value="1"> ', Lang::getTxt('movetopic_change_all_subjects', file: 'General'), '</label>
-				</fieldset>';
-
-	// Show an option to create a redirection topic as well...
-	template_redirect_options('merge');
-
-	if (!empty(Utils::$context['boards']) && count(Utils::$context['boards']) > 1) {
-		echo '
-				<fieldset id="merge_board" class="merge_options">
-					<legend>', Lang::getTxt('merge_select_target_board', file: 'General'), '</legend>
-					<ul>';
-
-		foreach (Utils::$context['boards'] as $board) {
-			echo '
-						<li>
-							<input type="radio" name="board" value="' . $board['id'] . '"' . ($board['selected'] ? ' checked' : '') . '> ' . $board['name'] . '
-						</li>';
-		}
-		echo '
-					</ul>
-				</fieldset>';
-	}
-
-	if (!empty(Utils::$context['polls'])) {
-		echo '
-				<fieldset id="merge_poll" class="merge_options">
-					<legend>' . Lang::getTxt('merge_select_poll', file: 'General') . '</legend>
-					<ul>';
-
-		foreach (Utils::$context['polls'] as $poll) {
-			echo '
-						<li>
-							<input type="radio" name="poll" value="' . $poll['id'] . '"' . ($poll['selected'] ? ' checked' : '') . '> ' . $poll['question'] . ' (' . Lang::getTxt('topic', file: 'General') . ': <a href="' . Config::$scripturl . '?topic=' . $poll['topic']['id'] . '.0" target="_blank" rel="noopener">' . $poll['topic']['subject'] . '</a>)
-						</li>';
-		}
-		echo '
-						<li>
-							<input type="radio" name="poll" value="-1"> (' . Lang::getTxt('merge_no_poll', file: 'General') . ')
-						</li>
-					</ul>
-				</fieldset>';
-	}
-
-	echo '
-				<div class="auto_flow">
-					<input type="submit" value="' . Lang::getTxt('merge', file: 'General') . '" class="button">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="sa" value="execute">
-				</div>
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #merge_topics -->';
-}
diff --git a/Themes/default/Notify.template.php b/Themes/default/Notify.template.php
deleted file mode 100644
index 5466a03b890..00000000000
--- a/Themes/default/Notify.template.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * The main notification bar.
- */
-function template_main()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons mail icon"></span>
-				', Lang::getTxt('notify', file: 'General'), '
-			</h3>
-		</div>
-		<div class="roundframe centertext">
-			<p>', Lang::getTxt('notify_topic_prompt', file: 'General'), '</p>
-			<p>
-				<strong><a href="', Config::$scripturl, '?action=notifytopic;sa=on;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], ';', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('yes', file: 'General'), '</a> - <a href="', Config::$scripturl, '?action=notifytopic;sa=off;topic=', Utils::$context['current_topic'], '.', Utils::$context['start'], ';', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('no', file: 'General'), '</a></strong>
-			</p>
-		</div>';
-}
-
-/**
- * Board notification bar.
- */
-function template_notify_board()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons mail icon"></span>
-				', Lang::getTxt('notify', file: 'General'), '
-			</h3>
-		</div>
-		<div class="roundframe centertext">
-			<p>', Lang::getTxt('notify_board_prompt', file: 'General'), '</p>
-			<p>
-				<strong><a href="', Config::$scripturl, '?action=notifyboard;sa=on;board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('yes', file: 'General'), '</a> - <a href="', Config::$scripturl, '?action=notifyboard;sa=off;board=', Utils::$context['current_board'], '.', Utils::$context['start'], ';', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('no', file: 'General'), '</a></strong>
-			</p>
-		</div>';
-}
-
-/**
- *
- */
-function template_notify_announcements()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons mail icon"></span>
-				', Lang::getTxt('notify', file: 'General'), '
-			</h3>
-		</div>
-		<div class="roundframe centertext">
-			<p>', Lang::getTxt('notify_announcements_prompt', file: 'General'), '</p>
-			<p>
-				<strong><a href="', Config::$scripturl, '?action=notifyannouncements;sa=on;', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('yes', file: 'General'), '</a> - <a href="', Config::$scripturl, '?action=notifyannouncements;sa=off;', (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '">', Lang::getTxt('no', file: 'General'), '</a></strong>
-			</p>
-		</div>';
-}
-
-/**
- * Displays a message indicating the user's notification preferences were successfully changed
- */
-function template_notify_pref_changed()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons mail icon"></span>
-				', Lang::getTxt('notify', file: 'General'), '
-			</h3>
-		</div>
-		<div class="roundframe centertext">
-			<p>', Utils::$context['notify_success_msg'], '</p>
-		</div>';
-}
diff --git a/Themes/default/Packages.template.php b/Themes/default/Packages.template.php
deleted file mode 100644
index 2dab82ce5de..00000000000
--- a/Themes/default/Packages.template.php
+++ /dev/null
@@ -1,1883 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Sapi;
-use SMF\Theme;
-use SMF\Url;
-use SMF\Utils;
-
-/**
- * The main template
- */
-function template_main() {}
-
-/**
- * View package details when installing/uninstalling
- */
-function template_view_package()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt((Utils::$context['uninstalling'] ? 'uninstall' : ('install_' . Utils::$context['extract_type'])), file: 'Packages'), '</h3>
-		</div>
-		<div class="information">';
-
-	if (Utils::$context['is_installed']) {
-		echo '
-			<strong>', Lang::getTxt('package_installed_warning1', file: 'Packages'), '</strong><br>
-			<br>
-			', Lang::getTxt('package_installed_warning2', file: 'Packages'), '<br>
-			<br>';
-	}
-
-	echo Lang::getTxt('package_installed_warning3', file: 'Packages'), '
-		</div>
-		<br>';
-
-	if (!empty(Utils::$context['package_blacklist_found'])) {
-		echo '
-		<div class="errorbox">', Lang::getTxt('package_validation_blacklist_found', file: 'Packages'), '
-		</div>';
-	}
-
-	// Do errors exist in the install? If so light them up like a christmas tree.
-	if (Utils::$context['has_failure']) {
-		echo '
-		<div class="errorbox">
-			', Lang::getTxt(
-			'package_will_fail_title',
-			[
-				Lang::getTxt(
-					'package_' . (Utils::$context['uninstalling'] ? 'uninstall' : 'install'),
-					file: 'Packages',
-				),
-			],
-			file: 'Packages',
-		),
-			'<br>
-			', Lang::getTxt(
-				'package_will_fail_warning',
-				[
-					Lang::getTxt(
-						'package_' . (Utils::$context['uninstalling'] ? 'uninstall' : 'install'),
-						file: 'Packages',
-					),
-				],
-				file: 'Packages',
-			),
-			!empty(Utils::$context['failure_details']) ? '<br><br><strong>' . Utils::$context['failure_details'] . '</strong>' : '', '
-		</div>';
-	}
-
-	// Validation info?
-	if (!empty(Utils::$context['validation_tests'])) {
-		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('package_validaiton_results', file: 'Packages'), '</h3>
-		</div>
-		<div id="package_validation">
-			<table class="table_grid">';
-
-		foreach (Utils::$context['validation_tests'] as $id_server => $result) {
-			echo '
-			<tr>
-				<td>', Utils::$context['package_servers'][$id_server]['name'], '</td>
-				<td>', Lang::getTxt($result[Utils::$context['package_sha256_hash']] ?? 'package_validation_status_unknown', file: 'Packages'), '</td>
-			</tr>';
-		}
-
-		echo '
-			</table>
-		</div>
-		<br>';
-	}
-
-	// Display the package readme if one exists
-	if (isset(Utils::$context['package_readme'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_' . (Utils::$context['uninstalling'] ? 'un' : '') . 'install_readme', file: 'Search'), '</h3>
-		</div>
-		<div class="windowbg">
-			', Utils::adjustHeadingLevels(Utils::$context['package_readme'], 3), '
-			<span class="floatright">', Lang::getTxt('package_available_readme_language', file: 'Packages'), '
-				<select name="readme_language" id="readme_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=', Utils::$context['uninstalling'] ? 'uninstall' : 'install', ';package=', Utils::$context['filename'], ';license=\' + this.options[this.selectedIndex].value + \';readme=\' + get_selected(\'readme_language\'));">';
-
-		foreach (Utils::$context['readmes'] as $a => $b) {
-			echo '
-					<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? Lang::getTxt('package_readme_default', file: 'Packages') : ucfirst($b), '</option>';
-		}
-
-		echo '
-				</select>
-			</span>
-		</div>
-		<br>';
-	}
-
-	// Did they specify a license to display?
-	if (isset(Utils::$context['package_license'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_install_license', file: 'Packages'), '</h3>
-		</div>
-		<div class="windowbg">
-			', Utils::adjustHeadingLevels(Utils::$context['package_license'], 3), '
-			<span class="floatright">', Lang::getTxt('package_available_license_language', file: 'Packages'), '
-				<select name="license_language" id="license_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=install', ';package=', Utils::$context['filename'], ';readme=\' + this.options[this.selectedIndex].value + \';license=\' + get_selected(\'license_language\'));">';
-
-		foreach (Utils::$context['licenses'] as $a => $b) {
-			echo '
-					<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? Lang::getTxt('package_license_default', file: 'Packages') : ucfirst($b), '</option>';
-		}
-		echo '
-				</select>
-			</span>
-		</div>
-		<br>';
-	}
-
-	echo '
-		<form action="', !empty(Utils::$context['post_url']) ? Utils::$context['post_url'] : '#', '" onsubmit="submitonce(this);" method="post" accept-charset="UTF-8" id="view_package">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt(Utils::$context['uninstalling'] ? 'package_uninstall_actions' : 'package_install_actions', Utils::$context, file: 'Packages'), '
-				</h3>
-			</div>';
-
-	// Are there data changes to be removed?
-	if (Utils::$context['uninstalling'] && !empty(Utils::$context['database_changes'])) {
-		// This is really a special case so we're adding style inline
-		echo '
-			<div class="windowbg" style="margin: 0; border-radius: 0;">
-				<label><input type="checkbox" name="do_db_changes">', Lang::getTxt('package_db_uninstall', file: 'Packages'), '</label>
-				<div id="db_changes_div">
-					', Lang::getTxt('package_db_uninstall_actions', file: 'Packages'), '
-					<ul class="normallist smalltext">';
-
-		foreach (Utils::$context['database_changes'] as $change) {
-			echo '
-						<li>', $change, '</li>';
-		}
-
-		echo '
-					</ul>
-				</div>
-			</div>';
-	}
-
-	echo '
-			<div class="information">';
-
-	if (empty(Utils::$context['actions']) && empty(Utils::$context['database_changes'])) {
-		echo '
-				<br>
-				<div class="errorbox">
-					', Lang::getTxt('corrupt_compatible', file: 'Packages'), '
-				</div>
-			</div><!-- .information -->';
-	} else {
-		echo '
-				', Lang::getTxt('perform_actions', file: 'Packages'), '
-			</div><!-- .information -->
-			<br>
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th scope="col"></th>
-						<th scope="col" width="30"></th>
-						<th scope="col" class="lefttext">', Lang::getTxt('package_install_type', file: 'Packages'), '</th>
-						<th scope="col" class="lefttext" width="50%">', Lang::getTxt('package_install_action', file: 'Packages'), '</th>
-						<th class="lefttext" scope="col" width="20%">', Lang::getTxt('package_install_desc', file: 'Packages'), '</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-		$i = 1;
-		$j = 1;
-		$action_num = 1;
-		$js_operations = [];
-
-		foreach (Utils::$context['actions'] as $packageaction) {
-			// Did we pass or fail?  Need to now for later on.
-			$js_operations[$action_num] = $packageaction['failed'] ?? 0;
-
-			echo '
-					<tr class="bg ', $i % 2 == 0 ? 'even' : 'odd', '">
-						<td>', isset($packageaction['operations']) ? '<img id="operation_img_' . $action_num . '" src="' . Theme::$current->settings['images_url'] . '/selected_open.png" alt="*" style="display: none;">' : '', '</td>
-						<td style="width: 30px;">', $i++, '.</td>
-						<td style="width: 23%;">', $packageaction['type'], '</td>
-						<td style="width: 50%;">', $packageaction['action'], '</td>
-						<td style="width: 20%;"><strong', !empty($packageaction['failed']) ? ' class="error"' : '', '>', $packageaction['description'], '</strong></td>
-					</tr>';
-
-			// Is there water on the knee? Operation!
-			if (isset($packageaction['operations'])) {
-				echo '
-					<tr id="operation_', $action_num, '">
-						<td colspan="5">
-							<table class="full_width">';
-
-				// Show the operations.
-				$operation_num = 1;
-
-				foreach ($packageaction['operations'] as $operation) {
-					// Determine the position text.
-					$operation_text = $operation['position'] == 'replace' ? 'operation_replace' : ($operation['position'] == 'before' ? 'operation_after' : 'operation_before');
-
-					echo '
-								<tr class="bg ', $operation_num % 2 == 0 ? 'even' : 'odd', '">
-									<td class="righttext">
-										<a href="', Config::$scripturl, '?action=admin;area=packages;sa=showoperations;operation_key=', $operation['operation_key'], !empty(Utils::$context['install_id']) ? ';install_id=' . Utils::$context['install_id'] : '', ';package=', $_REQUEST['package'], ';filename=', $operation['filename'], ($operation['is_diff'] ? ';diff' : ''), ($operation['is_boardmod'] ? ';boardmod' : ''), (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'uninstall' ? ';reverse' : ''), '" onclick="return reqWin(this.href, 600, 400, false);">
-											<span class="main_icons package_ops"></span>
-										</a>
-									</td>
-									<td width="30">', $operation_num++, '.</td>
-									<td width="23%">', Lang::getTxt($operation_text, file: 'Packages'), '</td>
-									<td width="50%">', $operation['action'], '</td>
-									<td width="20%"><strong', !empty($operation['failed']) ? ' class="error"' : '', '>', !empty($operation['ignore_failure']) ? Lang::getTxt('operation_description_ignore', ['desc' => $operation['description']], file: 'Packages') : $operation['description'], '</strong></td>
-								</tr>';
-				}
-
-				echo '
-							</table>
-						</td>
-					</tr>';
-
-				// Increase it.
-				$action_num++;
-			}
-		}
-		echo '
-				</tbody>
-			</table>';
-
-		// What if we have custom themes we can install into? List them too!
-		if (!empty(Utils::$context['theme_actions'])) {
-			echo '
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Utils::$context['uninstalling'] ? Lang::getTxt('package_other_themes_uninstall', file: 'Packages') : Lang::getTxt('package_other_themes', file: 'Packages'), '
-				</h3>
-			</div>
-			<div id="custom_changes">
-				<div class="information">
-					', Lang::getTxt('package_other_themes_desc', file: 'Packages'), '
-				</div>
-				<table class="table_grid">';
-
-			// Loop through each theme and display its name, and then it's details.
-			foreach (Utils::$context['theme_actions'] as $id => $theme) {
-				// Pass?
-				$js_operations[$action_num] = !empty($theme['has_failure']);
-
-				echo '
-					<tr class="title_bar">
-						<td class="righttext" colspan="2">';
-
-				if (!empty(Utils::$context['themes_locked'])) {
-					echo '
-							<input type="hidden" name="custom_theme[]" value="', $id, '">';
-				}
-				echo '
-							<input type="checkbox" name="custom_theme[]" id="custom_theme_', $id, '" value="', $id, '" onclick="', (!empty($theme['has_failure']) ? 'if (this.form.custom_theme_' . $id . '.checked && !confirm(\'' . Lang::getTxt('package_theme_failure_warning', file: 'Packages') . '\')) return false;' : ''), 'invertAll(this, this.form, \'dummy_theme_', $id, '\', true);"', !empty(Utils::$context['themes_locked']) ? ' disabled checked' : '', '>
-						</td>
-						<td colspan="3">
-							', $theme['name'], '
-						</td>
-					</tr>';
-
-				foreach ($theme['actions'] as $action) {
-					echo '
-					<tr class="bg ', $j++ % 2 == 0 ? 'even' : 'odd', '">
-						<td colspan="2">', isset($packageaction['operations']) ?
-							'<img id="operation_img_' . $action_num . '" src="' . Theme::$current->settings['images_url'] . '/selected_open.png" alt="*" style="display: none;">' : '', '
-							<input type="checkbox" name="theme_changes[]" value="', !empty($action['value']) ? $action['value'] : '', '" id="dummy_theme_', $id, '"', (!empty($action['not_mod']) ? '' : ' disabled'), !empty(Utils::$context['themes_locked']) ? ' checked' : '', ' class="floatright">
-						</td>
-						<td width="23%">', $action['type'], '</td>
-						<td width="50%">', $action['action'], '</td>
-						<td width="20%"><strong', !empty($action['failed']) ? ' class="error"' : '', '>', $action['description'], '</strong></td>
-					</tr>';
-
-					// Is there water on the knee? Operation!
-					if (isset($action['operations'])) {
-						echo '
-					<tr id="operation_', $action_num, '">
-						<td colspan="5">
-							<table class="full_width">';
-
-						$operation_num = 1;
-
-						foreach ($action['operations'] as $operation) {
-							// Determine the position text.
-							$operation_text = $operation['position'] == 'replace' ? 'operation_replace' : ($operation['position'] == 'before' ? 'operation_after' : 'operation_before');
-
-							echo '
-								<tr class="bg ', $operation_num % 2 == 0 ? 'even' : 'odd', '">
-									<td class="righttext">
-										<a href="', Config::$scripturl, '?action=admin;area=packages;sa=showoperations;operation_key=', $operation['operation_key'], !empty(Utils::$context['install_id']) ? ';install_id=' . Utils::$context['install_id'] : '', ';package=', $_REQUEST['package'], ';filename=', $operation['filename'], ($operation['is_diff'] ? ';diff' : ''), ($operation['is_boardmod'] ? ';boardmod' : ''), (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'uninstall' ? ';reverse' : ''), '" onclick="return reqWin(this.href, 600, 400, false);">
-											<span class="main_icons package_ops"></span>
-										</a>
-									</td>
-									<td width="30">', $operation_num++, '.</td>
-									<td width="23%">', Lang::getTxt($operation_text, file: 'Packages'), '</td>
-									<td width="50%">', $operation['action'], '</td>
-									<td width="20%"><strong', !empty($operation['failed']) ? ' class="error"' : '', '>', !empty($operation['ignore_failure']) ? Lang::getTxt('operation_description_ignore', ['desc' => $operation['description']], file: 'Packages') : $operation['description'], '</strong></td>
-								</tr>';
-						}
-
-						echo '
-							</table>
-						</td>
-					</tr>';
-
-						// Increase it.
-						$action_num++;
-					}
-				}
-			}
-
-			echo '
-				</table>
-			</div><!-- #custom_changes -->';
-		}
-	}
-
-	// Are we effectively ready to install?
-	if (!Utils::$context['ftp_needed'] && (!empty(Utils::$context['actions']) || !empty(Utils::$context['database_changes']))) {
-		echo '
-			<div class="righttext padding">
-				<input type="submit" value="', Lang::getTxt(Utils::$context['uninstalling'] ? 'package_uninstall_now' : 'package_install_now', file: 'Packages'), '" onclick="return ', !empty(Utils::$context['has_failure']) ? '(submitThisOnce(this) &amp;&amp; confirm(\'' . Lang::getTxt(Utils::$context['uninstalling'] ? 'package_will_fail_popup_uninstall' : 'package_will_fail_popup', file: 'Packages') . '\'))' : 'submitThisOnce(this)', ';" class="button">
-			</div>';
-	}
-
-	// If we need ftp information then demand it!
-	elseif (Utils::$context['ftp_needed']) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('package_ftp_necessary', file: 'Packages'), '</h3>
-			</div>
-			<div>
-				', template_control_chmod(), '
-			</div>';
-	}
-
-	echo '
-
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">', (isset(Utils::$context['form_sequence_number']) && !Utils::$context['ftp_needed']) ? '
-			<input type="hidden" name="seqnum" value="' . Utils::$context['form_sequence_number'] . '">' : '', '
-		</form>';
-
-	// Toggle options.
-	echo '
-	<script>';
-
-	// Operations.
-	if (!empty($js_operations)) {
-		foreach ($js_operations as $key => $operation) {
-			echo '
-		new smc_Toggle({
-			bToggleEnabled: true,
-			bNoAnimate: true,
-			bCurrentlyCollapsed: ', $operation ? 'false' : 'true', ',
-			aSwappableContainers: [
-				\'operation_', $key, '\'
-			],
-			aSwapImages: [
-				{
-					sId: \'operation_img_', $key, '\',
-					srcExpanded: smf_images_url + \'/selected_open.png\',
-					altExpanded: \'*\',
-					srcCollapsed: smf_images_url + \'/selected.png\',
-					altCollapsed: \'*\'
-				}
-			]
-		});';
-		}
-	}
-
-	// Get the currently selected item from a select list
-	echo '
-		function get_selected(id)
-		{
-			var aSelected = document.getElementById(id);
-			for (var i = 0; i < aSelected.options.length; i++)
-			{
-				if (aSelected.options[i].selected == true)
-					return aSelected.options[i].value;
-			}
-			return aSelected.options[0];
-		}';
-
-	// And a bit more for database changes.
-	if (Utils::$context['uninstalling'] && !empty(Utils::$context['database_changes'])) {
-		echo '
-		makeToggle(document.getElementById(\'db_changes_div\'), ', Utils::escapeJavaScript(Lang::getTxt('package_db_uninstall_details', file: 'Packages')), ');';
-	}
-
-	echo '
-	</script>';
-}
-
-/**
- * Extract package contents
- */
-function template_extract_package()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">';
-
-	if (empty(Utils::$context['redirect_url'])) {
-		echo Lang::getTxt(Utils::$context['uninstalling'] ? 'uninstall' : 'extracting', file: 'Packages');
-	} else {
-	echo Lang::getTxt('package_installed_redirecting', file: 'Packages');
-	}
-
-	echo '</h3>
-		</div>
-		<div class="windowbg">';
-
-	// If we are going to redirect we have a slightly different agenda.
-	if (!empty(Utils::$context['redirect_url'])) {
-		echo '
-			', Utils::$context['redirect_text'], '<br><br>
-			<a href="', Utils::$context['redirect_url'], '">', Lang::getTxt('package_installed_redirect_go_now', file: 'Packages'), '</a><span id="countdown" class="hidden"> (5) </span> | <a href="', Config::$scripturl, '?action=admin;area=packages;sa=browse">', Lang::getTxt('package_installed_redirect_cancel', file: 'Packages'), '</a>
-			<script>
-				var countdown = ', Utils::$context['redirect_timeout'], ';
-				var el = document.getElementById(\'countdown\');
-				var loop = setInterval(doCountdown, 1000);
-
-				function doCountdown()
-				{
-					countdown--;
-					el.textContent = " (" + countdown + ") ";
-
-					if (countdown == 0)
-					{
-						clearInterval(loop);
-						window.location = "', Utils::$context['redirect_url'], '";
-					}
-				}
-				el.classList.remove(\'hidden\');
-				el.value = " (" + countdown + ") ";
-			</script>';
-	} elseif (Utils::$context['uninstalling']) {
-		echo '
-			', Lang::getTxt('package_uninstall_done', file: 'Packages') . ' <br>
-			', '<a href="', Utils::$context['keep_url'], '" class="button">', Lang::getTxt('package_keep', file: 'Packages'), '</a>', '<a href="', Utils::$context['remove_url'], '" class="button">', Lang::getTxt('package_delete2', file: 'Packages'), '</a>';
-	} elseif (Utils::$context['install_finished']) {
-		if (Utils::$context['extract_type'] == 'avatar') {
-			echo '
-			', Lang::getTxt('avatars_extracted', file: 'Packages');
-		} elseif (Utils::$context['extract_type'] == 'language') {
-			echo '
-			', Lang::getTxt('language_extracted', file: 'Packages');
-		} else {
-		echo '
-			', Lang::getTxt('package_installed_done', file: 'Packages');
-		}
-	} else {
-	echo '
-			', Lang::getTxt('corrupt_compatible', file: 'Packages');
-	}
-
-	echo '
-		</div><!-- .windowbg -->';
-
-	// Show the "restore permissions" screen?
-	if (function_exists('template_show_list') && !empty(Utils::$context['restore_file_permissions']['rows'])) {
-		echo '<br>';
-		template_show_list('restore_file_permissions');
-	}
-}
-
-/**
- * List files in a package
- */
-function template_list()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('list_file', file: 'Packages'), '</h3>
-		</div>
-		<div class="title_bar">
-			<h4 class="titlebg">', Lang::getTxt('files_package', Utils::$context, file: 'Packages'), '</h4>
-		</div>
-		<div class="windowbg">
-			<ol>';
-
-	foreach (Utils::$context['files'] as $fileinfo) {
-		echo '
-				<li><a href="', Config::$scripturl, '?action=admin;area=packages;sa=examine;package=', Utils::$context['filename'], ';file=', $fileinfo['filename'], '" title="', Lang::getTxt('view', file: 'General'), '">', $fileinfo['filename'], '</a> ', Lang::getTxt('package_bytes', $fileinfo, file: 'Packages'), '</li>';
-	}
-
-	echo '
-			</ol>
-			<br>
-			<a href="', Config::$scripturl, '?action=admin;area=packages" class="button floatnone">', Lang::getTxt('back', file: 'General'), '</a>
-		</div>';
-}
-
-/**
- * Examine a single file within a package
- */
-function template_examine()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_examine_file', file: 'Packages'), '</h3>
-		</div>
-		<div class="title_bar">
-			<h4 class="titlebg">', Lang::getTxt('package_file_contents', Utils::$context, file: 'Packages'), '</h4>
-		</div>
-		<div class="windowbg">
-			<pre class="file_content">', Utils::$context['filedata'], '</pre>
-			<a href="', Config::$scripturl, '?action=admin;area=packages;sa=list;package=', Utils::$context['package'], '" class="button floatnone">', Lang::getTxt('list_files', file: 'Packages'), '</a>
-		</div>';
-}
-
-/**
- * List all packages
- */
-function template_browse()
-{
-	echo '
-		<div id="update_section"></div>
-		<div id="admin_form_wrapper">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('packages_adding_title', file: 'Packages'), '
-				</h3>
-			</div>
-			<div class="information">
-				', Lang::getTxt('packages_adding', file: 'Packages'), '
-			</div>
-
-			<script>
-				window.smfForum_scripturl = smf_scripturl;
-				window.smfForum_sessionid = smf_session_id;
-				window.smfForum_sessionvar = smf_session_var;';
-
-	// Make a list of already installed mods so nothing is listed twice ;).
-	echo '
-				window.smfInstalledPackages = ["', implode('", "', Utils::$context['installed_mods']), '"];
-				window.smfVersion = "', Utils::$context['forum_version'], '";
-			</script>
-			<div id="yourVersion" style="display:none">', Utils::$context['forum_version'], '</div>';
-
-	if (empty(Config::$modSettings['disable_smf_js'])) {
-		echo '
-			<script src="', Config::$scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
-	}
-
-	// This sets the announcements and current versions themselves ;).
-	echo '
-			<script>
-				var oAdminIndex = new smf_AdminIndex({
-					bLoadAnnouncements: false,
-					bLoadVersions: false,
-					bLoadUpdateNotification: true,
-					sUpdateNotificationContainerId: \'update_section\',
-					sUpdateNotificationDefaultTitle: ', Utils::escapeJavaScript(Lang::getTxt('update_available', file: 'Admin')), ',
-					sUpdateNotificationDefaultMessage: ', Utils::escapeJavaScript(Lang::getTxt('update_message', file: 'Admin')), ',
-					sUpdateNotificationTemplate: ', Utils::escapeJavaScript('
-						<h3 id="update_title">
-							%title%
-						</h3>
-						<div id="update_message" class="smalltext">
-							%message%
-						</div>
-					'), ',
-					sUpdateNotificationLink: smf_scripturl + ', Utils::escapeJavaScript('?action=admin;area=packages;pgdownload;auto;package=%package%;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']), '
-				});
-			</script>';
-
-	echo '
-		</div><!-- #admin_form_wrapper -->';
-
-	if (Utils::$context['available_packages'] == 0) {
-		echo '
-		<div class="noticebox">', Lang::getTxt('no_packages', file: 'Packages'), '</div>';
-	} else {
-		foreach (Utils::$context['modification_types'] as $type) {
-			if (!empty(Utils::$context['packages_lists_' . $type]['rows'])) {
-				template_show_list('packages_lists_' . $type);
-			}
-		}
-
-		echo '
-		<br>';
-	}
-
-	// The advanced (emulation) box, collapsed by default
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=packages;sa=browse" method="get">
-			<div id="advanced_box">
-				<div class="cat_bar">
-					<h3 class="catbg">
-						<a href="#" id="advanced_panel_link">', Lang::getTxt('package_advanced_button', file: 'Packages'), '</a>
-					</h3>
-					<span id="advanced_panel_toggle" class="toggle_down" style="display: none;"></span>
-				</div>
-				<div id="advanced_panel_div" class="windowbg">
-					<p>
-						', Lang::getTxt('package_emulate_desc', file: 'Packages'), '
-					</p>
-					<dl class="settings">
-						<dt>
-							<strong>', Lang::getTxt('package_emulate', file: 'Packages'), '</strong><br>
-							<span class="smalltext">
-								<a href="#" onclick="return revert();">', Lang::getTxt('package_emulate_revert', file: 'Packages'), '</a>
-							</span>
-						</dt>
-						<dd>
-							<a id="revert" name="revert"></a>
-							<select name="version_emulate" id="ve">';
-
-	foreach (Utils::$context['emulation_versions'] as $version) {
-		echo '
-								<option value="', $version, '"', ($version == Utils::$context['selected_version'] ? ' selected="selected"' : ''), '>', $version, '</option>';
-	}
-
-	echo '
-							</select>
-						</dd>
-					</dl>
-					<div class="righttext padding">
-						<input type="submit" value="', Lang::getTxt('package_apply', file: 'Packages'), '" class="button">
-					</div>
-				</div><!-- #advanced_panel_div -->
-			</div><!-- #advanced_box -->
-			<input type="hidden" name="action" value="admin">
-			<input type="hidden" name="area" value="packages">
-			<input type="hidden" name="sa" value="browse">
-		</form>
-	<script>
-		var oAdvancedPanelToggle = new smc_Toggle({
-			bToggleEnabled: true,
-			bCurrentlyCollapsed: true,
-			aSwappableContainers: [
-				\'advanced_panel_div\'
-			],
-			aSwapImages: [
-				{
-					sId: \'advanced_panel_toggle\',
-					altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-					altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-				}
-			],
-			aSwapLinks: [
-				{
-					sId: \'advanced_panel_link\',
-					msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('package_advanced_button', file: 'Packages')), ',
-					msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('package_advanced_button', file: 'Packages')), '
-				}
-			]
-		});
-		function revert()
-		{
-			var default_version = "', Utils::$context['default_version'], '";
-			$("#ve").find("option").filter(function(index) {
-				return default_version === $(this).text();
-			}).attr("selected", "selected");
-			return false;
-		}
-	</script>';
-}
-
-/**
- * List package servers
- */
-function template_servers()
-{
-	if (!empty(Utils::$context['package_ftp']['error'])) {
-		echo '
-	<div class="errorbox">
-		<pre>', Utils::$context['package_ftp']['error'], '</pre>
-	</div>';
-	}
-
-	echo '
-	<div id="admin_form_wrapper">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_upload_title', file: 'Packages'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=admin;area=packages;get;sa=upload" method="post" accept-charset="UTF-8" enctype="multipart/form-data">
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('package_upload_select', file: 'Packages'), '</strong>
-					</dt>
-					<dd>
-						<input type="file" name="package" size="38">
-					</dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('upload', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a class="download_new_package">
-					<span class="toggle_down floatright" alt="*" title="', Lang::getTxt('show', file: 'General'), '"></span>
-					', Lang::getTxt('download_new_package', file: 'Packages'), '
-				</a>
-			</h3>
-		</div>
-		<div class="new_package_content">';
-
-	if (Utils::$context['package_download_broken']) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('package_ftp_necessary', file: 'Packages'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p>
-					', Lang::getTxt('package_ftp_why_download', file: 'Packages'), '
-				</p>
-				<form action="', Config::$scripturl, '?action=admin;area=packages;get" method="post" accept-charset="UTF-8">
-					<dl class="settings">
-						<dt>
-							<label for="ftp_server">', Lang::getTxt('package_ftp_server', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="30" name="ftp_server" id="ftp_server" value="', Utils::$context['package_ftp']['server'], '">
-							<label for="ftp_port">', Lang::getTxt('package_ftp_port', file: 'Packages'), '</label>
-							<input type="text" size="3" name="ftp_port" id="ftp_port" value="', Utils::$context['package_ftp']['port'], '">
-						</dd>
-						<dt>
-							<label for="ftp_username">', Lang::getTxt('package_ftp_username', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="50" name="ftp_username" id="ftp_username" value="', Utils::$context['package_ftp']['username'], '">
-						</dd>
-						<dt>
-							<label for="ftp_password">', Lang::getTxt('package_ftp_password', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="password" size="50" name="ftp_password" id="ftp_password">
-						</dd>
-						<dt>
-							<label for="ftp_path">', Lang::getTxt('package_ftp_path', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="50" name="ftp_path" id="ftp_path" value="', Utils::$context['package_ftp']['path'], '">
-						</dd>
-					</dl>
-					<div class="righttext">
-						<input type="submit" value="', Lang::getTxt('package_proceed', file: 'Packages'), '" class="button">
-					</div>
-				</form>
-			</div><!-- .windowbg -->';
-	}
-
-	echo '
-			<div class="windowbg">
-				<fieldset>
-					<legend>' . Lang::getTxt('package_servers', file: 'Packages') . '</legend>
-					<ul class="package_servers">';
-
-	foreach (Utils::$context['servers'] as $server) {
-		echo '
-						<li class="flow_auto">
-							<span class="floatleft">' . $server['name'] . '</span>
-							<span class="package_server floatright"><a href="' . Config::$scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '" class="button">' . Lang::getTxt('package_browse', file: 'Packages') . '</a></span>
-							' . (!str_ends_with((new Url($server['url']))->host, '.simplemachines.org') ? '<span class="package_server floatright"><a href="' . Config::$scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" class="button">' . Lang::getTxt('delete', file: 'General') . '</a></span>' : '') . '
-						</li>';
-	}
-	echo '
-					</ul>
-				</fieldset>
-				<fieldset>
-					<legend>' . Lang::getTxt('add_server', file: 'Packages') . '</legend>
-					<form action="' . Config::$scripturl . '?action=admin;area=packages;get;sa=add" method="post" accept-charset="UTF-8">
-						<dl class="settings">
-							<dt>
-								<strong>' . Lang::getTxt('server_name', file: 'Packages') . '</strong>
-							</dt>
-							<dd>
-								<input type="text" name="servername" size="44" value="SMF">
-							</dd>
-							<dt>
-								<strong>' . Lang::getTxt('serverurl', file: 'Packages') . '</strong>
-							</dt>
-							<dd>
-								<input type="text" name="serverurl" size="44" value="https://">
-							</dd>
-						</dl>
-						<div class="righttext">
-							<input type="submit" value="' . Lang::getTxt('add_server', file: 'Packages') . '" class="button">
-							<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-						</div>
-					</form>
-				</fieldset>
-				<fieldset>
-					<legend>', Lang::getTxt('package_download_by_url', file: 'Packages'), '</legend>
-					<form action="', Config::$scripturl, '?action=admin;area=packages;get;sa=download;byurl;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-						<dl class="settings">
-							<dt>
-								<strong>' . Lang::getTxt('serverurl', file: 'Packages') . '</strong>
-							</dt>
-							<dd>
-								<input type="text" name="package" size="44" value="https://">
-							</dd>
-							<dt>
-								<strong>', Lang::getTxt('package_download_filename', file: 'Packages'), '</strong>
-							</dt>
-							<dd>
-								<input type="text" name="filename" size="44"><br>
-								<span class="smalltext">', Lang::getTxt('package_download_filename_info', file: 'Packages'), '</span>
-							</dd>
-						</dl>
-						<input type="submit" value="', Lang::getTxt('download', file: 'Packages'), '" class="button">
-					</form>
-				</fieldset>
-			</div><!-- .windowbg -->
-		</div><!-- .new_package_content -->
-	</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * Confirm package operation
- */
-function template_package_confirm()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Utils::$context['confirm_message'], '</p>
-			<a href="', Utils::$context['proceed_href'], '" class="button floatnone">', Lang::getTxt('package_confirm_proceed', file: 'Packages'), '</a> <a href="JavaScript:history.go(-1);" class="button floatnone">', Lang::getTxt('package_confirm_go_back', file: 'Packages'), '</a>
-		</div>';
-}
-
-/**
- * List packages.
- */
-function template_package_list()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="windowbg">';
-
-	// No packages, as yet.
-	if (empty(Utils::$context['package_list'])) {
-		echo '
-			<ul>
-				<li>', Lang::getTxt('no_packages', file: 'Packages'), '</li>
-			</ul>';
-	}
-
-	// List out the packages...
-	else {
-		echo '
-			<ul id="package_list">';
-
-		foreach (Utils::$context['package_list'] as $i => $packageSection) {
-			echo '
-				<li>
-					<strong><span id="ps_img_', $i, '" class="toggle_up" alt="*" style="display: none;"></span> ', $packageSection['title'], '</strong>';
-
-			if (!empty($packageSection['text'])) {
-				echo '
-					<div class="sub_bar">
-						<h3 class="subbg">', $packageSection['text'], '</h3>
-					</div>';
-			}
-
-			echo '
-					<', Utils::$context['list_type'], ' id="package_section_', $i, '" class="packages">';
-
-			foreach ($packageSection['items'] as $id => $package) {
-				echo '
-						<li>';
-
-				// Textual message. Could be empty just for a blank line...
-				if ($package['is_text']) {
-					echo '
-							', empty($package['name']) ? '&nbsp;' : $package['name'];
-				}
-
-				// This is supposed to be a rule..
-				elseif ($package['is_line']) {
-					echo '
-							<hr>';
-				}
-
-				// A remote link.
-				elseif ($package['is_remote']) {
-					echo '
-							<strong>', $package['link'], '</strong>';
-				}
-
-				// A title?
-				elseif ($package['is_heading'] || $package['is_title']) {
-					echo '
-							<strong>', $package['name'], '</strong>';
-				}
-
-				// Otherwise, it's a package.
-				else {
-					// 1. Some mod [ Download ].
-					echo '
-						<strong><span id="ps_img_', $i, '_pkg_', $id, '" class="toggle_up" alt="*" style="display: none;"></span> ', $package['can_install'] || !empty($package['can_emulate_install']) ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '" class="button floatnone">' . Lang::getTxt('download', file: 'Packages') . '</a>' : $package['name'], '</strong>
-						<ul id="package_section_', $i, '_pkg_', $id, '" class="package_section">';
-
-					// Show the mod type?
-					if ($package['type'] != '') {
-						echo '
-							<li class="package_section">
-								', Lang::getTxt('package_type', ['type' => Utils::ucwords(Utils::strtolower($package['type']))], file: 'Packages'), '
-							</li>';
-					}
-
-					// Show the version number?
-					if ($package['version'] != '') {
-						echo '
-							<li class="package_section">
-								', Lang::getTxt('package_version', $package, file: 'Packages'), '
-							</li>';
-					}
-
-					// How 'bout the author?
-					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link'])) {
-						echo '
-							<li class="package_section">
-								', Lang::getTxt('package_author', ['author' => $package['author']['link']], file: 'Packages'), '
-							</li>';
-					}
-
-					// The homepage...
-					if ($package['author']['website']['link'] != '') {
-						echo '
-							<li class="package_section">
-								', Lang::getTxt('author_website', $package['author']['website'], file: 'Packages'), '
-							</li>';
-					}
-
-					// Description: bleh bleh!
-					// Location of file: http://someplace/.
-					echo '
-							<li class="package_section">
-								', Lang::getTxt('file_location', ['link' => '<a href="' . $package['href'] . '">' . $package['href'] . '</a>'], file: 'Packages'), '
-							</li>
-							<li class="package_section">
-								', Lang::getTxt('package_description', $package, file: 'Packages'), '
-							</li>
-						</ul>';
-				}
-
-				echo '
-					</li>';
-			}
-			echo '
-				</', Utils::$context['list_type'], '>
-				</li>';
-		}
-		echo '
-			</ul>';
-	}
-
-	echo '
-		</div><!-- .windowbg -->';
-
-	// Now go through and turn off all the sections.
-	if (!empty(Utils::$context['package_list'])) {
-		$section_count = count(Utils::$context['package_list']);
-
-		echo '
-	<script>';
-
-		foreach (Utils::$context['package_list'] as $section => $ps) {
-			echo '
-		var oPackageServerToggle_', $section, ' = new smc_Toggle({
-			bToggleEnabled: true,
-			bCurrentlyCollapsed: ', count($ps['items']) == 1 || $section_count == 1 ? 'false' : 'true', ',
-			aSwappableContainers: [
-				\'package_section_', $section, '\'
-			],
-			aSwapImages: [
-				{
-					sId: \'ps_img_', $section, '\',
-					altExpanded: \'*\',
-					altCollapsed: \'*\'
-				}
-			]
-		});';
-
-			foreach ($ps['items'] as $id => $package) {
-				if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote']) {
-					echo '
-		var oPackageToggle_', $section, '_pkg_', $id, ' = new smc_Toggle({
-			bToggleEnabled: true,
-			bCurrentlyCollapsed: true,
-			aSwappableContainers: [
-				\'package_section_', $section, '_pkg_', $id, '\'
-			],
-			aSwapImages: [
-				{
-					sId: \'ps_img_', $section, '_pkg_', $id, '\',
-					altExpanded: \'*\',
-					altCollapsed: \'*\'
-				}
-			]
-		});';
-				}
-			}
-		}
-
-		echo '
-	</script>';
-	}
-}
-
-/**
- * Confirmation page showing a package was uploaded/downloaded successfully.
- */
-function template_downloaded()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="windowbg">
-			<p>
-				', Lang::getTxt(empty(Utils::$context['package_server']) ? 'package_uploaded_successfully' : 'package_downloaded_successfully', file: 'Packages'), '
-			</p>
-			<ul>
-				<li>
-					<span class="floatleft"><strong>', Utils::$context['package']['name'], '</strong></span>
-					<span class="package_server floatright">', Utils::$context['package']['list_files']['link'], '</span>
-					<span class="package_server floatright">', Utils::$context['package']['install']['link'], '</span>
-				</li>
-			</ul>
-			<br><br>
-			<p><a href="', Config::$scripturl, '?action=admin;area=packages;get', (isset(Utils::$context['package_server']) ? ';sa=browse;server=' . Utils::$context['package_server'] : ''), '" class="button floatnone">', Lang::getTxt('back', file: 'General'), '</a></p>
-		</div>';
-}
-
-/**
- * Installation options - FTP info and backup settings
- */
-function template_install_options()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-	<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_install_options', file: 'Packages'), '</h3>
-		</div>
-		<div class="information noup">
-			', Lang::getTxt('package_install_options_ftp_why', file: 'Packages'), '
-		</div>
-		<div class="windowbg noup">
-			<form action="', Config::$scripturl, '?action=admin;area=packages;sa=options" method="post" accept-charset="UTF-8">
-				<dl class="settings">
-					<dt>
-						<label for="pack_server"><strong>', Lang::getTxt('package_install_options_ftp_server', file: 'Packages'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="pack_server" id="pack_server" value="', Utils::$context['package_ftp_server'], '" size="30">
-					</dd>
-					<dt>
-						<label for="pack_port"><strong>', Lang::getTxt('package_install_options_ftp_port', file: 'Packages'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="pack_port" id="pack_port" size="3" value="', Utils::$context['package_ftp_port'], '">
-					</dd>
-					<dt>
-						<label for="pack_user"><strong>', Lang::getTxt('package_install_options_ftp_user', file: 'Packages'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="pack_user" id="pack_user" value="', Utils::$context['package_ftp_username'], '" size="30">
-					</dd>
-					<dt>
-						<label for="package_make_backups">', Lang::getTxt('package_install_options_make_backups', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<input type="checkbox" name="package_make_backups" id="package_make_backups" value="1"', Utils::$context['package_make_backups'] ? ' checked' : '', '>
-					</dd>
-					<dt>
-						<label for="package_make_full_backups">', Lang::getTxt('package_install_options_make_full_backups', file: 'Packages'), '</label>
-					</dt>
-					<dd>
-						<input type="checkbox" name="package_make_full_backups" id="package_make_full_backups" value="1"', Utils::$context['package_make_full_backups'] ? ' checked' : '', '>
-					</dd>
-				</dl>
-
-				<input type="submit" name="save" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>
-		</div><!-- .windowbg -->';
-}
-
-/**
- * CHMOD control form
- *
- * @return bool False if nothing to do.
- */
-function template_control_chmod()
-{
-	// Nothing to do? Brilliant!
-	if (empty(Utils::$context['package_ftp'])) {
-		return false;
-	}
-
-	if (empty(Utils::$context['package_ftp']['form_elements_only'])) {
-		echo '
-				', Lang::getTxt('package_ftp_why', ['onclick' => 'document.getElementById(\'need_writable_list\').style.display = \'\'; return false;'], file: 'Packages'), '<br>
-				<div id="need_writable_list" class="smalltext">
-					', Lang::getTxt('package_ftp_why_file_list', file: 'Packages'), '
-					<ul style="display: inline;">';
-
-		if (!empty(Utils::$context['notwritable_files'])) {
-			foreach (Utils::$context['notwritable_files'] as $file) {
-				echo '
-						<li>', $file, '</li>';
-			}
-		}
-
-		echo '
-					</ul>';
-
-		if (!Sapi::isOS(Sapi::OS_WINDOWS)) {
-			echo '
-					<hr>
-					', Lang::getTxt('package_chmod_linux', file: 'Packages'), '<br>
-					<samp># chmod a+w ', implode(' ', Utils::$context['notwritable_files']), '</samp>';
-		}
-
-		echo '
-				</div><!-- #need_writable_list -->';
-	}
-
-	echo '
-				<div class="bordercolor" id="ftp_error_div" style="', (!empty(Utils::$context['package_ftp']['error']) ? '' : 'display:none;'), 'padding: 1px; margin: 1ex;">
-					<div class="windowbg" id="ftp_error_innerdiv" style="padding: 1ex;">
-						<samp id="ftp_error_message">', !empty(Utils::$context['package_ftp']['error']) ? Utils::$context['package_ftp']['error'] : '', '</samp>
-					</div>
-				</div>';
-
-	if (!empty(Utils::$context['package_ftp']['destination'])) {
-		echo '
-				<form action="', Utils::$context['package_ftp']['destination'], '" method="post" accept-charset="UTF-8">';
-	}
-
-	echo '
-					<fieldset>
-					<dl class="settings">
-						<dt>
-							<label for="ftp_server">', Lang::getTxt('package_ftp_server', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="30" name="ftp_server" id="ftp_server" value="', Utils::$context['package_ftp']['server'], '">
-							<label for="ftp_port">', Lang::getTxt('package_ftp_port', file: 'Packages'), '</label>
-							<input type="text" size="3" name="ftp_port" id="ftp_port" value="', Utils::$context['package_ftp']['port'], '">
-						</dd>
-						<dt>
-							<label for="ftp_username">', Lang::getTxt('package_ftp_username', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="50" name="ftp_username" id="ftp_username" value="', Utils::$context['package_ftp']['username'], '">
-						</dd>
-						<dt>
-							<label for="ftp_password">', Lang::getTxt('package_ftp_password', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="password" size="50" name="ftp_password" id="ftp_password">
-						</dd>
-						<dt>
-							<label for="ftp_path">', Lang::getTxt('package_ftp_path', file: 'Packages'), '</label>
-						</dt>
-						<dd>
-							<input type="text" size="50" name="ftp_path" id="ftp_path" value="', Utils::$context['package_ftp']['path'], '">
-						</dd>
-					</dl>
-					</fieldset>';
-
-	if (empty(Utils::$context['package_ftp']['form_elements_only'])) {
-		echo '
-					<div class="righttext" style="margin: 1ex;">
-						<span id="test_ftp_placeholder_full"></span>
-						<input type="submit" value="', Lang::getTxt('package_proceed', file: 'Packages'), '" class="button">
-					</div>';
-	}
-
-	if (!empty(Utils::$context['package_ftp']['destination'])) {
-		echo '
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				</form>';
-	}
-
-	// Hide the details of the list.
-	if (empty(Utils::$context['package_ftp']['form_elements_only'])) {
-		echo '
-				<script>
-					document.getElementById(\'need_writable_list\').style.display = \'none\';
-				</script>';
-	}
-
-	// Quick generate the test button.
-	echo '
-				<script>
-					// Generate a "test ftp" button.
-					var generatedButton = false;
-					function generateFTPTest()
-					{
-						// Don\'t ever call this twice!
-						if (generatedButton)
-							return false;
-						generatedButton = true;
-
-						// No XML?
-						if (!window.XMLHttpRequest || (!document.getElementById("test_ftp_placeholder") && !document.getElementById("test_ftp_placeholder_full")))
-							return false;
-
-						var ftpTest = document.createElement("input");
-						ftpTest.type = "button";
-						ftpTest.onclick = testFTP;
-
-						if (document.getElementById("test_ftp_placeholder"))
-						{
-							ftpTest.value = "', Lang::getTxt('package_ftp_test', file: 'Packages'), '";
-							document.getElementById("test_ftp_placeholder").appendChild(ftpTest);
-						}
-						else
-						{
-							ftpTest.value = "', Lang::getTxt('package_ftp_test_connection', file: 'Packages'), '";
-							document.getElementById("test_ftp_placeholder_full").appendChild(ftpTest);
-						}
-					}
-					function testFTPResults(oXMLDoc)
-					{
-						ajax_indicator(false);
-
-						// This assumes it went wrong!
-						var wasSuccess = false;
-						var message = "', addcslashes(Lang::getTxt('package_ftp_test_failed', file: 'Packages'), "'"), '";
-
-						var results = oXMLDoc.getElementsByTagName(\'results\')[0].getElementsByTagName(\'result\');
-						if (results.length > 0)
-						{
-							if (results[0].getAttribute(\'success\') == 1)
-								wasSuccess = true;
-							message = results[0].firstChild.nodeValue;
-						}
-
-						document.getElementById("ftp_error_div").style.display = "";
-						document.getElementById("ftp_error_div").style.backgroundColor = wasSuccess ? "green" : "red";
-						document.getElementById("ftp_error_innerdiv").style.backgroundColor = wasSuccess ? "#DBFDC7" : "#FDBDBD";
-
-						setInnerHTML(document.getElementById("ftp_error_message"), message);
-					}
-					generateFTPTest();
-				</script>';
-
-	// Make sure the button gets generated last.
-	Utils::$context['insert_after_template'] .= '
-				<script>
-					generateFTPTest();
-				</script>';
-}
-
-/**
- * Wrapper for the above template function showing that FTP is required
- */
-function template_ftp_required()
-{
-	echo '
-		<fieldset>
-			<legend>
-				', Lang::getTxt('package_ftp_necessary', file: 'Packages'), '
-			</legend>
-			<div class="ftp_details">
-				', template_control_chmod(), '
-			</div>
-		</fieldset>';
-}
-
-/**
- * View operation details.
- */
-function template_view_operations()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Lang::getTxt('operation_title', file: 'Packages'), '</title>
-		', Theme::template_css();
-
-	Theme::template_javascript();
-
-	echo '
-	</head>
-	<body>
-		<div class="padding windowbg">
-			<div class="padding">
-				', Utils::$context['operations']['search'], '
-			</div>
-			<div class="padding">
-				', Utils::$context['operations']['replace'], '
-			</div>
-		</div>
-	</body>
-</html>';
-}
-
-/**
- * The file permissions page.
- */
-function template_file_permissions()
-{
-	// This will handle expanding the selection.
-	echo '
-	<script>
-		var oRadioValues = {
-			0: "read",
-			1: "writable",
-			2: "execute",
-			3: "custom",
-			4: "no_change"
-		}
-		function dynamicAddMore()
-		{
-			ajax_indicator(true);
-
-			getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + \'action=admin;area=packages;fileoffset=\' + (parseInt(this.offset) + ', Utils::$context['file_limit'], ') + \';onlyfind=\' + escape(this.path) + \';sa=perms;xml;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '\', onNewFolderReceived);
-		}
-
-		// Getting something back?
-		function onNewFolderReceived(oXMLDoc)
-		{
-			ajax_indicator(false);
-
-			var fileItems = oXMLDoc.getElementsByTagName(\'folders\')[0].getElementsByTagName(\'folder\');
-
-			// No folders, no longer worth going further.
-			if (fileItems.length < 1)
-			{
-				if (oXMLDoc.getElementsByTagName(\'roots\')[0].getElementsByTagName(\'root\')[0])
-				{
-					var rootName = oXMLDoc.getElementsByTagName(\'roots\')[0].getElementsByTagName(\'root\')[0].firstChild.nodeValue;
-					var itemLink = document.getElementById(\'link_\' + rootName);
-
-					// Move the children up.
-					for (i = 0; i <= itemLink.childNodes.length; i++)
-						itemLink.parentNode.insertBefore(itemLink.childNodes[0], itemLink);
-
-					// And remove the link.
-					itemLink.parentNode.removeChild(itemLink);
-				}
-				return false;
-			}
-			var tableHandle = false;
-			var isMore = false;
-			var ident = "";
-			var my_ident = "";
-			var curLevel = 0;
-
-			for (var i = 0; i < fileItems.length; i++)
-			{
-				if (fileItems[i].getAttribute(\'more\') == 1)
-				{
-					isMore = true;
-					var curOffset = fileItems[i].getAttribute(\'offset\');
-				}
-
-				if (fileItems[i].getAttribute(\'more\') != 1 && document.getElementById("insert_div_loc_" + fileItems[i].getAttribute(\'ident\')))
-				{
-					ident = fileItems[i].getAttribute(\'ident\');
-					my_ident = fileItems[i].getAttribute(\'my_ident\');
-					curLevel = fileItems[i].getAttribute(\'level\') * 5;
-					curPath = fileItems[i].getAttribute(\'path\');
-
-					// Get where we\'re putting it next to.
-					tableHandle = document.getElementById("insert_div_loc_" + fileItems[i].getAttribute(\'ident\'));
-
-					var curRow = document.createElement("tr");
-					curRow.className = "windowbg";
-					curRow.id = "content_" + my_ident;
-					curRow.style.display = "";
-					var curCol = document.createElement("td");
-					curCol.className = "smalltext";
-					curCol.width = "40%";
-
-					// This is the name.
-					var fileName = document.createTextNode(fileItems[i].firstChild.nodeValue);
-
-					// Start by wacking in the spaces.
-					setInnerHTML(curCol, repeatString("&nbsp;", curLevel));
-
-					// Create the actual text.
-					if (fileItems[i].getAttribute(\'folder\') == 1)
-					{
-						var linkData = document.createElement("a");
-						linkData.name = "fol_" + my_ident;
-						linkData.id = "link_" + my_ident;
-						linkData.href = \'#\';
-						linkData.path = curPath + "/" + fileItems[i].firstChild.nodeValue;
-						linkData.ident = my_ident;
-						linkData.onclick = dynamicExpandFolder;
-
-						var folderImage = document.createElement("span");
-						folderImage.className = "main_icons folder";
-						linkData.appendChild(folderImage);
-
-						linkData.appendChild(fileName);
-						curCol.appendChild(linkData);
-					}
-					else
-						curCol.appendChild(fileName);
-
-					curRow.appendChild(curCol);
-
-					// Right, the permissions.
-					curCol = document.createElement("td");
-					curCol.className = "smalltext";
-
-					var writeSpan = document.createElement("span");
-					writeSpan.className = fileItems[i].getAttribute(\'writable\') ? "green" : "red";
-					setInnerHTML(writeSpan, fileItems[i].getAttribute(\'writable\') ? \'', Lang::getTxt('package_file_perms_writable', file: 'Packages'), '\' : \'', Lang::getTxt('package_file_perms_not_writable', file: 'Packages'), '\');
-					curCol.appendChild(writeSpan);
-
-					if (fileItems[i].getAttribute(\'permissions\'))
-					{
-						var permData = document.createTextNode("\u00a0(', Lang::getTxt('package_file_perms_chmod', file: 'Packages'), ': " + fileItems[i].getAttribute(\'permissions\') + ")");
-						curCol.appendChild(permData);
-					}
-
-					curRow.appendChild(curCol);
-
-					// Now add the five radio buttons.
-					for (j = 0; j < 5; j++)
-					{
-						curCol = document.createElement("td");
-						curCol.className = "centertext perm_" + oRadioValues[j];
-						curCol.align = "center";
-
-						var curInput = createNamedElement("input", "permStatus[" + curPath + "/" + fileItems[i].firstChild.nodeValue + "]", j == 4 ? "checked" : "");
-						curInput.type = "radio";
-						curInput.checked = "checked";
-						curInput.value = oRadioValues[j];
-
-						curCol.appendChild(curInput);
-						curRow.appendChild(curCol);
-					}
-
-					// Put the row in.
-					tableHandle.parentNode.insertBefore(curRow, tableHandle);
-
-					// Put in a new dummy section?
-					if (fileItems[i].getAttribute(\'folder\') == 1)
-					{
-						var newRow = document.createElement("tr");
-						newRow.id = "insert_div_loc_" + my_ident;
-						newRow.style.display = "none";
-						tableHandle.parentNode.insertBefore(newRow, tableHandle);
-						var newCol = document.createElement("td");
-						newCol.colspan = 2;
-						newRow.appendChild(newCol);
-					}
-				}
-			}
-
-			// Is there some more to remove?
-			if (document.getElementById("content_" + ident + "_more"))
-			{
-				document.getElementById("content_" + ident + "_more").parentNode.removeChild(document.getElementById("content_" + ident + "_more"));
-			}
-
-			// Add more?
-			if (isMore && tableHandle)
-			{
-				// Create the actual link.
-				var linkData = document.createElement("a");
-				linkData.href = \'#fol_\' + my_ident;
-				linkData.path = curPath;
-				linkData.offset = curOffset;
-				linkData.onclick = dynamicAddMore;
-
-				linkData.appendChild(document.createTextNode(\'', Lang::getTxt('package_file_perms_more_files', file: 'Packages'), '\'));
-
-				curRow = document.createElement("tr");
-				curRow.className = "windowbg";
-				curRow.id = "content_" + ident + "_more";
-				tableHandle.parentNode.insertBefore(curRow, tableHandle);
-				curCol = document.createElement("td");
-				curCol.className = "smalltext";
-				curCol.width = "40%";
-
-				setInnerHTML(curCol, repeatString("&nbsp;", curLevel));
-				curCol.appendChild(document.createTextNode(\'\\u00ab \'));
-				curCol.appendChild(linkData);
-				curCol.appendChild(document.createTextNode(\' \\u00bb\'));
-
-				curRow.appendChild(curCol);
-				curCol = document.createElement("td");
-				curCol.className = "smalltext";
-				curRow.appendChild(curCol);
-			}
-
-			// Keep track of it.
-			var curInput = createNamedElement("input", "back_look[]");
-			curInput.type = "hidden";
-			curInput.value = curPath;
-
-			curCol.appendChild(curInput);
-		}
-	</script>';
-
-	echo '
-	<div class="noticebox">
-		<div>
-			<strong>', Lang::getTxt('package_file_perms_warning', file: 'Packages'), '</strong>
-			<div class="smalltext">
-				<ol style="margin-top: 2px; margin-bottom: 2px">
-					', Lang::getTxt('package_file_perms_warning_desc', file: 'Packages'), '
-				</ol>
-			</div>
-		</div>
-	</div>
-
-	<form action="', Config::$scripturl, '?action=admin;area=packages;sa=perms;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="floatleft">', Lang::getTxt('package_file_perms', file: 'Admin'), '</span><span class="perms_status floatright">', Lang::getTxt('package_file_perms_new_status', file: 'Packages'), '</span>
-			</h3>
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext" width="30%">', Lang::getTxt('package_file_perms_name', file: 'Packages'), '</th>
-					<th width="30%" class="lefttext">', Lang::getTxt('package_file_perms_status', file: 'Packages'), '</th>
-					<th width="8%"><span class="file_permissions">', Lang::getTxt('package_file_perms_status_read', file: 'Packages'), '</span></th>
-					<th width="8%"><span class="file_permissions">', Lang::getTxt('package_file_perms_status_write', file: 'Packages'), '</span></th>
-					<th width="8%"><span class="file_permissions">', Lang::getTxt('package_file_perms_status_execute', file: 'Packages'), '</span></th>
-					<th width="8%"><span class="file_permissions">', Lang::getTxt('package_file_perms_status_custom', file: 'Packages'), '</span></th>
-					<th width="8%"><span class="file_permissions">', Lang::getTxt('package_file_perms_status_no_change', file: 'Packages'), '</span></th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	foreach (Utils::$context['file_tree'] as $name => $dir) {
-		echo '
-				<tr class="windowbg">
-					<td width="30%">
-						<strong>';
-
-		if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
-			echo '
-							<span class="main_icons folder"></span>';
-		}
-
-		echo '
-							', $name, '
-						</strong>
-					</td>
-					<td width="30%">
-						<span style="color: ', ($dir['perms']['chmod'] ? 'green' : 'red'), '">', Lang::getTxt($dir['perms']['chmod'] ? 'package_file_perms_writable' : 'package_file_perms_not_writable', file: 'Packages'), '</span>
-						', ($dir['perms']['perms'] ? ' (' . Lang::getTxt('package_file_perms_chmod', file: 'Packages') . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : ''), '
-					</td>
-					<td class="centertext perm_read">
-						<input type="radio" name="permStatus[', $name, ']" value="read" class="centertext">
-					</td>
-					<td class="centertext perm_writable">
-						<input type="radio" name="permStatus[', $name, ']" value="writable" class="centertext">
-					</td>
-					<td class="centertext perm_execute">
-						<input type="radio" name="permStatus[', $name, ']" value="execute" class="centertext">
-					</td>
-					<td class="centertext perm_custom">
-						<input type="radio" name="permStatus[', $name, ']" value="custom" class="centertext">
-					</td>
-					<td class="centertext perm_no_change">
-						<input type="radio" name="permStatus[', $name, ']" value="no_change" checked class="centertext">
-					</td>
-				</tr>';
-
-		if (!empty($dir['contents'])) {
-			template_permission_show_contents($name, $dir['contents'], 1);
-		}
-	}
-
-	echo '
-			</tbody>
-		</table>
-		<br>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('package_file_perms_change', file: 'Packages'), '</h3>
-		</div>
-		<div class="windowbg">
-			<fieldset>
-				<dl>
-					<dt>
-						<input type="radio" name="method" value="individual" checked id="method_individual">
-						<label for="method_individual"><strong>', Lang::getTxt('package_file_perms_apply', file: 'Packages'), '</strong></label>
-					</dt>
-					<dd>
-						<em class="smalltext">', Lang::getTxt('package_file_perms_custom', file: 'Packages'), ' <input type="text" name="custom_value" value="0755" maxlength="4" size="5"> <a href="', Config::$scripturl, '?action=helpadmin;help=chmod_flags" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></em>
-					</dd>
-					<dt>
-						<input type="radio" name="method" value="predefined" id="method_predefined">
-						<label for="method_predefined"><strong>', Lang::getTxt('package_file_perms_predefined', file: 'Packages'), '</strong></label>
-						<select name="predefined" onchange="document.getElementById(\'method_predefined\').checked = \'checked\';">
-							<option value="restricted" selected>', Lang::getTxt('package_file_perms_pre_restricted', file: 'Packages'), '</option>
-							<option value="standard">', Lang::getTxt('package_file_perms_pre_standard', file: 'Packages'), '</option>
-							<option value="free">', Lang::getTxt('package_file_perms_pre_free', file: 'Packages'), '</option>
-						</select>
-					</dt>
-					<dd>
-						<em class="smalltext">', Lang::getTxt('package_file_perms_predefined_note', file: 'Packages'), '</em>
-					</dd>
-				</dl>
-			</fieldset>';
-
-	// Likely to need FTP?
-	if (empty(Utils::$context['ftp_connected'])) {
-		echo '
-			<p>
-				', Lang::getTxt('package_file_perms_ftp_details', file: 'Packages'), '
-			</p>
-			', template_control_chmod(), '
-			<div class="noticebox">', Lang::getTxt('package_file_perms_ftp_retain', file: 'Packages'), '</div>';
-	}
-
-	echo '
-			<span id="test_ftp_placeholder_full"></span>
-			<input type="hidden" name="action_changes" value="1">
-			<input type="submit" value="', Lang::getTxt('package_file_perms_go', file: 'Packages'), '" name="go" class="button">
-		</div><!-- .windowbg -->';
-
-	// Any looks fors we've already done?
-	foreach (Utils::$context['look_for'] as $path) {
-		echo '
-		<input type="hidden" name="back_look[]" value="', $path, '">';
-	}
-
-	echo '
-	</form>
-	<br>';
-}
-
-/**
- * Shows permissions for items within a directory (called from template_file_permissions)
- *
- * @param string $ident A unique ID - typically the directory name
- * @param array $contents An array of items within the directory
- * @param int $level How far to go inside the directory
- * @param bool $has_more Whether there are more files to display besides what's in $contents
- */
-function template_permission_show_contents($ident, $contents, $level, $has_more = false)
-{
-	$js_ident = preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident);
-
-	// Have we actually done something?
-	$drawn_div = false;
-
-	foreach ($contents as $name => $dir) {
-		if (isset($dir['perms'])) {
-			if (!$drawn_div) {
-				$drawn_div = true;
-				echo '
-			</tbody>
-			<tbody class="table_grid" id="', $js_ident, '">';
-			}
-
-			$cur_ident = preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident . '/' . $name);
-
-			echo '
-				<tr class="windowbg" id="content_', $cur_ident, '">
-					<td class="smalltext" width="30%">' . str_repeat('&nbsp;', $level * 5), '
-					', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '<a id="link_' . $cur_ident . '" href="' . Config::$scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident . '/' . $name) . ';back_look=' . Utils::$context['back_look_data'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '#fol_' . $cur_ident . '" onclick="return expandFolder(\'' . $cur_ident . '\', \'' . addcslashes($ident . '/' . $name, "'\\") . '\');">' : '';
-
-			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
-				echo '
-						<span class="main_icons folder"></span>';
-			}
-
-			echo '
-						', $name, '
-						', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '</a>' : '', '
-					</td>
-					<td class="smalltext">
-						<span class="', ($dir['perms']['chmod'] ? 'success' : 'error'), '">', Lang::getTxt($dir['perms']['chmod'] ? 'package_file_perms_writable' : 'package_file_perms_not_writable', file: 'Packages'), '</span>
-						', ($dir['perms']['perms'] ? ' (' . Lang::getTxt('package_file_perms_chmod', file: 'Packages') . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : ''), '
-					</td>
-					<td class="centertext perm_read"><input type="radio" name="permStatus[', $ident . '/' . $name, ']" value="read"></td>
-					<td class="centertext perm_writable"><input type="radio" name="permStatus[', $ident . '/' . $name, ']" value="writable"></td>
-					<td class="centertext perm_execute"><input type="radio" name="permStatus[', $ident . '/' . $name, ']" value="execute"></td>
-					<td class="centertext perm_custom"><input type="radio" name="permStatus[', $ident . '/' . $name, ']" value="custom"></td>
-					<td class="centertext perm_no_change"><input type="radio" name="permStatus[', $ident . '/' . $name, ']" value="no_change" checked></td>
-				</tr>
-				<tr id="insert_div_loc_' . $cur_ident . '" style="display: none;"><td></td></tr>';
-
-			if (!empty($dir['contents'])) {
-				template_permission_show_contents($ident . '/' . $name, $dir['contents'], $level + 1, !empty($dir['more_files']));
-			}
-		}
-	}
-
-	// We have more files to show?
-	if ($has_more) {
-		echo '
-				<tr class="windowbg" id="content_', $js_ident, '_more">
-					<td class="smalltext" width="40%">' . str_repeat('&nbsp;', $level * 5), '
-						<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident) . ';fileoffset=', (Utils::$context['file_offset'] + Utils::$context['file_limit']), ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '#fol_' . preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident) . '">', Lang::getTxt('package_file_perms_more_files', file: 'Packages'), '</a>
-					</td>
-					<td colspan="6"></td>
-				</tr>';
-	}
-
-	if ($drawn_div) {
-		// Hide anything too far down the tree.
-		$isFound = false;
-
-		foreach (Utils::$context['look_for'] as $tree) {
-			if (str_starts_with($tree, $ident)) {
-				$isFound = true;
-			}
-		}
-
-		if ($level > 1 && !$isFound) {
-			echo '
-		<script>
-			expandFolder(\'', $js_ident, '\', \'\');
-		</script>';
-		}
-	}
-}
-
-/**
- * A progress page showing what permissions changes are being applied
- */
-function template_action_permissions()
-{
-	$countDown = 3;
-
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=packages;sa=perms;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" name="perm_submit" id="perm_submit" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('package_file_perms_applying', file: 'Packages'), '</h3>
-			</div>';
-
-	if (!empty(Utils::$context['skip_ftp'])) {
-		echo '
-			<div class="errorbox">
-				', Lang::getTxt('package_file_perms_skipping_ftp', file: 'Packages'), '
-			</div>';
-	}
-
-	// How many have we done?
-	$remaining_items = count(Utils::$context['method'] == 'individual' ? Utils::$context['to_process'] : Utils::$context['directory_list']);
-
-	$progress_message = Lang::getTxt(
-		Utils::$context['method'] == 'individual' ? 'package_file_perms_items_done' : 'package_file_perms_dirs_done',
-		[
-			Utils::$context['total_items'] - $remaining_items,
-			Utils::$context['total_items'],
-		],
-		file: 'Packages',
-	);
-
-	$progress_percent = round((Utils::$context['total_items'] - $remaining_items) / Utils::$context['total_items'] * 100, 1);
-
-	echo '
-			<div class="windowbg">
-				<div>
-					<strong>', $progress_message, '</strong><br>
-					<div class="progress_bar progress_blue">
-						<span>', $progress_percent, '%</span>
-						<div class="bar" style="width: ', $progress_percent, '%;"></div>
-					</div>
-				</div>';
-
-	// Second progress bar for a specific directory?
-	if (Utils::$context['method'] != 'individual' && !empty(Utils::$context['total_files'])) {
-		$file_progress_message = Lang::getTxt(
-			'package_file_perms_files_done',
-			[
-				Utils::$context['file_offset'],
-				Utils::$context['total_files'],
-			],
-			file: 'Packages',
-		);
-
-		$file_progress_percent = round(Utils::$context['file_offset'] / Utils::$context['total_files'] * 100, 1);
-
-		echo '
-				<br>
-				<div>
-					<strong>', $file_progress_message, '</strong><br>
-					<div class="progress_bar">
-						<span>', $file_progress_percent, '%</span>
-						<div class="bar" style="width: ', $file_progress_percent, '%;"></div>
-					</div>
-				</div>';
-	}
-
-	echo '
-				<br>';
-
-	// Put out the right hidden data.
-	if (Utils::$context['method'] == 'individual') {
-		echo '
-				<input type="hidden" name="custom_value" value="', Utils::$context['custom_value'], '">
-				<input type="hidden" name="totalItems" value="', Utils::$context['total_items'], '">
-				<input type="hidden" name="toProcess" value="', Utils::$context['to_process_encode'], '">';
-	} else {
-	echo '
-				<input type="hidden" name="predefined" value="', Utils::$context['predefined_type'], '">
-				<input type="hidden" name="fileOffset" value="', Utils::$context['file_offset'], '">
-				<input type="hidden" name="totalItems" value="', Utils::$context['total_items'], '">
-				<input type="hidden" name="dirList" value="', Utils::$context['directory_list_encode'], '">
-				<input type="hidden" name="specialFiles" value="', Utils::$context['special_files_encode'], '">';
-	}
-
-	// Are we not using FTP for whatever reason.
-	if (!empty(Utils::$context['skip_ftp'])) {
-		echo '
-				<input type="hidden" name="skip_ftp" value="1">';
-	}
-
-	// Retain state.
-	foreach (Utils::$context['back_look_data'] as $path) {
-		echo '
-				<input type="hidden" name="back_look[]" value="', $path, '">';
-	}
-
-	echo '
-				<input type="hidden" name="method" value="', Utils::$context['method'], '">
-				<input type="hidden" name="action_changes" value="1">
-				<div class="righttext padding">
-					<input type="submit" name="go" id="cont" value="', Lang::getTxt('not_done_continue', file: 'Admin'), '" class="button">
-				</div>
-			</div><!-- .windowbg -->
-		</form>';
-
-	// Just the countdown stuff
-	echo '
-	<script>
-		doAutoSubmit(', $countDown, ', ', Utils::escapeJavaScript(Lang::getTxt('not_done_continue', file: 'Admin')), ', "perm_submit", "go");
-	</script>';
-}
diff --git a/Themes/default/PersonalMessage.template.php b/Themes/default/PersonalMessage.template.php
deleted file mode 100644
index 53ee0f8c6bd..00000000000
--- a/Themes/default/PersonalMessage.template.php
+++ /dev/null
@@ -1,2014 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * This is for stuff above the menu in the personal messages section
- */
-function template_pm_above()
-{
-	echo '
-	<div id="personal_messages">';
-
-	// Show the capacity bar, if available.
-	if (!empty(Utils::$context['limit_bar'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="floatleft">', Lang::getTxt('pm_capacity', file: 'PersonalMessage'), '</span>
-				<span class="floatleft capacity_bar">
-					<span class="', Utils::$context['limit_bar']['percent'] > 85 ? 'full' : (Utils::$context['limit_bar']['percent'] > 40 ? 'filled' : 'empty'), '" style="width: ', Utils::$context['limit_bar']['percent'] / 10, 'em;"></span>
-				</span>
-				<span class="floatright', Utils::$context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', Utils::$context['limit_bar']['text'], '</span>
-			</h3>
-		</div>';
-	}
-
-	// Message sent? Show a small indication.
-	if (isset(Utils::$context['pm_sent'])) {
-		echo '
-		<div class="infobox">
-			', Lang::getTxt('pm_sent', file: 'PersonalMessage'), '
-		</div>';
-	}
-}
-
-/**
- * Just the end of the index bar, nothing special.
- */
-function template_pm_below()
-{
-	echo '
-	</div><!-- #personal_messages -->';
-}
-
-/**
- * Displays a popup with information about your personal messages
- */
-function template_pm_popup()
-{
-	// Unlike almost every other template, this is designed to be included into the HTML directly via $().load()
-	echo '
-		<div class="pm_bar">
-			<div class="pm_sending block">
-				', Utils::$context['can_send_pm'] ? '<a href="' . Config::$scripturl . '?action=pm;sa=send">' . Lang::getTxt('pm_new_short', file: 'PersonalMessage') . '</a>' : '', '
-				', Utils::$context['can_draft'] ? ' | <a href="' . Config::$scripturl . '?action=pm;f=drafts">' . Lang::getTxt('pm_drafts_short', file: 'PersonalMessage') . '</a>' : '', '
-				<a href="', Config::$scripturl, '?action=pm;sa=settings" class="floatright">', Lang::getTxt('pm_settings_short', file: 'PersonalMessage'), '</a>
-			</div>
-			<div class="pm_mailbox centertext">
-				<a href="', Config::$scripturl, '?action=pm;f=inbox" class="button">', Lang::getTxt('inbox', file: 'PersonalMessage'), '</a>
-				<a href="', Config::$scripturl, '?action=pm;f=sent" class="button">', Lang::getTxt('sent_items', file: 'PersonalMessage'), '</a>
-			</div>
-		</div>
-		<div class="pm_unread">';
-
-	if (empty(Utils::$context['unread_pms'])) {
-		echo '
-			<div class="no_unread">', Lang::getTxt('pm_no_unread', file: 'PersonalMessage'), '</div>';
-	} else {
-		foreach (Utils::$context['unread_pms'] as $id_pm => $pm_details) {
-			echo '
-			<div class="unread_notify">
-				<div class="unread_notify_image">
-					', !empty($pm_details['member']) ? $pm_details['member']['avatar']['image'] : '', '
-				</div>
-				<div class="details">
-					<div class="subject">', $pm_details['pm_link'], '</div>
-					<div class="sender">
-						', $pm_details['replied_to_you'] ? '<span class="main_icons replied centericon" style="margin-right: 4px" title="' . Lang::getTxt('pm_you_were_replied_to', file: 'PersonalMessage') . '"></span>' : '<span class="main_icons im_off centericon" style="margin-right: 4px" title="' . Lang::getTxt('pm_was_sent_to_you', file: 'PersonalMessage') . '"></span>',
-						!empty($pm_details['member']) ? $pm_details['member']['link'] : $pm_details['member_from'], ' - ', $pm_details['time'], '
-					</div>
-				</div>
-			</div>';
-		}
-	}
-
-	echo '
-		</div><!-- #pm_unread -->';
-}
-
-/**
- * Shows a particular folder (eg inbox or outbox), all the PMs in it, etc.
- */
-function template_folder()
-{
-	// The every helpful javascript!
-	echo '
-		<script>
-			var allLabels = {};
-			var currentLabels = {};
-			function loadLabelChoices()
-			{
-				var listing = document.forms.pmFolder.elements;
-				var theSelect = document.forms.pmFolder.pm_action;
-				var add, remove, toAdd = {length: 0}, toRemove = {length: 0};
-
-				if (theSelect.childNodes.length == 0)
-					return;
-
-				// This is done this way for internationalization reasons.
-				if (!(\'-1\' in allLabels))
-				{
-					for (var o = 0; o < theSelect.options.length; o++)
-						if (theSelect.options[o].value.substr(0, 4) == "rem_")
-							allLabels[theSelect.options[o].value.substr(4)] = theSelect.options[o].text;
-				}
-
-				for (var i = 0; i < listing.length; i++)
-				{
-					if (listing[i].name != "pms[]" || !listing[i].checked)
-						continue;
-
-					var alreadyThere = [], x;
-					for (x in currentLabels[listing[i].value])
-					{
-						if (!(x in toRemove))
-						{
-							toRemove[x] = allLabels[x];
-							toRemove.length++;
-						}
-						alreadyThere[x] = allLabels[x];
-					}
-
-					for (x in allLabels)
-					{
-						if (!(x in alreadyThere))
-						{
-							toAdd[x] = allLabels[x];
-							toAdd.length++;
-						}
-					}
-				}
-
-				while (theSelect.options.length > 2)
-					theSelect.options[2] = null;
-
-				if (toAdd.length != 0)
-				{
-					theSelect.options[theSelect.options.length] = new Option("', Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage'), '", "");
-					setInnerHTML(theSelect.options[theSelect.options.length - 1], "', Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage'), '");
-					theSelect.options[theSelect.options.length - 1].disabled = true;
-
-					for (i in toAdd)
-					{
-						if (i != "length")
-							theSelect.options[theSelect.options.length] = new Option(toAdd[i], "add_" + i);
-					}
-				}
-
-				if (toRemove.length != 0)
-				{
-					theSelect.options[theSelect.options.length] = new Option("', Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage'), '", "");
-					setInnerHTML(theSelect.options[theSelect.options.length - 1], "', Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage'), '");
-					theSelect.options[theSelect.options.length - 1].disabled = true;
-
-					for (i in toRemove)
-					{
-						if (i != "length")
-							theSelect.options[theSelect.options.length] = new Option(toRemove[i], "rem_" + i);
-					}
-				}
-			}
-		</script>';
-
-	echo '
-		<form class="flow_hidden" action="', Config::$scripturl, '?action=pm;sa=pmactions;', Utils::$context['display_mode'] == 2 ? 'conversation;' : '', 'f=', Utils::$context['folder'], ';start=', Utils::$context['start'], Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '', '" method="post" accept-charset="UTF-8" name="pmFolder" id="pmFolder">';
-
-	// If we are not in single display mode show the subjects on the top!
-	if (Utils::$context['display_mode'] != 1) {
-		template_subject_list();
-
-		echo '
-			<div class="clear_right"><br></div>';
-	}
-
-	// Got some messages to display?
-	if (Utils::$context['get_pmessage']('message', true)) {
-		// Show a few buttons if we are in conversation mode and outputting the first message.
-		if (Utils::$context['display_mode'] == 2) {
-			// This bit uses info set in template_subject_list, so it's wrapped
-			// in an if just in case a mod or custom theme breaks it.
-			if (!empty(Utils::$context['current_pm_subject'])) {
-				echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span>', Lang::getTxt('conversation', file: 'PersonalMessage'), '</span>
-				</h3>
-			</div>
-			<div class="roundframe">
-				<div class="display_title">', Utils::$context['current_pm_subject'], '</div>
-				<p>', Lang::getTxt('started_by_member_time', ['member' => Utils::$context['current_pm_author'], 'time' => Utils::$context['current_pm_time']], file: 'General'), '</p>';
-			} else {
-				echo '
-			<div class="roundframe">';
-			}
-
-			// Show the conversation buttons.
-			template_button_strip(Utils::$context['conversation_buttons'], 'right');
-
-			echo '
-			</div>';
-		}
-
-		while ($message = Utils::$context['get_pmessage']('message')) {
-			template_single_pm($message);
-		}
-
-		if (empty(Utils::$context['display_mode'])) {
-			echo '
-			<div class="pagesection">
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>
-				<div class="floatright">
-					<input type="submit" name="del_selected" value="', Lang::getTxt('quickmod_delete_selected', file: 'General'), '" data-confirm="', Lang::getTxt('delete_selected_confirm', file: 'PersonalMessage'), '" class="button you_sure">
-				</div>
-			</div>';
-		}
-
-		// Show a few buttons if we are in conversation mode and outputting the first message.
-		elseif (Utils::$context['display_mode'] == 2 && isset(Utils::$context['conversation_buttons'])) {
-			echo '
-			<div class="pagesection">';
-
-			template_button_strip(Utils::$context['conversation_buttons'], 'right');
-
-			echo '
-			</div>';
-		}
-
-		echo '
-			<br>';
-	}
-
-	// Individual messages = button list!
-	if (Utils::$context['display_mode'] == 1) {
-		template_subject_list();
-		echo '<br>';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>';
-}
-
-/**
- * Template for displaying a single personal message.
- *
- * @param array $message An array of information about the message to display.
- */
-function template_single_pm($message)
-{
-	echo '
-	<div class="windowbg" id="msg', $message['id'],'">
-		<div class="post_wrapper">
-			<div class="poster">';
-
-	// Are there any custom fields above the member name?
-	if (!empty($message['custom_fields']['above_member'])) {
-		echo '
-				<div class="custom_fields_above_member">
-					<ul class="nolist">';
-
-		foreach ($message['custom_fields']['above_member'] as $custom) {
-			echo '
-						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-					</ul>
-				</div>';
-	}
-
-	echo '
-				<h4>';
-
-	// Show online and offline buttons?
-	if (!empty(Config::$modSettings['onlineEnable']) && !$message['member']['is_guest']) {
-		echo '
-					<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>';
-	}
-
-	// Custom fields BEFORE the username?
-	if (!empty($message['custom_fields']['before_member'])) {
-		foreach ($message['custom_fields']['before_member'] as $custom) {
-			echo '
-					<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
-		}
-	}
-
-	// Show a link to the member's profile.
-	echo '
-		', $message['member']['link'];
-
-	// Custom fields AFTER the username?
-	if (!empty($message['custom_fields']['after_member'])) {
-		foreach ($message['custom_fields']['after_member'] as $custom) {
-			echo '
-					<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
-		}
-	}
-
-	echo '
-				</h4>';
-
-	echo '
-				<ul class="user_info">';
-
-	// Show the member's custom title, if they have one.
-	if (isset($message['member']['title']) && $message['member']['title'] != '') {
-		echo '
-					<li class="title">', $message['member']['title'], '</li>';
-	}
-
-	// Show the member's primary group (like 'Administrator') if they have one.
-	if (isset($message['member']['group']) && $message['member']['group'] != '') {
-		echo '
-					<li class="membergroup">', $message['member']['group'], '</li>';
-	}
-
-	// Show the user's avatar.
-	if (!empty(Config::$modSettings['show_user_images']) && empty(Theme::$current->options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
-		echo '
-					<li class="avatar">
-						<a href="', Config::$scripturl, '?action=profile;u=', $message['member']['id'], '">', $message['member']['avatar']['image'], '</a>
-					</li>';
-	}
-
-	// Are there any custom fields below the avatar?
-	if (!empty($message['custom_fields']['below_avatar'])) {
-		foreach ($message['custom_fields']['below_avatar'] as $custom) {
-			echo '
-					<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-	}
-
-	// Don't show these things for guests.
-	if (!$message['member']['is_guest']) {
-		// Show the post group icons
-		echo '
-					<li class="icons">', $message['member']['group_icons'], '</li>';
-
-		// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-		if ((empty(Config::$modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '') {
-			echo '
-					<li class="postgroup">', $message['member']['post_group'], '</li>';
-		}
-
-		// Show how many posts they have made.
-		if (!isset(Utils::$context['disabled_fields']['posts'])) {
-			echo '
-					<li class="postcount">', Lang::getTxt('member_postcount_num', [$message['member']['posts']], file: 'General'), '</li>';
-		}
-
-		// Show their personal text?
-		if (!empty(Config::$modSettings['show_blurb']) && $message['member']['blurb'] != '') {
-			echo '
-					<li class="blurb">', $message['member']['blurb'], '</li>';
-		}
-
-		// Any custom fields to show as icons?
-		if (!empty($message['custom_fields']['icons'])) {
-			echo '
-					<li class="im_icons">
-						<ol>';
-
-			foreach ($message['custom_fields']['icons'] as $custom) {
-				echo '
-							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-			}
-
-			echo '
-						</ol>
-					</li>';
-		}
-
-		// Show the IP to this user for this post - because you can moderate?
-		if (!empty(Utils::$context['can_moderate_forum']) && !empty($message['member']['ip'])) {
-			echo '
-					<li class="poster_ip">
-						<a href="', Config::$scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', Config::$scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
-					</li>';
-		}
-
-		// Or, should we show it because this is you?
-		elseif ($message['can_see_ip']) {
-			echo '
-					<li class="poster_ip">
-						<a href="', Config::$scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a>
-					</li>';
-		}
-
-		// Okay, you are logged in, then we can show something about why IPs are logged...
-		else {
-		echo '
-					<li class="poster_ip">
-						<a href="', Config::$scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', Lang::getTxt('logged', file: 'General'), '</a>
-					</li>';
-		}
-
-		// Show the profile, website, email address, and personal message buttons.
-		if ($message['member']['show_profile_buttons']) {
-			echo '
-					<li class="profile">
-						<ol class="profile_icons">';
-
-			// Show the profile button
-			if ($message['member']['can_view_profile']) {
-				echo '
-							<li><a href="', $message['member']['href'], '" title="' . Lang::getTxt('view_profile', file: 'General') . '"><span class="main_icons members"></span></a></li>';
-			}
-
-			// Don't show an icon if they haven't specified a website.
-			if ($message['member']['website']['url'] != '' && !isset(Utils::$context['disabled_fields']['website'])) {
-				echo '
-							<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" rel="noopener"><span class="main_icons www centericon" title="' . $message['member']['website']['title'] . '"></span></a></li>';
-			}
-
-			// Don't show the email address if they want it hidden.
-			if ($message['member']['show_email']) {
-				echo '
-							<li><a href="mailto:', $message['member']['email'], '" rel="nofollow"><span class="main_icons mail centericon" title="' . Lang::getTxt('email', file: 'General') . '"></span></a></li>';
-			}
-
-			// Since we know this person isn't a guest, you *can* message them.
-			if (Utils::$context['can_send_pm'] && $message['member']['id'] != 0) {
-				echo '
-							<li><a href="', Config::$scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General'), '"><span class="main_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') . '"></span></a></li>';
-			}
-
-			echo '
-						</ol>
-					</li>';
-		}
-
-		// Any custom fields for standard placement?
-		if (!empty($message['custom_fields']['standard'])) {
-			foreach ($message['custom_fields']['standard'] as $custom) {
-				echo '
-					<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
-			}
-		}
-
-		// Are we showing the warning status?
-		if ($message['member']['can_see_warning']) {
-			echo '
-					<li class="warning">', Utils::$context['can_issue_warning'] ? '<a href="' . Config::$scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="main_icons warning_', $message['member']['warning_status'], '"></span>', Utils::$context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', Lang::getTxt('warn_' . $message['member']['warning_status'], file: 'General'), '</span></li>';
-		}
-
-		// Are there any custom fields to show at the bottom of the poster info?
-		if (!empty($message['custom_fields']['bottom_poster'])) {
-			foreach ($message['custom_fields']['bottom_poster'] as $custom) {
-				echo '
-					<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-			}
-		}
-	}
-
-	// Done with the information about the poster... on to the post itself.
-	echo '
-				</ul>
-			</div><!-- .poster -->
-			<div class="postarea">
-				<div class="keyinfo">
-					<div id="subject_', $message['id'], '" class="subject_title">
-						<h5>', $message['subject'], '</h5>
-					</div>
-					<div class="postinfo">';
-
-	// Show who the message was sent to.
-	echo '
-						<span class="smalltext">',
-						Lang::getTxt(
-							'sent_to_date',
-							[
-								'list' => !empty($message['recipients']['to']) ? Lang::sentenceList($message['recipients']['to']) : Lang::getTxt('pm_undisclosed_recipients', file: 'PersonalMessage'),
-								'relative' => str_contains($message['time'], Lang::getTxt('today', file: 'General')) ? 'today' : (str_contains($message['time'], Lang::getTxt('yesterday', file: 'General')) ? 'yesterday' : 'false'),
-								'date' => $message['time'],
-							],
-							file: 'PersonalMessage',
-						),
-						'</span>';
-
-	// If we're in the sent items, show who it was sent to besides the "To:" people.
-	if (!empty($message['recipients']['bcc'])) {
-		echo '
-						<span class="smalltext">', Lang::getTxt('pm_bcc', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $message['recipients']['bcc'])]), ' </span>';
-	}
-
-	if (!empty($message['is_replied_to'])) {
-		echo '
-						<span class="smalltext">', Lang::getTxt(Utils::$context['folder'] == 'sent' ? 'pm_sent_is_replied_to' : 'pm_is_replied_to', file: 'PersonalMessage'), ' </span>';
-	}
-
-	echo '
-					</div><!-- .postinfo -->
-				</div><!-- .keyinfo -->
-				<div class="post">
-					<div class="inner" id="msg_', $message['id'], '"', '>
-						', $message['body'], '
-					</div>
-				</div><!-- .post -->
-				<div class="under_message">';
-
-	// Add an extra line at the bottom if we have labels enabled.
-	if (Utils::$context['folder'] != 'sent' && !empty(Utils::$context['currently_using_labels']) && Utils::$context['display_mode'] != 2) {
-		echo '
-				<div class="labels floatleft">';
-
-		// Add the label drop down box.
-		if (!empty(Utils::$context['currently_using_labels'])) {
-			echo '
-					<select name="pm_actions[', $message['id'], ']" onchange="if (this.options[this.selectedIndex].value) form.submit();">
-						<option value="">', Lang::getTxt('pm_msg_label_title', file: 'PersonalMessage'), '</option>
-						<option value="" disabled>---------------</option>';
-
-			// Are there any labels which can be added to this?
-			// The two lists below hold the same label IDs, so say which list
-			// this one came from. That is what applyActions() reads, and what
-			// loadLabelChoices() puts on the drop down for the whole folder.
-			if (!$message['fully_labeled']) {
-				echo '
-						<option value="" disabled>', Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage'), '</option>';
-
-				foreach (Utils::$context['labels'] as $label) {
-					if (!isset($message['labels'][$label['id']])) {
-						echo '
-						<option value="add_', $label['id'], '">', $label['name'], '</option>';
-					}
-				}
-			}
-
-			// ... and are there any that can be removed?
-			if (!empty($message['labels']) && (count($message['labels']) > 1 || !isset($message['labels'][-1]))) {
-				echo '
-						<option value="" disabled>', Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage'), '</option>';
-
-				foreach ($message['labels'] as $label) {
-					echo '
-						<option value="rem_', $label['id'], '">&nbsp;', $label['name'], '</option>';
-				}
-			}
-			echo '
-					</select>
-					<noscript>
-						<input type="submit" value="', Lang::getTxt('pm_apply', file: 'PersonalMessage'), '" class="button">
-					</noscript>';
-		}
-		echo '
-				</div><!-- .labels -->';
-	}
-
-	// Message options
-	template_quickbuttons($message['quickbuttons'], 'pm');
-
-	echo '
-				</div><!-- .under_message -->
-			</div><!-- .postarea -->
-			<div class="moderatorbar">';
-
-	// Are there any custom profile fields for above the signature?
-	if (!empty($message['custom_fields']['above_signature'])) {
-		echo '
-				<div class="custom_fields_above_signature">
-					<ul class="nolist">';
-
-		foreach ($message['custom_fields']['above_signature'] as $custom) {
-			echo '
-						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-					</ul>
-				</div>';
-	}
-
-	// Show the member's signature?
-	if (!empty($message['member']['signature']) && empty(Theme::$current->options['show_no_signatures']) && Utils::$context['signature_enabled']) {
-		echo '
-				<div class="signature">
-					', $message['member']['signature'], '
-				</div>';
-	}
-
-	// Are there any custom profile fields for below the signature?
-	if (!empty($message['custom_fields']['below_signature'])) {
-		echo '
-				<div class="custom_fields_below_signature">
-					<ul class="nolist">';
-
-		foreach ($message['custom_fields']['below_signature'] as $custom) {
-			echo '
-						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
-		}
-
-		echo '
-					</ul>
-				</div>';
-	}
-
-	echo '
-			</div><!-- .moderatorbar -->
-		</div><!-- .post_wrapper -->
-	</div><!-- .windowbg -->';
-}
-
-/**
- * Just list all the personal message subjects - to make templates easier.
- */
-function template_subject_list()
-{
-	echo '
-	<div class="cat_bar">
-		<h3 class="catbg">
-			', Utils::$context['folder'] == 'sent' ? Lang::getTxt('sent_items', file: 'PersonalMessage') : Utils::$context['current_label'], '
-		</h3>
-	</div>
-	<table class="table_grid">
-		<thead>
-			<tr class="title_bar">
-				<th class="centercol table_icon pm_icon">
-					<a href="', Config::$scripturl, '?action=pm;view;f=', Utils::$context['folder'], ';start=', Utils::$context['start'], ';sort=', Utils::$context['sort_by'], (Utils::$context['sort_direction'] == 'up' ? '' : ';desc'), (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : ''), '"> <span class="main_icons switch" title="', Lang::getTxt('pm_change_view', file: 'PersonalMessage'), '"></span></a>
-				</th>
-				<th class="lefttext quarter_table pm_time">
-					<a href="', Config::$scripturl, '?action=pm;f=', Utils::$context['folder'], ';start=', Utils::$context['start'], ';sort=date', Utils::$context['sort_by'] == 'date' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '', '">', Lang::getTxt('date', file: 'General'), Utils::$context['sort_by'] == 'date' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a>
-				</th>
-				<th class="lefttext half_table pm_subject">
-					<a href="', Config::$scripturl, '?action=pm;f=', Utils::$context['folder'], ';start=', Utils::$context['start'], ';sort=subject', Utils::$context['sort_by'] == 'subject' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '', '">', Lang::getTxt('subject', file: 'General'), Utils::$context['sort_by'] == 'subject' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a>
-				</th>
-				<th class="lefttext pm_from_to">
-					<a href="', Config::$scripturl, '?action=pm;f=', Utils::$context['folder'], ';start=', Utils::$context['start'], ';sort=name', Utils::$context['sort_by'] == 'name' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '', Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '', '">', Lang::getTxt(Utils::$context['from_or_to'] == 'from' ? 'from' : 'to', file: 'General'), Utils::$context['sort_by'] == 'name' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a>
-				</th>
-				<th class="centercol table_icon pm_moderation">
-					<input type="checkbox" onclick="invertAll(this, this.form);">
-				</th>
-			</tr>
-		</thead>
-		<tbody>';
-
-	if (!Utils::$context['show_delete']) {
-		echo '
-			<tr class="windowbg">
-				<td colspan="5">', Lang::getTxt('pm_alert_none', file: 'General'), '</td>
-			</tr>';
-	}
-
-	while ($message = Utils::$context['get_pmessage']('subject')) {
-		echo '
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
-				<td class="table_icon pm_icon">
-					<script>
-						currentLabels[', $message['id'], '] = {';
-
-		if (!empty($message['labels'])) {
-			$first = true;
-
-			foreach ($message['labels'] as $label) {
-				echo $first ? '' : ',', '
-				"', $label['id'], '": "', $label['name'], '"';
-				$first = false;
-			}
-		}
-
-		echo '
-						};
-					</script>
-					', $message['is_replied_to'] ? '<span class="main_icons replied" title="' . Lang::getTxt('pm_replied', file: 'PersonalMessage') . '"></span>' : '<span class="main_icons im_off" title="' . Lang::getTxt('pm_read', file: 'PersonalMessage') . '"></span>', '
-				</td>
-				<td class="pm_time">', $message['time'], '</td>
-				<td class="pm_subject">
-					', (Utils::$context['display_mode'] != 0 && Utils::$context['current_pm'] == $message['id'] ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="*">' : ''), '<a href="', (Utils::$context['display_mode'] == 0 || Utils::$context['current_pm'] == $message['id'] ? '' : (Config::$scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . Utils::$context['folder'] . ';start=' . Utils::$context['start'] . ';sort=' . Utils::$context['sort_by'] . (Utils::$context['sort_direction'] == 'up' ? ';' : ';desc') . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : ''))), '#msg', $message['id'], '">', $message['subject'], $message['is_unread'] ? '&nbsp;<span class="new_posts">' . Lang::getTxt('new', file: 'General') . '</span>' : '', '</a>
-				</td>
-				<td class="pm_from_to">
-					', (Utils::$context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '
-				</td>
-				<td class="centercol table_icon pm_moderation">
-					<input type="checkbox" name="pms[]" id="deletelisting', $message['id'], '" value="', $message['id'], '"', $message['is_selected'] ? ' checked' : '', ' onclick="if (document.getElementById(\'deletedisplay', $message['id'], '\')) document.getElementById(\'deletedisplay', $message['id'], '\').checked = this.checked;">
-				</td>
-			</tr>';
-	}
-
-	echo '
-		</tbody>
-	</table>
-	<div class="pagesection">
-		<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		<div class="floatright">&nbsp;';
-
-	if (Utils::$context['show_delete']) {
-		if (!empty(Utils::$context['currently_using_labels']) && Utils::$context['folder'] != 'sent') {
-			echo '
-			<select name="pm_action" onchange="if (this.options[this.selectedIndex].value) this.form.submit();" onfocus="loadLabelChoices();">
-				<option value="">', Lang::getTxt('pm_sel_label_title', file: 'PersonalMessage'), '</option>
-				<option value="" disabled>---------------</option>
-				<option value="" disabled>', Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage'), '</option>';
-
-			foreach (Utils::$context['labels'] as $label) {
-				if ($label['id'] != Utils::$context['current_label_id']) {
-					echo '
-				<option value="add_', $label['id'], '">&nbsp;', $label['name'], '</option>';
-				}
-			}
-
-			echo '
-				<option value="" disabled>', Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage'), '</option>';
-
-			foreach (Utils::$context['labels'] as $label) {
-				echo '
-				<option value="rem_', $label['id'], '">&nbsp;', $label['name'], '</option>';
-			}
-
-			echo '
-			</select>
-			<noscript>
-				<input type="submit" value="', Lang::getTxt('pm_apply', file: 'PersonalMessage'), '" class="button">
-			</noscript>';
-		}
-
-		echo '
-			<input type="submit" name="del_selected" value="', Lang::getTxt('quickmod_delete_selected', file: 'General'), '" data-confirm="', Lang::getTxt('delete_selected_confirm', file: 'PersonalMessage'), '" class="button you_sure">';
-	}
-
-	echo '
-		</div><!-- .floatright -->
-	</div><!-- .pagesection -->';
-}
-
-/**
- * The form for the PM search feature
- */
-function template_search()
-{
-	if (!empty(Utils::$context['search_errors'])) {
-		echo '
-		<div class="errorbox">
-			', implode('<br>', Utils::$context['search_errors']['messages']), '
-		</div>';
-	}
-
-	echo '
-	<form action="', Config::$scripturl, '?action=pm;sa=search2" method="post" accept-charset="UTF-8" name="searchform" id="searchform">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_search_title', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div id="advanced_search" class="roundframe">
-			<input type="hidden" name="advanced" value="1">
-			<dl id="search_options" class="settings">
-				<dt>
-					<strong><label for="searchfor">', Lang::getTxt('pm_search_text', file: 'PersonalMessage'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="search" name="search"', !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '', ' size="40">
-					<script>
-						window.addEventListener("load", initSearch, false);
-					</script>
-				</dd>
-				<dt>
-					<label for="searchtype">', Lang::getTxt('search_match', file: 'General'), '</label>
-				</dt>
-				<dd>
-					<select name="searchtype">
-						<option value="1"', empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '', '>', Lang::getTxt('pm_search_match_all', file: 'PersonalMessage'), '</option>
-						<option value="2"', !empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '', '>', Lang::getTxt('pm_search_match_any', file: 'PersonalMessage'), '</option>
-					</select>
-				</dd>
-				<dt>
-					<label for="userspec">', Lang::getTxt('pm_search_user', file: 'PersonalMessage'), '</label>
-				</dt>
-				<dd>
-					<input type="text" name="userspec" value="', empty(Utils::$context['search_params']['userspec']) ? '*' : Utils::$context['search_params']['userspec'], '" size="40">
-				</dd>
-				<dt>
-					<label for="sort">', Lang::getTxt('pm_search_order', file: 'PersonalMessage'), '</label>
-				</dt>
-				<dd>
-					<select name="sort">
-						<option value="relevance|desc">', Lang::getTxt('pm_search_orderby_relevant_first', file: 'PersonalMessage'), '</option>
-						<option value="id_pm|desc">', Lang::getTxt('pm_search_orderby_recent_first', file: 'PersonalMessage'), '</option>
-						<option value="id_pm|asc">', Lang::getTxt('pm_search_orderby_old_first', file: 'PersonalMessage'), '</option>
-					</select>
-				</dd>
-				<dt class="options">
-					', Lang::getTxt('pm_search_options', file: 'PersonalMessage'), '
-				</dt>
-				<dd class="options">
-					<label for="show_complete">
-						<input type="checkbox" name="show_complete" id="show_complete" value="1"', !empty(Utils::$context['search_params']['show_complete']) ? ' checked' : '', '> ', Lang::getTxt('pm_search_show_complete', file: 'PersonalMessage'), '
-					</label><br>
-					<label for="subject_only">
-						<input type="checkbox" name="subject_only" id="subject_only" value="1"', !empty(Utils::$context['search_params']['subject_only']) ? ' checked' : '', '> ', Lang::getTxt('pm_search_subject_only', file: 'PersonalMessage'), '
-					</label>
-				</dd>
-				<dt class="between">
-					', Lang::getTxt('pm_search_post_age', file: 'PersonalMessage'), '
-				</dt>
-				<dd>
-					', Lang::getTxt(
-		'pm_search_age_range',
-		[
-			'min' => '<input type="number" name="minage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['minage']) ? '0' : Utils::$context['search_params']['minage']) . '">',
-			'max' => '<input type="number" name="maxage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['maxage']) ? '9999' : Utils::$context['search_params']['maxage']) . '">',
-		],
-		file: 'PersonalMessage',
-	), '
-				</dd>
-			</dl>';
-
-	if (!Utils::$context['currently_using_labels']) {
-		echo '
-				<input type="submit" name="pm_search" value="', Lang::getTxt('pm_search_go', file: 'PersonalMessage'), '" class="button floatright">';
-	}
-
-	echo '
-		</div><!-- .roundframe -->';
-
-	// Do we have some labels setup? If so offer to search by them!
-	if (Utils::$context['currently_using_labels']) {
-		echo '
-		<fieldset class="labels">
-			<div class="roundframe alt">
-				<div class="title_bar">
-					<h3 class="titlebg">
-						<a href="#" id="advanced_panel_link">', Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage'), '</a>
-					</h3>
-					<span id="advanced_panel_toggle" class="toggle_up" style="display: none;"></span>
-				</div>
-				<div id="advanced_panel_div">
-					<ul id="search_labels">';
-
-		foreach (Utils::$context['search_labels'] as $label) {
-			echo '
-						<li>
-							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', '>
-							', $label['name'], '</label>
-						</li>';
-		}
-
-		echo '
-					</ul>
-				</div>
-				<br class="clear">
-				<div class="padding">
-					<input type="checkbox" name="all" id="check_all" value=""', Utils::$context['check_all'] ? ' checked' : '', ' onclick="invertAll(this, this.form, \'searchlabel\');">
-					<label for="check_all"><em>', Lang::getTxt('check_all', file: 'General'), '</em></label>
-					<input type="submit" name="pm_search" value="', Lang::getTxt('pm_search_go', file: 'PersonalMessage'), '" class="button floatright">
-				</div class="padding">
-			</div><!-- .roundframe -->
-		</fieldset>';
-
-		// Some javascript for the advanced toggling
-		echo '
-		<script>
-			var oAdvancedPanelToggle = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: true,
-				aSwappableContainers: [
-					\'advanced_panel_div\'
-				],
-				aSwapImages: [
-					{
-						sId: \'advanced_panel_toggle\',
-						altExpanded: ', Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')), ',
-						altCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')), '
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'advanced_panel_link\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage')), '
-					}
-				]
-			});
-		</script>';
-	}
-
-	echo '
-	</form>';
-}
-
-/**
- * Displays results from a PM search
- */
-function template_search_results()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_search_results', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="roundframe noup">
-			', Lang::getTxt('pm_search_results_info', [Utils::$context['num_results'], Lang::sentenceList(Utils::$context['search_in'])], file: 'PersonalMessage'), '
-		</div>
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-
-	// Complete results?
-	if (empty(Utils::$context['search_params']['show_complete']) && !empty(Utils::$context['personal_messages'])) {
-		echo '
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext quarter_table">', Lang::getTxt('date', file: 'General'), '</th>
-					<th class="lefttext half_table">', Lang::getTxt('subject', file: 'General'), '</th>
-					<th class="lefttext quarter_table">', Lang::getTxt('from', file: 'General'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-	}
-
-	// Print each message out...
-	foreach (Utils::$context['personal_messages'] as $message) {
-		// Are we showing it all?
-		if (!empty(Utils::$context['search_params']['show_complete'])) {
-			template_single_pm($message);
-		}
-
-		// Otherwise just a simple list!
-		else {
-		echo '
-				<tr class="windowbg">
-					<td>', $message['time'], '</td>
-					<td>', $message['link'], '</td>
-					<td>', $message['member']['link'], '</td>
-				</tr>';
-		}
-	}
-
-	// Finish off the page...
-	if (empty(Utils::$context['search_params']['show_complete']) && !empty(Utils::$context['personal_messages'])) {
-		echo '
-			</tbody>
-		</table>';
-	}
-
-	// No results?
-	if (empty(Utils::$context['personal_messages'])) {
-		echo '
-		<div class="windowbg">
-			<p class="centertext">', Lang::getTxt('pm_search_none_found', file: 'PersonalMessage'), '</p>
-		</div>';
-	}
-
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-
-}
-
-/**
- * The form for sending a new PM
- */
-function template_send()
-{
-	// Show which messages were sent successfully and which failed.
-	if (!empty(Utils::$context['send_log'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_send_report', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg noup">';
-
-		if (!empty(Utils::$context['send_log']['sent'])) {
-			foreach (Utils::$context['send_log']['sent'] as $log_entry) {
-				echo '
-			<span class="error">', $log_entry, '</span><br>';
-			}
-		}
-
-		if (!empty(Utils::$context['send_log']['failed'])) {
-			foreach (Utils::$context['send_log']['failed'] as $log_entry) {
-				echo '
-			<span class="error">', $log_entry, '</span><br>';
-			}
-		}
-
-		echo '
-		</div>
-		<br>';
-	}
-
-	// Show the preview of the personal message.
-	echo '
-		<div id="preview_section"', isset(Utils::$context['preview_message']) ? '' : ' class="hidden"', '>
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span id="preview_subject">', empty(Utils::$context['preview_subject']) ? '' : Utils::$context['preview_subject'], '</span>
-				</h3>
-			</div>
-			<div class="windowbg noup">
-				<div class="post" id="preview_body">
-					', empty(Utils::$context['preview_message']) ? '<br>' : Utils::adjustHeadingLevels(Utils::$context['preview_message'], 3), '
-				</div>
-			</div>
-			<br class="clear">
-		</div>';
-
-	// Main message editing box.
-	echo '
-		<form action="', Config::$scripturl, '?action=pm;sa=send2" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" class="flow_hidden" onsubmit="submitonce(this);">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="main_icons inbox icon" title="', Lang::getTxt('new_message', file: 'PersonalMessage'), '"></span> ', Lang::getTxt('new_message', file: 'PersonalMessage'), '
-				</h3>
-			</div>
-			<div class="roundframe noup">';
-
-	// If there were errors for sending the PM, show them.
-	echo '
-				<div class="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '', empty(Utils::$context['post_error']['messages']) ? ' hidden' : '', '" id="errors">
-					<dl>
-						<dt>
-							<strong id="error_serious">', Lang::getTxt('error_while_submitting', file: 'General'), '</strong>
-						</dt>
-						<dd class="error" id="error_list">
-							', empty(Utils::$context['post_error']['messages']) ? '' : implode('<br>', Utils::$context['post_error']['messages']), '
-						</dd>
-					</dl>
-				</div>';
-
-	if (!empty(Config::$modSettings['drafts_pm_enabled'])) {
-		echo '
-				<div id="draft_section" class="infobox"', isset(Utils::$context['draft_saved']) ? '' : ' style="display: none;"', '>',
-					Lang::getTxt('draft_pm_saved', ['url' => Config::$scripturl . '?action=pm;sa=showpmdrafts'], file: 'Drafts'), '
-					', (!empty(Config::$modSettings['drafts_keep_days']) ? ' <strong>' . Lang::getTxt('draft_save_warning', [Config::$modSettings['drafts_keep_days']], file: 'Drafts') . '</strong>' : ''), '
-				</div>';
-	}
-
-	echo '
-				<dl id="post_header">';
-
-	// To and bcc. Include a button to search for members.
-	echo '
-					<dt>
-						<label', (isset(Utils::$context['post_error']['no_to']) || isset(Utils::$context['post_error']['bad_to']) ? ' class="error"' : ''), ' for="to_control" id="caption_to">', trim(Lang::getTxt('pm_to', ['list' => ''], file: 'PersonalMessage')), '</label>
-					</dt>';
-
-	// Autosuggest will be added by the JavaScript later on.
-	echo '
-					<dd id="pm_to" class="clear_right">
-						<input type="text" name="to" id="to_control" value="', Utils::$context['to_value'], '" size="20">';
-
-	// A link to add BCC, only visible with JavaScript enabled.
-	echo '
-						<span class="smalltext" id="bcc_link_container" style="display: none;"></span>';
-
-	// A div that'll contain the items found by the autosuggest.
-	echo '
-						<div id="to_item_list_container"></div>';
-
-	echo '
-					</dd>';
-
-	// This BCC row will be hidden by default if JavaScript is enabled.
-	echo '
-					<dt  class="clear_left" id="bcc_div">
-						<label', (isset(Utils::$context['post_error']['no_to']) || isset(Utils::$context['post_error']['bad_bcc']) ? ' class="error"' : ''), ' for="bcc_control" id="caption_bbc">', trim(Lang::getTxt('pm_bcc', ['list' => ''], file: 'PersonalMessage')), '</label>
-					</dt>
-					<dd id="bcc_div2">
-						<input type="text" name="bcc" id="bcc_control" value="', Utils::$context['bcc_value'], '" size="20">
-						<div id="bcc_item_list_container"></div>
-					</dd>';
-
-	// The subject of the PM.
-	echo '
-					<dt class="clear_left">
-						<label', (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : ''), ' for="subject" id="caption_subject">', Lang::getTxt('subject', file: 'General'), '</label>
-					</dt>
-					<dd id="pm_subject">
-						<input type="text" name="subject" id="subject" value="', Utils::$context['subject'], '" size="80" maxlength="80"', isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '', '>
-					</dd>
-				</dl>';
-
-	template_control_richedit(Utils::$context['post_box_name'], true, true);
-
-	// If the admin enabled the pm drafts feature, show a draft selection box
-	if (!empty(Utils::$context['drafts_save']) && !empty(Utils::$context['drafts']) && !empty(Theme::$current->options['drafts_show_saved_enabled'])) {
-		echo '
-				<div id="post_draft_options_header" class="title_bar">
-					<h4 class="titlebg">
-						<strong><a href="#" id="postDraftExpandLink">', Lang::getTxt('drafts_show', file: 'Drafts'), '</a></strong>
-					</h4>
-					<span id="postDraftExpand" class="toggle_up" style="display: none;"></span>
-				</div>
-				<div id="post_draft_options">
-					<dl class="settings">
-						<dt><strong>', Lang::getTxt('subject', file: 'General'), '</strong></dt>
-						<dd><strong>', trim(Lang::getTxt('draft_saved_on', ['date' => ''], file: 'Drafts')), '</strong></dd>';
-
-		foreach (Utils::$context['drafts'] as $draft) {
-			echo '
-						<dt>', $draft['link'], '</dt>
-						<dd>', $draft['poster_time'], '</dd>';
-		}
-		echo '
-					</dl>
-				</div>';
-	}
-
-	// Require an image to be typed to save spamming?
-	if (Utils::$context['require_verification']) {
-		echo '
-				<div class="post_verification">
-					<strong>', Lang::getTxt('pm_visual_verification_label', file: 'PersonalMessage'), '</strong>
-					', template_control_verification(Utils::$context['visual_verification_id'], 'all'), '
-				</div>';
-	}
-
-	// Send, Preview, spellcheck buttons.
-	echo '
-				<span id="post_confirm_buttons">
-					', template_control_richedit_buttons(Utils::$context['post_box_name']), '
-				</span>
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="seqnum" value="', Utils::$context['form_sequence_number'], '">
-				<input type="hidden" name="replied_to" value="', !empty(Utils::$context['quoted_message']['id']) ? Utils::$context['quoted_message']['id'] : 0, '">
-				<input type="hidden" name="pm_head" value="', !empty(Utils::$context['quoted_message']['pm_head']) ? Utils::$context['quoted_message']['pm_head'] : 0, '">
-				<input type="hidden" name="f" value="', Utils::$context['folder'] ?? '', '">
-				<input type="hidden" name="l" value="', Utils::$context['current_label_id'] ?? -1, '">
-				<br class="clear_right">
-			</div><!-- .roundframe -->
-		</form>';
-
-	echo '
-		<script>';
-
-	// The functions used to preview a personal message without loading a new page.
-	echo '
-			var txt_preview_title = "', Lang::getTxt('preview_title', file: 'General'), '";
-			var txt_preview_fetch = "', Lang::getTxt('preview_fetch', file: 'General'), '";
-			function previewPost()
-			{
-				if (window.XMLHttpRequest)
-				{
-					// Opera didn\'t support setRequestHeader() before 8.01.
-					// @todo Remove support for old browsers
-					if (\'opera\' in window)
-					{
-						var test = new XMLHttpRequest();
-						if (!(\'setRequestHeader\' in test))
-							return submitThisOnce(document.forms.postmodify);
-					}
-					// @todo Currently not sending poll options and option checkboxes.
-					var x = new Array();
-					var textFields = [\'subject\', ', Utils::escapeJavaScript(Utils::$context['post_box_name']), ', \'to\', \'bcc\'];
-					var numericFields = [\'recipient_to[]\', \'recipient_bcc[]\'];
-					var checkboxFields = [];
-
-					for (var i = 0, n = textFields.length; i < n; i++)
-						if (textFields[i] in document.forms.postmodify)
-						{
-							// Handle the WYSIWYG editor.
-							if (textFields[i] == ', Utils::escapeJavaScript(Utils::$context['post_box_name']), ' && ', Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']), ' in window && oEditorHandle_', Utils::$context['post_box_name'], '.bRichTextEnabled)
-								x[x.length] = \'message_mode=1&\' + textFields[i] + \'=\' + oEditorHandle_', Utils::$context['post_box_name'], '.getText(false).php_to8bit().php_urlencode();
-							else
-								x[x.length] = textFields[i] + \'=\' + document.forms.postmodify[textFields[i]].value.php_to8bit().php_urlencode();
-						}
-					for (var i = 0, n = numericFields.length; i < n; i++)
-						if (numericFields[i] in document.forms.postmodify && \'value\' in document.forms.postmodify[numericFields[i]])
-							x[x.length] = numericFields[i] + \'=\' + parseInt(document.forms.postmodify.elements[numericFields[i]].value);
-					for (var i = 0, n = checkboxFields.length; i < n; i++)
-						if (checkboxFields[i] in document.forms.postmodify && document.forms.postmodify.elements[checkboxFields[i]].checked)
-							x[x.length] = checkboxFields[i] + \'=\' + document.forms.postmodify.elements[checkboxFields[i]].value;
-
-					sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + \'action=pm;sa=send2;preview;xml\', x.join(\'&\'), onDocSent);
-
-					document.getElementById(\'preview_section\').style.display = \'\';
-					setInnerHTML(document.getElementById(\'preview_subject\'), txt_preview_title);
-					setInnerHTML(document.getElementById(\'preview_body\'), txt_preview_fetch);
-
-					return false;
-				}
-				else
-					return submitThisOnce(document.forms.postmodify);
-			}
-			function onDocSent(XMLDoc)
-			{
-				if (!XMLDoc)
-				{
-					document.forms.postmodify.preview.onclick = new function ()
-					{
-						return true;
-					}
-					document.forms.postmodify.preview.click();
-				}
-
-				// Show the preview section.
-				var preview = XMLDoc.getElementsByTagName(\'smf\')[0].getElementsByTagName(\'preview\')[0];
-				setInnerHTML(document.getElementById(\'preview_subject\'), preview.getElementsByTagName(\'subject\')[0].firstChild.nodeValue);
-
-				var bodyText = \'\';
-				for (var i = 0, n = preview.getElementsByTagName(\'body\')[0].childNodes.length; i < n; i++)
-					bodyText += preview.getElementsByTagName(\'body\')[0].childNodes[i].nodeValue;
-
-				setInnerHTML(document.getElementById(\'preview_body\'), bodyText);
-				document.getElementById(\'preview_body\').className = \'post\';
-
-				// Show a list of errors (if any).
-				var errors = XMLDoc.getElementsByTagName(\'smf\')[0].getElementsByTagName(\'errors\')[0];
-				var errorList = new Array();
-				for (var i = 0, numErrors = errors.getElementsByTagName(\'error\').length; i < numErrors; i++)
-					errorList[errorList.length] = errors.getElementsByTagName(\'error\')[i].firstChild.nodeValue;
-				document.getElementById(\'errors\').style.display = numErrors == 0 ? \'none\' : \'\';
-				setInnerHTML(document.getElementById(\'error_list\'), numErrors == 0 ? \'\' : errorList.join(\'<br>\'));
-
-				// Adjust the color of captions if the given data is erroneous.
-				var captions = errors.getElementsByTagName(\'caption\');
-				for (var i = 0, numCaptions = errors.getElementsByTagName(\'caption\').length; i < numCaptions; i++)
-					if (document.getElementById(\'caption_\' + captions[i].getAttribute(\'name\')))
-						document.getElementById(\'caption_\' + captions[i].getAttribute(\'name\')).className = captions[i].getAttribute(\'class\');
-
-				if (errors.getElementsByTagName(\'post_error\').length == 1)
-					document.forms.postmodify.', Utils::$context['post_box_name'], '.style.border = \'1px solid red\';
-				else if (document.forms.postmodify.', Utils::$context['post_box_name'], '.style.borderColor == \'red\' || document.forms.postmodify.', Utils::$context['post_box_name'], '.style.borderColor == \'red red red red\')
-				{
-					if (\'runtimeStyle\' in document.forms.postmodify.', Utils::$context['post_box_name'], ')
-						document.forms.postmodify.', Utils::$context['post_box_name'], '.style.borderColor = \'\';
-					else
-						document.forms.postmodify.', Utils::$context['post_box_name'], '.style.border = null;
-				}
-				location.hash = \'#\' + \'preview_section\';
-			}';
-
-	// Code for showing and hiding drafts
-	if (!empty(Utils::$context['drafts'])) {
-		echo '
-			var oSwapDraftOptions = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: true,
-				aSwappableContainers: [
-					\'post_draft_options\',
-				],
-				aSwapImages: [
-					{
-						sId: \'postDraftExpand\',
-						altExpanded: \'-\',
-						altCollapsed: \'+\'
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'postDraftExpandLink\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('draft_hide', file: 'Drafts')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('drafts_show', file: 'Drafts')), '
-					}
-				]
-			});';
-	}
-
-	echo '
-		</script>';
-
-	// Show the message you're replying to.
-	if (Utils::$context['reply']) {
-		echo '
-		<br><br>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_subject', Utils::$context['quoted_message'], file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<div class="clear">
-				<span class="smalltext floatright">', Utils::$context['quoted_message']['time'], '</span>
-				', Lang::getTxt('pm_from', ['member' => Utils::$context['quoted_message']['member']['link']], file: 'PersonalMessage'), '
-			</div>
-			<hr>
-			', Utils::adjustHeadingLevels(Utils::$context['quoted_message']['body'], 3), '
-		</div>
-		<br class="clear">';
-	}
-
-	echo '
-		<script>
-			var oPersonalMessageSend = new smf_PersonalMessageSend({
-				sSessionId: smf_session_id,
-				sSessionVar: smf_session_var,
-				sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-				sToControlId: \'to_control\',
-				aToRecipients: [';
-
-	foreach (Utils::$context['recipients']['to'] as $i => $member) {
-		echo '
-					{
-						sItemId: ', Utils::escapeJavaScript($member['id']), ',
-						sItemName: ', Utils::escapeJavaScript($member['name']), '
-					}', $i == count(Utils::$context['recipients']['to']) - 1 ? '' : ',';
-	}
-
-	echo '
-				],
-				aBccRecipients: [';
-
-	foreach (Utils::$context['recipients']['bcc'] as $i => $member) {
-		echo '
-					{
-						sItemId: ', Utils::escapeJavaScript($member['id']), ',
-						sItemName: ', Utils::escapeJavaScript($member['name']), '
-					}', $i == count(Utils::$context['recipients']['bcc']) - 1 ? '' : ',';
-	}
-
-	echo '
-				],
-				sBccControlId: \'bcc_control\',
-				sBccDivId: \'bcc_div\',
-				sBccDivId2: \'bcc_div2\',
-				sBccLinkId: \'bcc_link\',
-				sBccLinkContainerId: \'bcc_link_container\',
-				bBccShowByDefault: ', empty(Utils::$context['recipients']['bcc']) && empty(Utils::$context['bcc_value']) ? 'false' : 'true', ',
-				sShowBccLinkTemplate: ', Utils::escapeJavaScript(
-		'
-					<a href="#" id="bcc_link">' . Lang::getTxt('make_bcc', file: 'PersonalMessage') . '</a> <a href="' . Config::$scripturl . '?action=helpadmin;help=pm_bcc" onclick="return reqOverlayDiv(this.href);">(?)</a>',
-	), '
-			});';
-
-	echo '
-		</script>';
-}
-
-/**
- * This template asks the user whether they wish to empty out their folder/messages.
- */
-function template_ask_delete()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt(Utils::$context['delete_all'] ? 'delete_message' : 'delete_all', file: 'PersonalMessage'), '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('delete_all_confirm', file: 'PersonalMessage'), '</p>
-			<br>
-			<strong><a href="', Config::$scripturl, '?action=pm;sa=removeall2;f=', Utils::$context['folder'], ';', Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '', ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('yes', file: 'General'), '</a> - <a href="javascript:history.go(-1);">', Lang::getTxt('no', file: 'General'), '</a></strong>
-		</div>';
-}
-
-/**
- * This template asks the user what messages they want to prune.
- */
-function template_prune()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_prune', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=pm;sa=prune" method="post" accept-charset="UTF-8" onsubmit="return confirm(\'', Lang::getTxt('pm_prune_warning', file: 'PersonalMessage'), '\');">
-				<p>', Lang::getTxt('pm_prune_desc1', file: 'PersonalMessage'), ' <input type="text" name="age" size="3" value="14"> ', Lang::getTxt('pm_prune_desc2', file: 'PersonalMessage'), '</p>
-				<input type="submit" value="', Lang::getTxt('delete', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>
-		</div>
-		<div class="windowbg">
-			<form action="', Config::$scripturl, '?action=pm;sa=removeall2" method="post" onsubmit="return confirm(\'', Lang::getTxt('pm_remove_all_warning', file: 'PersonalMessage'), '\');">
-				<p>', Lang::getTxt('pm_remove_all', file: 'PersonalMessage'), '</p>
-				<input type="submit" value="', Lang::getTxt('delete_all_prune', file: 'PersonalMessage'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</form>
-		</div>';
-}
-
-/**
- * Here we allow the user to setup labels, remove labels and change rules for labels (i.e, do quite a bit)
- */
-function template_labels()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=pm;sa=manlabels" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_manage_labels', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('pm_labels_desc', file: 'PersonalMessage'), '
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext">
-						', Lang::getTxt('pm_label_name', file: 'PersonalMessage'), '
-					</th>
-					<th class="centertext table_icon">';
-
-	if (count(Utils::$context['labels']) > 2) {
-		echo '
-						<input type="checkbox" onclick="invertAll(this, this.form);">';
-	}
-
-	echo '
-					</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	if (count(Utils::$context['labels']) < 2) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="2">', Lang::getTxt('pm_labels_no_exist', file: 'PersonalMessage'), '</td>
-				</tr>';
-	} else {
-		foreach (Utils::$context['labels'] as $label) {
-			if ($label['id'] == -1) {
-				continue;
-			}
-
-			echo '
-				<tr class="windowbg">
-					<td>
-						<input type="text" name="label_name[', $label['id'], ']" value="', $label['name'], '" size="30" maxlength="30">
-					</td>
-					<td class="table_icon"><input type="checkbox" name="delete_label[', $label['id'], ']"></td>
-				</tr>';
-		}
-	}
-	echo '
-			</tbody>
-		</table>';
-
-	if (!count(Utils::$context['labels']) < 2) {
-		echo '
-		<div class="block righttext">
-			<input type="submit" name="save" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-			<input type="submit" name="delete" value="', Lang::getTxt('quickmod_delete_selected', file: 'General'), '" data-confirm="', Lang::getTxt('pm_labels_delete', file: 'PersonalMessage'), '" class="button you_sure">
-		</div>';
-	}
-
-	echo '
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<form action="', Config::$scripturl, '?action=pm;sa=manlabels" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_label_add_new', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<strong><label for="add_label">', Lang::getTxt('pm_label_name', file: 'PersonalMessage'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" id="add_label" name="label" value="" size="30" maxlength="30">
-				</dd>
-			</dl>
-			<input type="submit" name="add" value="', Lang::getTxt('pm_label_add_new', file: 'PersonalMessage'), '" class="button floatright">
-		</div>
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<br>';
-}
-
-/**
- * Template for reporting a personal message.
- */
-function template_report_message()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=pm;sa=report;l=', Utils::$context['current_label_id'], '" method="post" accept-charset="UTF-8">
-		<input type="hidden" name="pmsg" value="', Utils::$context['pm_id'], '">
-		<div class="information">
-			', Lang::getTxt('pm_report_desc', file: 'PersonalMessage'), '
-		</div>
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_report_title', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="settings">';
-
-	// If there is more than one admin on the forum, allow the user to choose the one they want to direct to.
-	// @todo Why?
-	if (Utils::$context['admin_count'] > 1) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('pm_report_admins', file: 'PersonalMessage'), '</strong>
-				</dt>
-				<dd>
-					<select name="id_admin">
-						<option value="0">', Lang::getTxt('pm_report_all_admins', file: 'PersonalMessage'), '</option>';
-
-		foreach (Utils::$context['admins'] as $id => $name) {
-			echo '
-						<option value="', $id, '">', $name, '</option>';
-		}
-
-		echo '
-					</select>
-				</dd>';
-	}
-
-	echo '
-				<dt>
-					<strong>', Lang::getTxt('pm_report_reason', file: 'PersonalMessage'), '</strong>
-				</dt>
-				<dd>
-					<textarea name="reason" rows="4" cols="70" style="width: 80%;"></textarea>
-				</dd>
-			</dl>
-			<div class="righttext">
-				<input type="submit" name="report" value="', Lang::getTxt('pm_report_message', file: 'PersonalMessage'), '" class="button">
-			</div>
-		</div><!-- .windowbg -->
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>';
-}
-
-/**
- * Little template just to say "Yep, it's been submitted"
- */
-function template_report_message_complete()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_report_title', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('pm_report_done', file: 'PersonalMessage'), '</p>
-			<a href="', Config::$scripturl, '?action=pm;l=', Utils::$context['current_label_id'], '">', Lang::getTxt('pm_report_return', file: 'PersonalMessage'), '</a>
-		</div>';
-}
-
-/**
- * Manage rules.
- */
-function template_rules()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=pm;sa=manrules" method="post" accept-charset="UTF-8" name="manRules" id="manrules">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('pm_manage_rules', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('pm_manage_rules_desc', file: 'PersonalMessage'), '
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext">
-						', Lang::getTxt('pm_rule_title', file: 'PersonalMessage'), '
-					</th>
-					<th class="centertext table_icon">';
-
-	if (!empty(Utils::$context['rules'])) {
-		echo '
-						<input type="checkbox" onclick="invertAll(this, this.form);">';
-	}
-
-	echo '
-					</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	if (empty(Utils::$context['rules'])) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="2">
-						', Lang::getTxt('pm_rules_none', file: 'PersonalMessage'), '
-					</td>
-				</tr>';
-	}
-
-	foreach (Utils::$context['rules'] as $rule) {
-		echo '
-				<tr class="windowbg">
-					<td>
-						<a href="', Config::$scripturl, '?action=pm;sa=manrules;add;rid=', $rule['id'], '">', $rule['name'], '</a>
-					</td>
-					<td class="table_icon">
-						<input type="checkbox" name="delrule[', $rule['id'], ']">
-					</td>
-				</tr>';
-	}
-
-	echo '
-			</tbody>
-		</table>
-		<div class="righttext">
-			<a class="button" href="', Config::$scripturl, '?action=pm;sa=manrules;add;rid=0">', Lang::getTxt('pm_add_rule', file: 'PersonalMessage'), '</a>';
-
-	if (!empty(Utils::$context['rules'])) {
-		echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="submit" name="delselected" value="', Lang::getTxt('pm_delete_selected_rule', file: 'PersonalMessage'), '" data-confirm="', Lang::getTxt('pm_js_delete_rule_confirm', file: 'PersonalMessage'), '" class="button smalltext you_sure">';
-	}
-
-	if (!empty(Utils::$context['rules'])) {
-		echo '
-			<a href="', Config::$scripturl, '?action=pm;sa=manrules;apply;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" data-confirm="', Lang::getTxt('pm_js_apply_rules_confirm', file: 'PersonalMessage'), '" class="button you_sure">', Lang::getTxt('pm_apply_rules', file: 'PersonalMessage'), '</a>';
-	}
-
-	echo '
-		</div>
-	</form>';
-
-}
-
-/**
- * Template for adding/editing a rule.
- */
-function template_add_rule()
-{
-	echo '
-	<script>
-		var criteriaNum = 0;
-		var actionNum = 0;
-		var groups = new Array()
-		var labels = new Array()';
-
-	foreach (Utils::$context['groups'] as $id => $title) {
-		echo '
-		groups[', $id, '] = "', addslashes($title), '";';
-	}
-
-	foreach (Utils::$context['labels'] as $label) {
-		if ($label['id'] != -1) {
-			echo '
-		labels[', ($label['id']), '] = "', addslashes($label['name']), '";';
-		}
-	}
-
-	echo '
-		function addCriteriaOption()
-		{
-			if (criteriaNum == 0)
-			{
-				for (var i = 0; i < document.forms.addrule.elements.length; i++)
-					if (document.forms.addrule.elements[i].id.substr(0, 8) == "ruletype")
-						criteriaNum++;
-			}
-
-			if (criteriaNum++ >= ', Utils::$context['rule_limiters']['criteria'], ')
-				return false;
-
-			setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value=""><\' + \'/option><option value="mid">', addslashes(Lang::getTxt('pm_rule_mid', file: 'PersonalMessage')), '<\' + \'/option><option value="gid">', addslashes(Lang::getTxt('pm_rule_gid', file: 'PersonalMessage')), '<\' + \'/option><option value="sub">', addslashes(Lang::getTxt('pm_rule_sub', file: 'PersonalMessage')), '<\' + \'/option><option value="msg">', addslashes(Lang::getTxt('pm_rule_msg', file: 'PersonalMessage')), '<\' + \'/option><option value="bud">', addslashes(Lang::getTxt('pm_rule_bud', file: 'PersonalMessage')), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value=""><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes(Lang::getTxt('pm_rule_sel_group', file: 'PersonalMessage')), '<\' + \'/option>';
-
-	foreach (Utils::$context['groups'] as $id => $group) {
-		echo '<option value="', $id, '">', strtr($group, ["'" => "\'"]), '<\' + \'/option>';
-	}
-
-	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
-
-				if (criteriaNum + 1 > ', Utils::$context['rule_limiters']['criteria'], ')
-					document.getElementById(\'addonjs1\').style.display = \'none\';
-			}
-
-			function addActionOption()
-			{
-				if (actionNum == 0)
-				{
-					for (var i = 0; i < document.forms.addrule.elements.length; i++)
-						if (document.forms.addrule.elements[i].id.substr(0, 7) == "acttype")
-							actionNum++;
-				}
-				if (actionNum++ >= ', Utils::$context['rule_limiters']['actions'], ')
-					return false;
-
-				setOuterHTML(document.getElementById("actionAddHere"), \'<br><select name="acttype[\' + actionNum + \']" id="acttype\' + actionNum + \'" onchange="updateActionDef(\' + actionNum + \'); rebuildRuleDesc();"><option value="">', addslashes(Lang::getTxt('pm_rule_do_nothing', file: 'PersonalMessage')), ':<\' + \'/option><option value="lab">', addslashes(Lang::getTxt('pm_rule_label', file: 'PersonalMessage')), '<\' + \'/option><option value="del">', addslashes(Lang::getTxt('pm_rule_delete', file: 'PersonalMessage')), '<\' + \'/option><\' + \'/select>&nbsp;<span id="labdiv\' + actionNum + \'" style="display: none;"><select name="labdef[\' + actionNum + \']" id="labdef\' + actionNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes(Lang::getTxt('pm_rule_sel_label', file: 'PersonalMessage')), '<\' + \'/option>';
-
-	foreach (Utils::$context['labels'] as $label) {
-		if ($label['id'] != -1) {
-			echo '<option value="', ($label['id']), '">', addslashes($label['name']), '<\' + \'/option>';
-		}
-	}
-
-	echo '<\' + \'/select><\' + \'/span><span id="actionAddHere"><\' + \'/span>\');
-
-				if (actionNum + 1 > ', Utils::$context['rule_limiters']['actions'], ')
-					document.getElementById(\'addonjs2\').style.display = \'none\';
-			}
-
-			// Rebuild the rule description!
-			function rebuildRuleDesc()
-			{
-				// Start with nothing.
-				var text = "";
-				var joinText = "";
-				var actionText = "";
-				var hadBuddy = false;
-				var foundCriteria = false;
-				var foundAction = false;
-				var curNum, curVal, curDef;
-
-				for (var i = 0; i < document.forms.addrule.elements.length; i++)
-				{
-					if (document.forms.addrule.elements[i].id.substr(0, 8) == "ruletype")
-					{
-						if (foundCriteria)
-							joinText = document.getElementById("logic").value == \'and\' ? ', Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_and', file: 'PersonalMessage') . '</em> '), ' : ', Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_or', file: 'PersonalMessage') . '</em> '), ';
-						else
-							joinText = \'\';
-						foundCriteria = true;
-
-						curNum = document.forms.addrule.elements[i].id.match(/\d+/);
-						curVal = document.forms.addrule.elements[i].value;
-						if (curVal == "gid")
-							curDef = document.getElementById("ruledefgroup" + curNum).value.php_htmlspecialchars();
-						else if (curVal != "bud")
-							curDef = document.getElementById("ruledef" + curNum).value.php_htmlspecialchars();
-						else
-							curDef = "";
-
-						// What type of test is this?
-						if (curVal == "mid" && curDef)
-							text += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_member', file: 'PersonalMessage')), '.replace("{MEMBER}", curDef);
-						else if (curVal == "gid" && curDef && groups[curDef])
-							text += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_group', file: 'PersonalMessage')), '.replace("{GROUP}", groups[curDef]);
-						else if (curVal == "sub" && curDef)
-							text += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_subject', file: 'PersonalMessage')), '.replace("{SUBJECT}", curDef);
-						else if (curVal == "msg" && curDef)
-							text += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_body', file: 'PersonalMessage')), '.replace("{BODY}", curDef);
-						else if (curVal == "bud" && !hadBuddy)
-						{
-							text += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_buddy', file: 'PersonalMessage')), ';
-							hadBuddy = true;
-						}
-					}
-					if (document.forms.addrule.elements[i].id.substr(0, 7) == "acttype")
-					{
-						if (foundAction)
-							joinText = ', Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_and', file: 'PersonalMessage') . '</em> '), ';
-						else
-							joinText = "";
-						foundAction = true;
-
-						curNum = document.forms.addrule.elements[i].id.match(/\d+/);
-						curVal = document.forms.addrule.elements[i].value;
-						if (curVal == "lab")
-							curDef = document.getElementById("labdef" + curNum).value.php_htmlspecialchars();
-						else
-							curDef = "";
-
-						// Now pick the actions.
-						if (curVal == "lab" && curDef && labels[curDef])
-							actionText += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_label', file: 'PersonalMessage')), '.replace("{LABEL}", labels[curDef]);
-						else if (curVal == "del")
-							actionText += joinText + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_delete', file: 'PersonalMessage')), ';
-					}
-				}
-
-				// If still nothing make it default!
-				if (text == "" || !foundCriteria)
-					text = "', Lang::getTxt('pm_rule_not_defined', file: 'PersonalMessage'), '";
-				else
-				{
-					if (actionText != "")
-						text += ', Utils::escapeJavaScript(' <strong>' . Lang::getTxt('pm_readable_then', file: 'PersonalMessage') . '</strong> '), ' + actionText;
-					text = ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_start', file: 'PersonalMessage')), ' + text + ', Utils::escapeJavaScript(Lang::getTxt('pm_readable_end', file: 'PersonalMessage')), ';
-				}
-
-				// Set the actual HTML!
-				setInnerHTML(document.getElementById("ruletext"), text);
-			}
-	</script>';
-
-	echo '
-	<form action="', Config::$scripturl, '?action=pm;sa=manrules;save;rid=', Utils::$context['rid'], '" method="post" accept-charset="UTF-8" name="addrule" id="addrule" class="flow_hidden">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt(Utils::$context['rid'] == 0 ? 'pm_add_rule' : 'pm_edit_rule', file: 'PersonalMessage'), '</h3>
-		</div>
-		<div class="windowbg">
-			<dl class="addrules">
-				<dt class="floatleft">
-					<strong>', Lang::getTxt('pm_rule_name', file: 'PersonalMessage'), '</strong><br>
-					<span class="smalltext">', Lang::getTxt('pm_rule_name_desc', file: 'PersonalMessage'), '</span>
-				</dt>
-				<dd class="floatleft">
-					<input type="text" name="rule_name" value="', empty(Utils::$context['rule']->name) ? '' : Utils::$context['rule']->name, '" size="50" required>
-				</dd>
-			</dl>
-			<fieldset>
-				<legend>', Lang::getTxt('pm_rule_criteria', file: 'PersonalMessage'), '</legend>';
-
-	// Add a dummy criteria to allow expansion for none js users.
-	Utils::$context['rule']->criteria[] = ['t' => '', 'v' => ''];
-
-	// For each criteria print it out.
-	$isFirst = true;
-
-	foreach (Utils::$context['rule']->criteria as $k => $criteria) {
-		if (!$isFirst && $criteria['t'] == '') {
-			echo '<div id="removeonjs1">';
-		} elseif (!$isFirst) {
-			echo '<br>';
-		}
-
-		echo '
-				<select name="ruletype[', $k, ']" id="ruletype', $k, '" onchange="updateRuleDef(', $k, '); rebuildRuleDesc();">
-					<option value="" selected></option>';
-
-		foreach (['mid', 'gid', 'sub', 'msg', 'bud'] as $cr) {
-			echo '
-					<option value="', $cr, '"', $criteria['t'] == $cr ? ' selected' : '', '>', Lang::getTxt('pm_rule_' . $cr, file: 'PersonalMessage'), '</option>';
-		}
-
-		echo '
-				</select>
-				<span id="defdiv', $k, '" ', !in_array($criteria['t'], ['gid', 'bud']) ? '' : 'style="display: none;"', '>
-					<input type="text" name="ruledef[', $k, ']" id="ruledef', $k, '" onkeyup="rebuildRuleDesc();" value="', in_array($criteria['t'], ['mid', 'sub', 'msg']) ? $criteria['v'] : '', '">
-				</span>
-				<span id="defseldiv', $k, '" ', $criteria['t'] == 'gid' ? '' : 'style="display: none;"', '>
-					<select name="ruledefgroup[', $k, ']" id="ruledefgroup', $k, '" onchange="rebuildRuleDesc();">
-						<option value="">', Lang::getTxt('pm_rule_sel_group', file: 'PersonalMessage'), '</option>';
-
-		foreach (Utils::$context['groups'] as $id => $group) {
-			echo '
-						<option value="', $id, '"', $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '', '>', $group, '</option>';
-		}
-		echo '
-					</select>
-				</span>';
-
-		// If this is the dummy we add a means to hide for non js users.
-		if ($isFirst) {
-			$isFirst = false;
-		} elseif ($criteria['t'] == '') {
-			echo '</div><!-- .removeonjs1 -->';
-		}
-	}
-
-	echo '
-				<span id="criteriaAddHere"></span><br>
-				<a href="#" onclick="addCriteriaOption(); return false;" id="addonjs1" style="display: none;">(', Lang::getTxt('pm_rule_criteria_add', file: 'PersonalMessage'), ')</a>
-				<br><br>
-				', Lang::getTxt('pm_rule_logic', file: 'PersonalMessage'), '
-				<select name="rule_logic" id="logic" onchange="rebuildRuleDesc();">
-					<option value="and"', Utils::$context['rule']->logic == 'and' ? ' selected' : '', '>', Lang::getTxt('pm_rule_logic_and', file: 'PersonalMessage'), '</option>
-					<option value="or"', Utils::$context['rule']->logic == 'or' ? ' selected' : '', '>', Lang::getTxt('pm_rule_logic_or', file: 'PersonalMessage'), '</option>
-				</select>
-			</fieldset>
-			<fieldset>
-				<legend>', Lang::getTxt('pm_rule_actions', file: 'PersonalMessage'), '</legend>';
-
-	// As with criteria - add a dummy action for "expansion".
-	Utils::$context['rule']->actions[] = ['t' => '', 'v' => ''];
-
-	// Print each action.
-	$isFirst = true;
-
-	foreach (Utils::$context['rule']->actions as $k => $action) {
-		if (!$isFirst && $action['t'] == '') {
-			echo '<div id="removeonjs2">';
-		} elseif (!$isFirst) {
-			echo '<br>';
-		}
-
-		echo '
-				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
-					<option value="">', Lang::getTxt('pm_rule_do_nothing', file: 'PersonalMessage'), '</option>
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', Lang::getTxt('pm_rule_label', file: 'PersonalMessage'), '</option>
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', Lang::getTxt('pm_rule_delete', file: 'PersonalMessage'), '</option>
-				</select>
-				<span id="labdiv', $k, '">
-					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
-						<option value="">', Lang::getTxt('pm_rule_sel_label', file: 'PersonalMessage'), '</option>';
-
-		foreach (Utils::$context['labels'] as $label) {
-			if ($label['id'] != -1) {
-				echo '
-						<option value="', ($label['id']), '"', $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '', '>', $label['name'], '</option>';
-			}
-		}
-
-		echo '
-					</select>
-				</span>';
-
-		if ($isFirst) {
-			$isFirst = false;
-		} elseif ($action['t'] == '') {
-			echo '</div><!-- .removeonjs2 -->';
-		}
-	}
-
-	echo '
-				<span id="actionAddHere"></span><br>
-				<a href="#" onclick="addActionOption(); return false;" id="addonjs2" style="display: none;">(', Lang::getTxt('pm_rule_add_action', file: 'PersonalMessage'), ')</a>
-			</fieldset>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('pm_rule_description', file: 'PersonalMessage'), '</h3>
-			</div>
-			<div class="information">
-				<div id="ruletext">', Lang::getTxt('pm_rule_js_disabled', file: 'PersonalMessage'), '</div>
-			</div>
-			<div class="righttext">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="submit" name="save" value="', Lang::getTxt('pm_rule_save', file: 'PersonalMessage'), '" class="button">
-			</div>
-		</div><!-- .windowbg -->
-	</form>';
-
-	// Now setup all the bits!
-	echo '
-	<script>';
-
-	foreach (Utils::$context['rule']->criteria as $k => $c) {
-		echo '
-			updateRuleDef(', $k, ');';
-	}
-
-	foreach (Utils::$context['rule']->actions as $k => $c) {
-		echo '
-			updateActionDef(', $k, ');';
-	}
-
-	echo '
-			rebuildRuleDesc();';
-
-	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
-	if (Utils::$context['rid']) {
-		echo '
-			document.getElementById("removeonjs1").style.display = "none";
-			document.getElementById("removeonjs2").style.display = "none";';
-	}
-
-	if (count(Utils::$context['rule']->criteria) <= Utils::$context['rule_limiters']['criteria']) {
-		echo '
-			document.getElementById("addonjs1").style.display = "";';
-	}
-
-	if (count(Utils::$context['rule']->actions) <= Utils::$context['rule_limiters']['actions']) {
-		echo '
-			document.getElementById("addonjs2").style.display = "";';
-	}
-
-	echo '
-		</script>';
-}
-
-/**
- * Template for showing all of a user's PM drafts.
- */
-function template_showPMDrafts()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons inbox"></span> ', Lang::getTxt('drafts_show', file: 'Drafts'), '
-			</h3>
-		</div>
-		<p class="information">
-			', Lang::getTxt('drafts_show_desc', file: 'Drafts'), '
-		</p>';
-
-	// No drafts? Just show an informative message.
-	if (empty(Utils::$context['drafts'])) {
-		echo '
-		<div class="windowbg centertext">
-			', Lang::getTxt('draft_none', file: 'Drafts'), '
-		</div>';
-	} else {
-		echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-
-		// For every draft to be displayed, give it its own div, and show the important details of the draft.
-		foreach (Utils::$context['drafts'] as $draft) {
-			echo '
-		<div class="windowbg">
-			<div class="page_number floatright"> #', $draft['counter'], '</div>
-			<div class="topic_details">
-				<h4>
-					<strong>', $draft['subject'], '</strong>
-				</h4>
-				<div class="smalltext">
-					<div class="recipient_to">', Lang::getTxt('pm_to', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $draft['recipients']['to'])]), '</div>';
-
-			if (!empty($draft['recipients']['bcc'])) {
-				echo'
-					<div class="pm_bbc">', Lang::getTxt('pm_bcc', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $draft['recipients']['bcc'])]), '</div>';
-			}
-
-			echo '
-				</div>
-				<div class="smalltext">
-					', Lang::getTxt('draft_last_saved', ['age' => $draft['age'], 'remaining' => $draft['remaining']], file: 'Drafts'), '
-				</div>
-			</div>
-			<div class="list_posts">
-				', Utils::adjustHeadingLevels($draft['body'], 4), '
-			</div>';
-
-			// Draft buttons
-			template_quickbuttons($draft['quickbuttons'], 'pm_drafts');
-
-			echo '
-		</div><!-- .windowbg -->';
-		}
-
-		// Show page numbers.
-		echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-	}
-}
diff --git a/Themes/default/Poll.template.php b/Themes/default/Poll.template.php
deleted file mode 100644
index 67a3da6f25d..00000000000
--- a/Themes/default/Poll.template.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * A form for creating and/or editing a poll.
- */
-function template_main()
-{
-	if (!empty(Utils::$context['poll_error']['messages'])) {
-		echo '
-			<div class="errorbox">
-				<dl class="poll_error">
-					<dt>
-						', Lang::getTxt(Utils::$context['is_edit'] ? 'error_while_editing_poll' : 'error_while_adding_poll', file: 'Errors'), '
-					</dt>
-					<dt>
-						', empty(Utils::$context['poll_error']['messages']) ? '' : implode('<br>', Utils::$context['poll_error']['messages']), '
-					</dt>
-				</dl>
-			</div>';
-	}
-
-	// Start the main poll form.
-	echo '
-	<div id="edit_poll">
-		<form action="' . Config::$scripturl . '?action=editpoll2', Utils::$context['is_edit'] ? '' : ';add', ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . '" method="post" accept-charset="UTF-8" onsubmit="submitonce(this);" name="postmodify" id="postmodify">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>';
-
-	echo '
-			<div>
-				<div class="roundframe noup">
-					<input type="hidden" name="poll" value="', Utils::$context['poll']['id'], '">
-					<fieldset id="poll_main">
-						<legend><span ', (isset(Utils::$context['poll_error']['no_question']) ? ' class="error"' : ''), '>', Lang::getTxt('poll_question', file: 'General'), '</span></legend>
-						<dl class="settings poll_options" id="poll_choices" data-more-txt="', Lang::getTxt('poll_add_option', file: 'Post'), '" data-option-txt="', Lang::getTxt('option_number', [999], file: 'Post'), '">
-							<dt>', Lang::getTxt('poll_question', file: 'General'), '</dt>
-							<dd><input type="text" name="question" size="80" value="', Utils::$context['poll']['question'], '"></dd>';
-
-	foreach (Utils::$context['choices'] as $choice) {
-		echo '
-							<dt>
-								<label for="options-', $choice['id'], '" ', (isset(Utils::$context['poll_error']['poll_few']) ? ' class="error"' : ''), '>', Lang::getTxt('option_number', [$choice['number']], file: 'Post'), '</label>
-							</dt>
-							<dd>
-								<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">';
-
-		// Does this option have a vote count yet, or is it new?
-		if ($choice['votes'] != -1) {
-			echo ' (', Lang::getTxt('number_of_votes', [$choice['votes']], file: 'Post'), ')';
-		}
-
-		echo '
-							</dd>';
-	}
-
-	// poll.js puts the "add option" button here, after the list it appends to.
-	echo '
-						</dl>
-					</fieldset>
-					<fieldset id="poll_options">
-						<legend>', Lang::getTxt('poll_options', file: 'Post'), '</legend>
-						<dl class="settings poll_options">';
-
-	if (Utils::$context['can_moderate_poll']) {
-		echo '
-							<dt>
-								<label for="poll_max_votes">', Lang::getTxt('poll_max_votes', file: 'Post'), '</label>
-							</dt>
-							<dd>
-								<input type="number" name="poll_max_votes" id="poll_max_votes" min="1" value="', Utils::$context['poll']['max_votes'], '">
-							</dd>
-							<dt>
-								<label for="poll_expire">', Lang::getTxt('poll_run', file: 'Post'), '</label><br>
-								<em class="smalltext">', Lang::getTxt('poll_run_limit', file: 'Post'), '</em>
-							</dt>
-							<dd>
-								<input type="number" name="poll_expire" id="poll_expire" min="0" max="9999" value="', intval(Utils::$context['poll']['expiration']), '">
-							</dd>
-							<dt>
-								<label for="poll_change_vote">', Lang::getTxt('poll_do_change_vote', file: 'Post'), '</label>
-							</dt>
-							<dd>
-								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty(Utils::$context['poll']['change_vote']) ? ' checked' : '', '>
-							</dd>';
-
-		if (Utils::$context['poll']['guest_vote_allowed']) {
-			echo '
-							<dt>
-								<label for="poll_guest_vote">', Lang::getTxt('poll_guest_vote', file: 'Post'), '</label>
-							</dt>
-							<dd>
-								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty(Utils::$context['poll']['guest_vote']) ? ' checked' : '', '>
-							</dd>';
-		}
-	}
-
-	echo '
-							<dt>
-								', Lang::getTxt('poll_results_visibility', file: 'Post'), '
-							</dt>
-							<dd>
-								<input type="radio" name="poll_hide" id="poll_results_anyone" value="0"', Utils::$context['poll']['hide_results'] == 0 ? ' checked' : '', '> <label for="poll_results_anyone">', Lang::getTxt('poll_results_anyone', file: 'Post'), '</label><br>
-								<input type="radio" name="poll_hide" id="poll_results_voted" value="1"', Utils::$context['poll']['hide_results'] == 1 ? ' checked' : '', '> <label for="poll_results_voted">', Lang::getTxt('poll_results_voted', file: 'Post'), '</label><br>
-								<input type="radio" name="poll_hide" id="poll_results_expire" value="2"', Utils::$context['poll']['hide_results'] == 2 ? ' checked' : '', empty(Utils::$context['poll']['expiration']) ? ' disabled' : '', '> <label for="poll_results_expire">', Lang::getTxt('poll_results_after', file: 'Post'), '</label>
-							</dd>
-						</dl>
-					</fieldset>';
-
-	// If this is an edit, we can allow them to reset the vote counts.
-	if (Utils::$context['is_edit']) {
-		echo '
-					<fieldset id="poll_reset">
-						<legend>', Lang::getTxt('reset_votes', file: 'Post'), '</legend>
-						<input type="checkbox" name="resetVoteCount" value="on"> ' . Lang::getTxt('reset_votes_check', file: 'Post') . '
-					</fieldset>';
-	}
-	echo '
-					<input type="submit" name="post" value="', Lang::getTxt('save', file: 'General'), '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
-				</div><!-- .roundframe -->
-			</div>
-			<input type="hidden" name="seqnum" value="', Utils::$context['form_sequence_number'], '">
-			<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
-		</form>
-	</div><!-- #edit_poll -->';
-}
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
deleted file mode 100644
index 38c8542e0ce..00000000000
--- a/Themes/default/Post.template.php
+++ /dev/null
@@ -1,1136 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\BrowserDetector;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * The main template for the post page.
- */
-function template_main()
-{
-	// Start the javascript... and boy is there a lot.
-	echo '
-		<script>';
-
-	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (BrowserDetector::isBrowser('is_firefox')) {
-		echo '
-			window.addEventListener("pageshow", reActivate, false);';
-	}
-
-	// Start with message icons - and any missing from this theme.
-	echo '
-			var icon_urls = ', json_encode(array_column(Utils::$context['icons'], 'url', 'value'), JSON_UNESCAPED_SLASHES), ';';
-
-	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if (Utils::$context['make_event']) {
-		echo '
-			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
-	}
-
-	// End of the javascript, start the form and display the link tree.
-	echo '
-		</script>
-		<form action="', Config::$scripturl, '?action=', Utils::$context['destination'], ';', empty(Utils::$context['current_board']) ? '' : 'board=' . Utils::$context['current_board'], '" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" class="flow_hidden" onsubmit="', (Utils::$context['becomes_approved'] ? '' : 'alert(\'' . Lang::getTxt('js_post_will_require_approval', file: 'Post') . '\');'), 'submitonce(this);" enctype="multipart/form-data">';
-
-	// If the user wants to see how their message looks - the preview section is where it's at!
-	echo '
-			<div id="preview_section"', isset(Utils::$context['preview_message']) ? '' : ' style="display: none;"', '>
-				<div class="cat_bar">
-					<h3 class="catbg">
-						<span id="preview_subject">', empty(Utils::$context['preview_subject']) ? '&nbsp;' : Utils::$context['preview_subject'], '</span>
-					</h3>
-				</div>
-				<div id="preview_body" class="windowbg">
-					', empty(Utils::$context['preview_message']) ? '<br>' : Utils::adjustHeadingLevels(Utils::$context['preview_message'], 4), '
-				</div>
-			</div>
-			<br>';
-
-	if (Utils::$context['make_event'] && (!Utils::$context['event']->new || !empty(Utils::$context['current_board']))) {
-		echo '
-			<input type="hidden" name="eventid" value="', Utils::$context['event']->id, '">
-			<input type="hidden" name="recurrenceid" value="', Utils::$context['event']->selected_occurrence->id, '">';
-	}
-
-	// Start the main table.
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div id="post_area">
-				<div class="roundframe noup">', isset(Utils::$context['current_topic']) ? '
-					<input type="hidden" name="topic" value="' . Utils::$context['current_topic'] . '">' : '';
-
-	// If an error occurred, explain what happened.
-	echo '
-					<div class="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty(Utils::$context['post_error']) ? ' style="display: none"' : '', ' id="errors">
-						<dl>
-							<dt>
-								<strong id="error_serious">', Lang::getTxt('error_while_submitting', file: 'General'), '</strong>
-							</dt>
-							<dd class="error" id="error_list">
-								', empty(Utils::$context['post_error']) ? '' : implode('<br>', Utils::$context['post_error']), '
-							</dd>
-						</dl>
-					</div>';
-
-	// If this won't be approved let them know!
-	if (!Utils::$context['becomes_approved']) {
-		echo '
-					<div class="noticebox">
-						<em>', Lang::getTxt('wait_for_approval', file: 'General'), '</em>
-						<input type="hidden" name="not_approved" value="1">
-					</div>';
-	}
-
-	// If it's locked, show a message to warn the replier.
-	if (!empty(Utils::$context['locked'])) {
-		echo '
-					<div class="errorbox">
-						', Lang::getTxt('topic_locked_no_reply', file: 'Post'), '
-					</div>';
-	}
-
-	if (!empty(Config::$modSettings['drafts_post_enabled'])) {
-		echo '
-					<div id="draft_section" class="infobox"', isset(Utils::$context['draft_saved']) ? '' : ' style="display: none;"', '>',
-						Lang::getTxt('draft_saved', ['url' => Config::$scripturl . '?action=profile;u=' . User::$me->id . ';area=showdrafts'], file: 'Drafts'), '
-						', (!empty(Config::$modSettings['drafts_keep_days']) ? ' <strong>' . Lang::getTxt('draft_save_warning', [Config::$modSettings['drafts_keep_days']], file: 'Drafts') . '</strong>' : ''), '
-					</div>';
-	}
-
-	// The post header... important stuff
-	template_post_header();
-
-	// Are you posting a calendar event?
-	if (Utils::$context['make_event']) {
-		echo '
-					<div id="post_event">';
-
-		template_event_options();
-
-		if (!empty(Utils::$context['linked_calendar_events'])) {
-			template_linked_events();
-		}
-
-		echo '
-					</div><!-- #post_event -->';
-	}
-
-	// If this is a poll then display all the poll options!
-	if (Utils::$context['make_poll']) {
-		echo '
-					<hr class="clear">
-					<div id="edit_poll">
-						<fieldset id="poll_main">
-							<legend><span ', (isset(Utils::$context['poll_error']['no_question']) ? ' class="error"' : ''), '>', Lang::getTxt('poll_question', file: 'General'), '</span></legend>
-							<dl class="settings poll_options" id="poll_choices" data-more-txt="', Lang::getTxt('poll_add_option', file: 'Post'), '" data-option-txt="', Lang::getTxt('option_number', [999], file: 'Post'), '">
-								<dt>', Lang::getTxt('poll_question', file: 'General'), '</dt>
-								<dd>
-									<input type="text" name="question" value="', Utils::$context['question'] ?? '', '" size="80">
-								</dd>';
-
-		// Loop through all the choices and print them out.
-		foreach (Utils::$context['choices'] as $choice) {
-			echo '
-								<dt>
-									<label for="options-', $choice['id'], '">', Lang::getTxt('option_number', [$choice['number']], file: 'Post'), '</label>
-								</dt>
-								<dd>
-									<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">
-								</dd>';
-		}
-
-		// poll.js puts the "add option" button here, after the list it appends to.
-		echo '
-							</dl>
-						</fieldset>
-						<fieldset id="poll_options">
-							<legend>', Lang::getTxt('poll_options', file: 'Post'), '</legend>
-							<dl class="settings poll_options">
-								<dt>
-									<label for="poll_max_votes">', Lang::getTxt('poll_max_votes', file: 'Post'), '</label>
-								</dt>
-								<dd>
-									<input type="number" name="poll_max_votes" id="poll_max_votes" min="1" value="', Utils::$context['poll_options']['max_votes'], '">
-								</dd>
-								<dt>
-									<label for="poll_expire">', Lang::getTxt('poll_run', file: 'Post'), '</label><br>
-									<em class="smalltext">', Lang::getTxt('poll_run_limit', file: 'Post'), '</em>
-								</dt>
-								<dd>
-									<input type="number" name="poll_expire" id="poll_expire" min="0" max="9999" value="', intval(Utils::$context['poll_options']['expire'] ?? 0), '">
-								</dd>
-								<dt>
-									<label for="poll_change_vote">', Lang::getTxt('poll_do_change_vote', file: 'Post'), '</label>
-								</dt>
-								<dd>
-									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty(Utils::$context['poll']['change_vote']) ? ' checked' : '', '>
-								</dd>';
-
-		if (Utils::$context['poll_options']['guest_vote_enabled']) {
-			echo '
-								<dt>
-									<label for="poll_guest_vote">', Lang::getTxt('poll_guest_vote', file: 'Post'), '</label>
-								</dt>
-								<dd>
-									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty(Utils::$context['poll_options']['guest_vote']) ? ' checked' : '', '>
-								</dd>';
-		}
-
-		echo '
-								<dt>
-									', Lang::getTxt('poll_results_visibility', file: 'Post'), '
-								</dt>
-								<dd>
-									<input type="radio" name="poll_hide" id="poll_results_anyone" value="0"', Utils::$context['poll_options']['hide'] == 0 ? ' checked' : '', '> <label for="poll_results_anyone">', Lang::getTxt('poll_results_anyone', file: 'Post'), '</label><br>
-									<input type="radio" name="poll_hide" id="poll_results_voted" value="1"', Utils::$context['poll_options']['hide'] == 1 ? ' checked' : '', '> <label for="poll_results_voted">', Lang::getTxt('poll_results_voted', file: 'Post'), '</label><br>
-									<input type="radio" name="poll_hide" id="poll_results_expire" value="2"', Utils::$context['poll_options']['hide'] == 2 ? ' checked' : '', empty(Utils::$context['poll_options']['expire']) ? ' disabled' : '', '> <label for="poll_results_expire">', Lang::getTxt('poll_results_after', file: 'Post'), '</label>
-								</dd>
-							</dl>
-						</fieldset>
-					</div><!-- #edit_poll -->';
-	}
-
-	// Show the actual posting area...
-	template_control_richedit('message', true, true);
-
-	// Show attachments.
-	if (!empty(Utils::$context['current_attachments']) || Utils::$context['can_post_attachment']) {
-		echo '
-					<div id="post_attachments_area" class="roundframe noup">';
-
-		// The non-JavaScript UI.
-		echo '
-							<div id="postAttachment">
-								<div class="padding">
-									<div>
-										<strong>', Lang::getTxt('attachments', file: 'Post'), '</strong>:';
-
-		if (Utils::$context['can_post_attachment']) {
-			echo '
-										<input type="file" multiple="multiple" name="attachment[]">';
-		}
-
-		if (!empty(Config::$modSettings['attachmentSizeLimit'])) {
-			echo '
-										<input type="hidden" name="MAX_FILE_SIZE" value="' . Config::$modSettings['attachmentSizeLimit'] * 1024 . '">';
-		}
-
-		echo '
-									</div>';
-
-		if (!empty(Utils::$context['attachment_restrictions'])) {
-			echo '
-									<div class="smalltext">', Lang::getTxt('attach_restrictions', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['attachment_restrictions'])]), '</div>';
-		}
-
-		echo '
-									<div class="smalltext">
-										<input type="hidden" name="attach_del[]" value="0">
-										', Lang::getTxt('uncheck_unwatchd_attach', file: 'Post'), '
-									</div>
-								</div>
-								<div class="attachments">';
-
-		// If this post already has attachments on it - give information about them.
-		if (!empty(Utils::$context['current_attachments'])) {
-			foreach (Utils::$context['current_attachments'] as $attachment) {
-				echo '
-									<div class="attached">
-										<input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '>';
-
-				if (!empty(Config::$modSettings['attachmentShowImages'])) {
-					if (str_starts_with($attachment['mime_type'], 'image')) {
-						$src = Config::$scripturl . '?action=dlattach;attach=' . (!empty($attachment['thumb']) ? $attachment['thumb'] : $attachment['attachID']) . ';preview;image';
-					} else {
-					$src = Theme::$current->settings['images_url'] . '/generic_attach.png';
-					}
-
-					echo '
-										<div class="attachments_top">
-											<img src="', $src, '" alt="" loading="lazy" class="atc_img">
-										</div>';
-				}
-
-				echo '
-										<div class="attachments_bot">
-											<span class="name">' . $attachment['name'] . '</span>', (empty($attachment['approved']) ? '
-											<br>(' . Lang::getTxt('awaiting_approval', file: 'General') . ')' : ''), '
-											<br>', $attachment['size'] < 1024000 ? Lang::getTxt('size_kilobyte', [round($attachment['size'] / 1024, 2)], file: 'General') : Lang::getTxt('size_megabyte', [round($attachment['size'] / 1024 / 1024, 2)], file: 'General'), '
-										</div>
-									</div>';
-			}
-		}
-
-		echo '
-								</div>
-							</div>';
-
-		if (!empty(Utils::$context['files_in_session_warning'])) {
-			echo '
-							<div class="smalltext"><em>', Utils::$context['files_in_session_warning'], '</em></div>';
-		}
-
-		// Is the user allowed to post any additional ones? If so give them the boxes to do it!
-		if (Utils::$context['can_post_attachment']) {
-			// Print dropzone UI.
-			echo '
-						<div id="attachment_upload">
-							<div id="drop_zone_ui" class="centertext">
-								<div class="attach_drop_zone_label">
-									', Lang::getTxt(Utils::$context['num_allowed_attachments'] <= count(Utils::$context['current_attachments']) ? 'attach_limit_nag' : 'attach_drop_zone', file: 'Post'), '
-								</div>
-							</div>
-							<div class="files" id="attachment_previews">
-								<div id="au-template">
-									<div class="attachment_preview_wrapper">
-										<div class="attach-ui roundframe">
-											<a data-dz-remove class="main_icons delete floatright cancel"></a>
-											<div class="attached_BBC_width_height">
-												<div class="attached_BBC_width">
-													<label><span>', Lang::getTxt('attached_insert_width', file: 'Post'), '</span> <input type="number" name="attached_BBC_width" min="0" value="" placeholder="', Lang::getTxt('attached_insert_placeholder', file: 'Post'), '"></label>
-												</div>
-												<div class="attached_BBC_height">
-													<label><span>', Lang::getTxt('attached_insert_height', file: 'Post'), '</span> <input type="number" name="attached_BBC_height" min="0" value="" placeholder="', Lang::getTxt('attached_insert_placeholder', file: 'Post'), '"></label>
-												</div>
-											</div>
-										</div>
-										<div class="attach-preview">
-											<img data-dz-thumbnail />
-										</div>
-										<div class="attachment_info">
-											<span class="name" data-dz-name></span>
-											<span class="error" data-dz-errormessage></span>
-											<span class="size" data-dz-size></span>
-											<span class="message" data-dz-message></span>
-											<div class="progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">
-												<div class="bar"></div>
-											</div>
-										</div><!-- .attachment_info -->
-									</div>
-								</div><!-- #au-template -->
-								<div class="attachment_spacer">
-									<div class="fallback">
-											<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', Lang::getTxt('clean_attach', file: 'Post'), '</a>)';
-
-			if (!empty(Config::$modSettings['attachmentSizeLimit'])) {
-				echo '
-											<input type="hidden" name="MAX_FILE_SIZE" value="' . Config::$modSettings['attachmentSizeLimit'] * 1024 . '">';
-			}
-
-			echo '
-									</div><!-- .fallback -->
-								</div>
-							</div><!-- #attachment_previews -->
-						</div>
-						<div id="max_files_progress" class="max_files_progress progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">
-							<div class="bar"></div>
-							<div id="max_files_progress_text"></div>
-						</div>';
-		}
-
-		echo '
-					</div>';
-	}
-
-	// If the admin has enabled the hiding of the additional options, fold them
-	// away behind a disclosure triangle. A details element remembers nothing by
-	// itself, so the script further down copies its state into the hidden
-	// additional_options field that gets posted back.
-	if (!empty(Config::$modSettings['additional_options_collapsable'])) {
-		echo '
-					<details id="post_options_toggle"', Utils::$context['show_additional_options'] ? ' open' : '', '>
-						<summary>', Lang::getTxt('post_additionalopt', file: 'Post'), '</summary>';
-	}
-
-	// Display the checkboxes for all the standard options - if they are available to the user!
-	template_post_options(Utils::$context['post_options']);
-
-	if (!empty(Config::$modSettings['additional_options_collapsable'])) {
-		echo '
-					</details>';
-	}
-
-	// If the admin enabled the drafts feature, show a draft selection box
-	if (!empty(Config::$modSettings['drafts_post_enabled']) && !empty(Utils::$context['drafts']) && !empty(Config::$modSettings['drafts_show_saved_enabled']) && !empty(Theme::$current->options['drafts_show_saved_enabled'])) {
-		echo '
-					<div id="post_draft_options_header" class="title_bar">
-						<h4 class="titlebg">
-							<strong><a href="#" id="postDraftExpandLink">', Lang::getTxt('drafts_show', file: 'Drafts'), '</a></strong>
-						</h4>
-						<span id="postDraftExpand" class="toggle_up" style="display: none;"></span>
-					</div>
-					<div id="post_draft_options">
-						<dl class="settings">
-							<dt><strong>', Lang::getTxt('subject', file: 'General'), '</strong></dt>
-							<dd><strong>', trim(Lang::getTxt('draft_saved_on', ['date' => ''], file: 'Drafts')), '</strong></dd>';
-
-		foreach (Utils::$context['drafts'] as $draft) {
-			echo '
-							<dt>', $draft['link'], '</dt>
-							<dd>', $draft['poster_time'], '</dd>';
-		}
-		echo '
-						</dl>
-					</div>';
-	}
-
-	// Is visual verification enabled?
-	if (Utils::$context['require_verification']) {
-		echo '
-					<div class="post_verification">
-						<span', !empty(Utils::$context['post_error']['need_qr_verification']) ? ' class="error"' : '', '>
-							<strong>', Lang::getTxt('verification', file: 'General'), '</strong>
-						</span>
-						', template_control_verification(Utils::$context['visual_verification_id'], 'all'), '
-					</div>';
-	}
-
-	// Finally, the submit buttons.
-	echo '
-					<span id="post_confirm_buttons">
-						', template_control_richedit_buttons('message');
-
-	echo '
-					</span>
-				</div><!-- .roundframe -->
-			</div><!-- #post_area -->
-			<br class="clear">';
-
-	// Assuming this isn't a new topic pass across the last message id.
-	if (isset(Utils::$context['topic_last_message'])) {
-		echo '
-			<input type="hidden" name="last_msg" value="', Utils::$context['topic_last_message'], '">';
-	}
-
-	echo '
-			<input type="hidden" name="additional_options" id="additional_options" value="', Utils::$context['show_additional_options'] ? '1' : '0', '">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="seqnum" value="', Utils::$context['form_sequence_number'], '">
-		</form>';
-
-	echo '
-		<script>';
-
-	$newPostsHTML = '
-		<span id="new_replies"></span>
-		<div class="windowbg">
-			<div id="msg%PostID%">
-			<h5 class="floatleft">
-				' . Lang::getTxt('posted_by_member_time', ['member' => '%PosterName%', 'time' => '%PostTime%'], file: 'General') . '&nbsp;&#187; <span class="new_posts" id="image_new_%PostID%">' . Lang::getTxt('new', file: 'General') . '</span>
-			</h5>
-			<br class="clear">
-			<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">' . Lang::getTxt('ignoring_user', file: 'General') . '<a href="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">' . Lang::getTxt('show_ignore_user_post', file: 'General') . '</a></div>
-			<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%</div>';
-
-	if (Utils::$context['can_quote']) {
-		$newPostsHTML .= '
-			<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">
-				<li class="post_modify">
-					<a href="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"></span>' . Lang::getTxt('quote', file: 'General') . '</a>
-				</li>
-			</ul>';
-	}
-
-	$newPostsHTML .= '
-		</div>';
-
-	// The functions used to preview a posts without loading a new page.
-	echo '
-			var oPreviewPost = new smc_preview_post({
-				sPreviewSectionContainerID: "preview_section",
-				sPreviewSubjectContainerID: "preview_subject",
-				sPreviewBodyContainerID: "preview_body",
-				sErrorsContainerID: "errors",
-				sErrorsSeriousContainerID: "error_serious",
-				sErrorsListContainerID: "error_list",
-				sCaptionContainerID: "caption_%ID%",
-				sNewImageContainerID: "image_new_%ID%",
-				sPostBoxContainerID: ', Utils::escapeJavaScript('message'), ',
-				bMakePoll: ', Utils::$context['make_poll'] ? 'true' : 'false', ',
-				sTxtPreviewTitle: ', Utils::escapeJavaScript(Lang::getTxt('preview_title', file: 'General')), ',
-				sTxtPreviewFetch: ', Utils::escapeJavaScript(Lang::getTxt('preview_fetch', file: 'General')), ',
-				sSessionVar: ', Utils::escapeJavaScript(Utils::$context['session_var']), ',
-				newPostsTemplate:', Utils::escapeJavaScript($newPostsHTML);
-
-	if (!empty(Utils::$context['current_board'])) {
-		echo ',
-				iCurrentBoard: ', Utils::$context['current_board'], '';
-	}
-
-	echo '
-			});';
-
-	// Remember whether the additional options were left open, so the next post
-	// form comes back the same way round.
-	if (!empty(Config::$modSettings['additional_options_collapsable'])) {
-		echo '
-			document.getElementById(\'post_options_toggle\').addEventListener(\'toggle\', function () {
-				document.getElementById(\'additional_options\').value = this.open ? \'1\' : \'0\';
-			});';
-	}
-
-	// Code for showing and hiding drafts
-	if (!empty(Utils::$context['drafts'])) {
-		echo '
-			var oSwapDraftOptions = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: true,
-				aSwappableContainers: [
-					\'post_draft_options\',
-				],
-				aSwapImages: [
-					{
-						sId: \'postDraftExpand\',
-						altExpanded: \'-\',
-						altCollapsed: \'+\'
-					}
-				],
-				aSwapLinks: [
-					{
-						sId: \'postDraftExpandLink\',
-						msgExpanded: ', Utils::escapeJavaScript(Lang::getTxt('draft_hide', file: 'Drafts')), ',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('drafts_show', file: 'Drafts')), '
-					}
-				]
-			});';
-	}
-
-	echo '
-			var oEditorID = "', Utils::$context['post_box_name'], '";
-		</script>';
-
-	// If the user is replying to a topic show the previous posts.
-	if (isset(Utils::$context['previous_posts']) && count(Utils::$context['previous_posts']) > 0) {
-		echo '
-		<div id="recent" class="flow_hidden main_section">
-			<div class="cat_bar cat_bar_round">
-				<h3 class="catbg">', Lang::getTxt('topic_summary', file: 'General'), '</h3>
-			</div>
-			<span id="new_replies"></span>';
-
-		$ignored_posts = [];
-
-		foreach (Utils::$context['previous_posts'] as $post) {
-			$ignoring = false;
-
-			if (!empty($post['is_ignored'])) {
-				$ignored_posts[] = $ignoring = $post['id'];
-			}
-
-			echo '
-			<div class="windowbg">
-				<div id="msg', $post['id'], '">
-					<div>
-						<h5 class="floatleft">
-							', Lang::getTxt('posted_by_member_time', ['member' => $post['poster'], 'time' => $post['time']], file: 'General'), '
-						</h5>
-					</div>';
-
-			if ($ignoring) {
-				echo '
-					<div id="msg_', $post['id'], '_ignored_prompt" class="smalltext">
-						', Lang::getTxt('ignoring_user', file: 'General'), '
-						<a href="#" id="msg_', $post['id'], '_ignored_link" style="display: none;">', Lang::getTxt('show_ignore_user_post', file: 'General'), '</a>
-					</div>';
-			}
-
-			echo '
-					<div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', Utils::adjustHeadingLevels($post['message'], 5), '</div>';
-
-			if (Utils::$context['can_quote']) {
-				echo '
-					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="main_icons quote_selected"></span>', Lang::getTxt('quote_selected_action', file: 'General'), '</a></li>
-						<li class="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="main_icons quote"></span>', Lang::getTxt('quote', file: 'General'), '</a></li>
-					</ul>';
-			}
-
-			echo '
-				</div><!-- #msg[id] -->
-			</div><!-- .windowbg -->';
-		}
-
-		echo '
-		</div><!-- #recent -->
-		<script>
-			var aIgnoreToggles = new Array();';
-
-		foreach ($ignored_posts as $post_id) {
-			echo '
-			aIgnoreToggles[', $post_id, '] = new smc_Toggle({
-				bToggleEnabled: true,
-				bCurrentlyCollapsed: true,
-				aSwappableContainers: [
-					\'msg_', $post_id, '_body\',
-					\'msg_', $post_id, '_quote\',
-				],
-				aSwapLinks: [
-					{
-						sId: \'msg_', $post_id, '_ignored_link\',
-						msgExpanded: \'\',
-						msgCollapsed: ', Utils::escapeJavaScript(Lang::getTxt('show_ignore_user_post', file: 'General')), '
-					}
-				]
-			});';
-		}
-
-		echo '
-			function insertQuoteFast(messageid)
-			{
-				var e = document.getElementById("', Utils::$context['post_box_name'], '");
-				sceditor.instance(e).insertQuoteFast(messageid);
-
-				return true;
-			}
-			function onReceiveOpener(text)
-			{
-				var e = document.getElementById("', Utils::$context['post_box_name'], '");
-				sceditor.instance(e).insert(text);
-			}
-		</script>';
-	}
-}
-
-/**
- * Draws the checkboxes that sit below the editor on the posting form.
- *
- * See Post::setupPostOptions() for what each option looks like. Anything an
- * option lists under 'hidden' is written out just before its checkbox, because
- * a checkbox that is not ticked submits nothing at all and the hidden field of
- * the same name is what carries the "off" value.
- *
- * @param array $post_options The options to draw, in the order they go in.
- */
-function template_post_options(array $post_options): void
-{
-	echo '
-					<ul id="post_options" class="smalltext">';
-
-	foreach ($post_options as $option) {
-		if (!$option['can_show']) {
-			continue;
-		}
-
-		echo '
-						<li>';
-
-		foreach ($option['hidden'] ?? [] as $hidden_name => $hidden_value) {
-			echo '
-							<input type="hidden" name="', $hidden_name, '" value="', $hidden_value, '">';
-		}
-
-		echo '
-							<label for="', $option['id'], '">
-								<input type="checkbox" name="', $option['name'], '" id="', $option['id'], '" value="', $option['value'] ?? '1', '"', $option['checked'] ? ' checked' : '', '> ', $option['label'], '
-							</label>
-						</li>';
-	}
-
-	echo '
-					</ul><!-- #post_options -->';
-}
-
-/**
- * The template for the spellchecker.
- */
-function template_spellcheck()
-{
-	// The style information that makes the spellchecker look... like the forum hopefully!
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Lang::getTxt('spell_check', file: 'General'), '</title>
-		<link rel="stylesheet" href="', Theme::$current->settings['theme_url'], '/css/index', Utils::$context['theme_variant'], '.css', Utils::$context['browser_cache'], '">
-		<style>
-			body, td {
-				font-size: small;
-				margin: 0;
-				background: #f0f0f0;
-				color: #000;
-				padding: 10px;
-			}
-			.highlight {
-				color: red;
-				font-weight: bold;
-			}
-			#spellview {
-				border-style: outset;
-				border: 1px solid black;
-				padding: 5px;
-				width: 95%;
-				height: 314px;
-				overflow: auto;
-				background: #ffffff;
-			}';
-
-	// As you may expect - we need a lot of javascript for this... load it from the separate files.
-	echo '
-		</style>
-		<script>
-			var spell_formname = window.opener.spell_formname;
-			var spell_fieldname = window.opener.spell_fieldname;
-		</script>
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/spellcheck.js', Utils::$context['browser_cache'], '"></script>
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/script.js', Utils::$context['browser_cache'], '"></script>
-		<script>
-			', Utils::$context['spell_js'], '
-		</script>
-	</head>
-	<body onload="nextWord(false);">
-		<form action="#" method="post" accept-charset="UTF-8" name="spellingForm" id="spellingForm" onsubmit="return false;">
-			<div id="spellview">&nbsp;</div>
-			<table width="100%">
-				<tr class="windowbg">
-					<td style="width: 50%; vertical-align: top">
-						', Lang::getTxt('spellcheck_change_to', file: 'Post'), '<br>
-						<input type="text" name="changeto" style="width: 98%;">
-					</td>
-					<td style="width: 50%">
-						', Lang::getTxt('spellcheck_suggest', file: 'Post'), '<br>
-						<select name="suggestions" style="width: 98%;" size="5" onclick="if (this.selectedIndex != -1) this.form.changeto.value = this.options[this.selectedIndex].text;" ondblclick="replaceWord();">
-						</select>
-					</td>
-				</tr>
-			</table>
-			<div class="righttext" style="padding: 4px;">
-				<input type="button" name="change" value="', Lang::getTxt('spellcheck_change', file: 'Post'), '" onclick="replaceWord();" class="button">
-				<input type="button" name="changeall" value="', Lang::getTxt('spellcheck_change_all', file: 'Post'), '" onclick="replaceAll();" class="button">
-				<input type="button" name="ignore" value="', Lang::getTxt('spellcheck_ignore', file: 'Post'), '" onclick="nextWord(false);" class="button">
-				<input type="button" name="ignoreall" value="', Lang::getTxt('spellcheck_ignore_all', file: 'Post'), '" onclick="nextWord(true);" class="button">
-			</div>
-		</form>
-	</body>
-</html>';
-}
-
-/**
- * The template for the AJAX quote feature
- */
-function template_quotefast()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Lang::getTxt('retrieving_quote', file: 'Post'), '</title>
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/script.js', Utils::$context['browser_cache'], '"></script>
-	</head>
-	<body>
-		', Lang::getTxt('retrieving_quote', file: 'Post'), '
-		<div id="temporary_posting_area" style="display: none;"></div>
-		<script>';
-
-	if (Utils::$context['close_window']) {
-		echo '
-			window.close();';
-	} else {
-		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;)
-		echo '
-			var quote = \'', Utils::$context['quote']['text'], '\';
-			var stage = \'createElement\' in document ? document.createElement("DIV") : document.getElementById("temporary_posting_area");
-
-			if (\'DOMParser\' in window && !(\'opera\' in window))
-			{
-				var xmldoc = new DOMParser().parseFromString("<temp>" + \'', Utils::$context['quote']['mozilla'], '\'.replace(/\n/g, "_SMF-BREAK_").replace(/\t/g, "_SMF-TAB_") + "</temp>", "text/xml");
-				quote = xmldoc.childNodes[0].textContent.replace(/_SMF-BREAK_/g, "\n").replace(/_SMF-TAB_/g, "\t");
-			}
-			else if (\'innerText\' in stage)
-			{
-				setInnerHTML(stage, quote.replace(/\n/g, "_SMF-BREAK_").replace(/\t/g, "_SMF-TAB_").replace(/</g, "&lt;").replace(/>/g, "&gt;"));
-				quote = stage.innerText.replace(/_SMF-BREAK_/g, "\n").replace(/_SMF-TAB_/g, "\t");
-			}
-
-			if (\'opera\' in window)
-				quote = quote.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, \'"\').replace(/&amp;/g, "&");
-
-			window.opener.onReceiveOpener(quote);
-
-			window.focus();
-			setTimeout(function() { window.close(); }, 400);';
-	}
-	echo '
-		</script>
-	</body>
-</html>';
-}
-
-/**
- * The form for sending out an announcement
- */
-function template_announce()
-{
-	echo '
-	<div id="announcement">
-		<form action="', Config::$scripturl, '?action=announce;sa=send" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('announce_title', file: 'Post'), '</h3>
-			</div>
-			<div class="information">
-				', Lang::getTxt('announce_desc', file: 'Post'), '
-			</div>
-			<div class="windowbg">
-				<p>
-					', Lang::getTxt('announce_this_topic', ['subject' => '<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.0">' . Utils::$context['topic_subject'] . '</a>'], file: 'Post'), '
-				</p>
-				<ul>';
-
-	foreach (Utils::$context['groups'] as $group) {
-		echo '
-					<li>
-						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'] ?? Lang::getTxt('not_applicable', file: 'General'), ')</em>
-					</li>';
-	}
-
-	echo '
-					<li>
-						<label for="checkall"><input type="checkbox" id="checkall" onclick="invertAll(this, this.form);" checked> <em>', Lang::getTxt('check_all', file: 'General'), '</em></label>
-					</li>
-				</ul>
-				<hr>
-				<div id="confirm_buttons">
-					<input type="submit" value="', Lang::getTxt('post', file: 'General'), '" class="button">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="topic" value="', Utils::$context['current_topic'], '">
-					<input type="hidden" name="move" value="', Utils::$context['move'], '">
-					<input type="hidden" name="goback" value="', Utils::$context['go_back'], '">
-				</div>
-				<br class="clear_right">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #announcement -->
-	<br>';
-}
-
-/**
- * The confirmation/progress page, displayed after the admin has clicked the button to send the announcement.
- */
-function template_announcement_send()
-{
-	echo '
-	<div id="announcement">
-		<form action="', Config::$scripturl, '?action=announce;sa=send" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">
-			<div class="windowbg">
-				<p>
-					', Lang::getTxt('announce_sending', ['subject' => '<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.0" target="_blank" rel="noopener">' . Utils::$context['topic_subject'] . '</a>'], file: 'Post'),'
-				</p>
-				<div class="progress_bar">
-					<span>', Lang::getTxt('announce_done', Utils::$context, file: 'Post'), '</span>
-					<div class="bar" style="width: ', Utils::$context['percentage_done'], '%;"></div>
-				</div>
-				<hr>
-				<div id="confirm_buttons">
-					<input type="submit" name="cont" value="', Lang::getTxt('announce_continue', file: 'Post'), '" class="button">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="topic" value="', Utils::$context['current_topic'], '">
-					<input type="hidden" name="move" value="', Utils::$context['move'], '">
-					<input type="hidden" name="goback" value="', Utils::$context['go_back'], '">
-					<input type="hidden" name="start" value="', Utils::$context['start'], '">
-					<input type="hidden" name="membergroups" value="', Utils::$context['membergroups'], '">
-				</div>
-				<br class="clear_right">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #announcement -->
-	<br>
-	<script>
-		doAutoSubmit(2, ', Utils::escapeJavaScript(Lang::getTxt('announce_continue', file: 'Post')), ');
-	</script>';
-}
-
-/**
- * Prints the input fields in the form's header (subject, message icon, guest name & email, etc.)
- *
- * Mod authors can use the 'integrate_post_end' hook to modify or add to these (see Post.php).
- *
- * Theme authors can customize the output in a couple different ways:
- * 1. Change specific values in the Utils::$context['posting_fields'] array.
- * 2. Add an 'html' element to the 'label' and/or 'input' elements of the field they want to
- *    change. This should contain the literal HTML string to be printed.
- *
- * See the documentation in Post.php for more info on the Utils::$context['posting_fields'] array.
- */
-function template_post_header()
-{
-	// Sanity check: submitting the form won't work without at least a subject field
-	if (empty(Utils::$context['posting_fields']['subject']) || !is_array(Utils::$context['posting_fields']['subject'])) {
-		Utils::$context['posting_fields']['subject'] = [
-			'label' => ['html' => '<label for="subject" id="caption_subject">' . Lang::getTxt('subject', file: 'General') . '</label>'],
-			'input' => ['html' => '<input type="text" id="subject" name="subject" value="' . Utils::$context['subject'] . '" size="80" maxlength="80" required>'],
-		];
-	}
-
-	// THEME AUTHORS: Above this line is a great place to make customizations to the posting_fields array
-
-	// Start printing the header
-	echo '
-					<dl id="post_header">';
-
-	foreach (Utils::$context['posting_fields'] as $pfid => $pf) {
-		// We need both a label and an input
-		if (empty($pf['label']) || empty($pf['input'])) {
-			continue;
-		}
-
-		// The labels are pretty simple...
-		echo '
-						<dt class="clear pf_', $pfid, '">';
-
-		// Any leading HTML before the label
-		if (!empty($pf['label']['before'])) {
-			echo '
-							', $pf['label']['before'];
-		}
-
-		if (!empty($pf['label']['html'])) {
-			echo $pf['label']['html'];
-		} else {
-		echo '
-							<label', ($pf['input']['type'] === 'radio_select' ? '' : ' for="' . (!empty($pf['input']['attributes']['id']) ? $pf['input']['attributes']['id'] : $pfid) . '"'), ' id="caption_', $pfid, '"', !empty($pf['label']['class']) ? ' class="' . $pf['label']['class'] . '"' : '', '>', $pf['label']['text'], '</label>';
-		}
-
-		// Any trailing HTML after the label
-		if (!empty($pf['label']['after'])) {
-			echo '
-							', $pf['label']['after'];
-		}
-
-		echo '
-						</dt>';
-
-		// Here's where the fun begins...
-		echo '
-						<dd class="pf_', $pfid, '">';
-
-		// Any leading HTML before the main input
-		if (!empty($pf['input']['before'])) {
-			echo '
-							', $pf['input']['before'];
-		}
-
-		// If there is a literal HTML string already defined, just print it.
-		if (!empty($pf['input']['html'])) {
-			echo $pf['input']['html'];
-		}
-		// Simple text inputs and checkboxes
-		elseif (in_array($pf['input']['type'], ['text', 'password', 'color', 'date', 'datetime-local', 'email', 'month', 'number', 'range', 'tel', 'time', 'url', 'week', 'checkbox'])) {
-			echo '
-							<input type="', $pf['input']['type'], '"';
-
-			if (empty($pf['input']['attributes']['id'])) {
-				echo ' id="', $pfid, '"';
-			}
-
-			if (empty($pf['input']['attributes']['name'])) {
-				echo ' name="', $pfid, '"';
-			}
-
-			if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])) {
-				foreach ($pf['input']['attributes'] as $attribute => $value) {
-					if (is_bool($value)) {
-						echo $value ? ' ' . $attribute : '';
-					} else {
-					echo ' ', $attribute, '="', $value, '"';
-					}
-				}
-			}
-
-			echo '>';
-		}
-		// textarea
-		elseif ($pf['input']['type'] === 'textarea') {
-			echo '
-							<textarea';
-
-			if (empty($pf['input']['attributes']['id'])) {
-				echo ' id="', $pfid, '"';
-			}
-
-			if (empty($pf['input']['attributes']['name'])) {
-				echo ' name="', $pfid, '"';
-			}
-
-			if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])) {
-				foreach ($pf['input']['attributes'] as $attribute => $value) {
-					if ($attribute === 'value') {
-						continue;
-					}
-
-					if (is_bool($value)) {
-						echo $value ? ' ' . $attribute : '';
-					} else {
-					echo ' ', $attribute, '="', $value, '"';
-					}
-				}
-			}
-
-			echo '>', !empty($pf['input']['attributes']['value']) ? $pf['input']['attributes']['value'] : '', '</textarea>';
-		}
-		// Select menus are more complicated
-		elseif ($pf['input']['type'] === 'select' && is_array($pf['input']['options'])) {
-			// The select element itself
-			echo '
-							<select';
-
-			if (empty($pf['input']['attributes']['id'])) {
-				echo ' id="', $pfid, '"';
-			}
-
-			if (empty($pf['input']['attributes']['name'])) {
-				echo ' name="', $pfid, !empty($pf['input']['attributes']['multiple']) ? '[]' : '', '"';
-			}
-
-			if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])) {
-				foreach ($pf['input']['attributes'] as $attribute => $value) {
-					if (is_bool($value)) {
-						echo $value ? ' ' . $attribute : '';
-					} else {
-					echo ' ', $attribute, '="', $value, '"';
-					}
-				}
-			}
-
-			echo '>';
-
-			// The options
-			foreach ($pf['input']['options'] as $optlabel => $option) {
-				// An option containing options is an optgroup
-				if (!empty($option['options']) && is_array($option['options'])) {
-					echo '
-								<optgroup';
-
-					if (empty($option['label'])) {
-						echo ' label="', $optlabel, '"';
-					}
-
-					if (!empty($option) && is_array($option)) {
-						foreach ($option as $attribute => $value) {
-							if ($attribute === 'options') {
-								continue;
-							}
-
-							if (is_bool($value)) {
-								echo $value ? ' ' . $attribute : '';
-							} else {
-							echo ' ', $attribute, '="', $value, '"';
-							}
-						}
-					}
-
-					echo '>';
-
-					foreach ($option['options'] as $grouped_optlabel => $grouped_option) {
-						echo '
-									<option';
-
-						foreach ($grouped_option as $attribute => $value) {
-							if (is_bool($value)) {
-								echo $value ? ' ' . $attribute : '';
-							} else {
-							echo ' ', $attribute, '="', $value, '"';
-							}
-						}
-
-						echo '>', $grouped_option['label'], '</option>';
-
-					}
-
-					echo '
-								</optgroup>';
-				}
-				// Simple option
-				else {
-					echo '
-								<option';
-
-					foreach ($option as $attribute => $value) {
-						if (is_bool($value)) {
-							echo $value ? ' ' . $attribute : '';
-						} else {
-						echo ' ', $attribute, '="', $value, '"';
-						}
-					}
-
-					echo '>', $optlabel, '</option>';
-				}
-			}
-
-			// Close the select element
-			echo '
-							</select>';
-		}
-		// Radio_select makes a div with some radio buttons in it
-		elseif ($pf['input']['type'] === 'radio_select' && is_array($pf['input']['options'])) {
-			echo '
-							<div';
-
-			if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])) {
-				foreach ($pf['input']['attributes'] as $attribute => $value) {
-					if ($attribute === 'name') {
-						continue;
-					}
-
-					if (is_bool($value)) {
-						echo $value ? ' ' . $attribute : '';
-					} else {
-					echo ' ', $attribute, '="', $value, '"';
-					}
-				}
-			}
-
-			echo '>';
-
-			foreach ($pf['input']['options'] as $optlabel => $option) {
-				echo '
-							<label style="margin-right:2ch"><input type="radio" name="', !empty($pf['input']['attributes']['name']) ? $pf['input']['attributes']['name'] : $pfid, '"';
-
-				foreach ($option as $attribute => $value) {
-					if ($attribute === 'label') {
-						continue;
-					}
-
-					if (is_bool($value)) {
-						echo $value ? ' ' . ($attribute === 'selected' ? 'checked' : $attribute) : '';
-					} else {
-					echo ' ', $attribute, '="', $value, '"';
-					}
-				}
-
-				echo '> ', $option['label'] ?? $optlabel, '</label>';
-			}
-
-			echo '
-							</div>';
-		}
-
-		// Any trailing HTML after the main input
-		if (!empty($pf['input']['after'])) {
-			echo '
-							', $pf['input']['after'];
-		}
-
-		echo '
-						</dd>';
-	}
-
-	echo '
-					</dl>';
-}
diff --git a/Themes/default/Printpage.template.php b/Themes/default/Printpage.template.php
deleted file mode 100644
index 6d1ab1ed5cf..00000000000
--- a/Themes/default/Printpage.template.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Topic;
-use SMF\Utils;
-
-/**
- * The header. Defines the look and layout of the page as well as a form for choosing print options.
- */
-function template_print_above()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<meta name="robots" content="noindex">
-		<link rel="canonical" href="', Utils::$context['canonical_url'], '">
-		<title>', Lang::getTxt('print_page', file: 'General'), ' - ', Utils::$context['topic_subject'], '</title>
-		<style>
-			body, a {
-				color: #000;
-				background: #fff;
-			}
-			body, td, .normaltext {
-				font-family: Verdana, arial, helvetica, serif;
-				font-size: small;
-			}
-			h1#title {
-				font-size: large;
-				font-weight: bold;
-			}
-			h2#linktree {
-				margin: 1em 0 2.5em 0;
-				font-size: small;
-				font-weight: bold;
-			}
-			dl#posts {
-				width: 90%;
-				margin: 0;
-				padding: 0;
-				list-style: none;
-			}
-			div.postheader, #poll_data {
-				border: solid #000;
-				border-width: 1px 0;
-				padding: 4px 0;
-			}
-			div.postbody {
-				margin: 1em 0 2em 2em;
-			}
-			table {
-				empty-cells: show;
-			}
-			blockquote {
-				margin: 0 0 8px 0;
-				padding: 6px 10px;
-				font-size: small;
-				border: 1px solid #d6dfe2;
-				border-left: 2px solid #aaa;
-				border-right: 2px solid #aaa;
-			}
-			blockquote cite {
-				display: block;
-				border-bottom: 1px solid #aaa;
-				font-size: 0.9em;
-			}
-			blockquote cite:before {
-				color: #aaa;
-				font-size: 22px;
-				font-style: normal;
-				margin-right: 5px;
-			}
-			code {
-				border: 1px solid #000;
-				margin: 3px;
-				padding: 1px;
-				display: block;
-			}
-			code {
-				font: x-small monospace;
-			}
-			.smalltext, .codeheader {
-				font-size: x-small;
-			}
-			.largetext {
-				font-size: large;
-			}
-			.centertext {
-				text-align: center;
-			}
-			hr {
-				height: 1px;
-				border: 0;
-				color: black;
-				background-color: black;
-			}
-			.voted {
-				font-weight: bold;
-			}
-			#footer {
-				font-family: Verdana, sans-serif;
-			}
-			@media print {
-				.print_options {
-					display: none;
-				}
-			}
-			@media screen {
-				.print_options {
-					margin: 1em 0;
-				}
-			}';
-
-	if (!empty(Config::$modSettings['max_image_width'])) {
-		echo '
-			.bbc_img {
-				max-width: ' . Config::$modSettings['max_image_width'] . 'px;
-			}';
-	}
-
-	if (!empty(Config::$modSettings['max_image_height'])) {
-		echo '
-			.bbc_img {
-				max-height: ' . Config::$modSettings['max_image_height'] . 'px;
-			}';
-	}
-
-	echo '
-		</style>
-	</head>
-	<body>';
-
-	template_print_options();
-
-	echo '
-		<h1 id="title">', Utils::$context['forum_name_html_safe'], '</h1>
-		<h2 id="linktree">', Utils::$context['category_name'], ' ▸ ', (!empty(Utils::$context['parent_boards']) ? implode(' ▸ ', Utils::$context['parent_boards']) . ' ▸ ' : ''), Utils::$context['board_name'], ' ▸ ', Lang::getTxt('started_by_member_time', ['member' => Utils::$context['poster_name'], 'time' => Utils::$context['post_time']], file: 'General'), '</h2>
-		<div id="posts">';
-}
-
-/**
- * The main page. This shows the relevant info in a printer-friendly format
- */
-function template_main()
-{
-	if (!empty(Utils::$context['poll'])) {
-		echo '
-			<div id="poll_data">
-				<span>', Lang::getTxt('poll', file: 'General'), '</span>
-				<div class="question">
-					', Lang::getTxt('poll_question', file: 'General'), ': <strong>', Utils::$context['poll']['question'], '</strong>
-				</div>';
-
-		$options = 1;
-
-		foreach (Utils::$context['poll']['options'] as $option) {
-			echo '
-					<div>
-						', Lang::getTxt('option_number', [$options++], file: 'Post'), ': <strong>', $option['option'], '</strong>
-						', Utils::$context['allow_results_view'] ? Lang::getTxt('number_of_votes', [$option['votes']], file: 'Post') : '', '
-					</div>';
-		}
-
-		echo '
-			</div>';
-	}
-
-	foreach (Utils::$context['posts'] as $post) {
-		echo '
-			<div class="postheader">
-				<div><strong>', $post['subject'], '</strong></div>
-				<div>', Lang::getTxt('posted_by_member_time', $post, file: 'General'), '</div>
-			</div>
-			<div class="postbody">
-				', Utils::adjustHeadingLevels($post['body'], 2);
-
-		// Show attachment images
-		if (isset($_GET['images']) && !empty(Utils::$context['printattach'][$post['id_msg']])) {
-			echo '
-				<hr>';
-
-			foreach (Utils::$context['printattach'][$post['id_msg']] as $attach) {
-				echo '
-					<img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', Config::$scripturl . '?action=dlattach;topic=' . Topic::$topic_id . '.0;attach=' . $attach['id_attach'] . '" alt="">';
-			}
-		}
-
-		echo '
-			</div><!-- .postbody -->';
-	}
-}
-
-/**
- * The footer.
- */
-function template_print_below()
-{
-	echo '
-		</div><!-- #posts -->';
-
-	template_print_options();
-
-	echo '
-		<div id="footer" class="smalltext">', Theme::copyright(), '</div>
-	</body>
-</html>';
-}
-
-/**
- * Displays the print page options
- */
-function template_print_options()
-{
-	$url_text = Config::$scripturl . '?action=printpage;topic=' . Topic::$topic_id . '.0';
-	$url_images = $url_text . ';images';
-
-	echo '
-		<div class="print_options">';
-
-	// Which option is set, text or text&images
-	if (isset($_REQUEST['images'])) {
-		echo '
-			<a href="', $url_text, '">', Lang::getTxt('print_page_text', file: 'General'), '</a> | <strong><a href="', $url_images, '">', Lang::getTxt('print_page_images', file: 'General'), '</a></strong>';
-	} else {
-	echo '
-			<strong><a href="', $url_text, '">', Lang::getTxt('print_page_text', file: 'General'), '</a></strong> | <a href="', $url_images, '">', Lang::getTxt('print_page_images', file: 'General'), '</a>';
-	}
-
-	echo '
-		</div><!-- .print_options -->';
-}
diff --git a/Themes/default/Profile.template.php b/Themes/default/Profile.template.php
deleted file mode 100644
index 55edc55738f..00000000000
--- a/Themes/default/Profile.template.php
+++ /dev/null
@@ -1,3460 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\BrowserDetector;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Profile;
-use SMF\Security;
-use SMF\Theme;
-use SMF\User;
-use SMF\Utils;
-
-/**
- * Minor stuff shown above the main profile - mostly used for error messages and showing that the profile update was successful.
- */
-function template_profile_above()
-{
-	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
-	if (BrowserDetector::isBrowser('is_chrome') && !Profile::$member->is_me) {
-		echo '
-			<script>
-				disableAutoComplete();
-			</script>';
-	}
-
-	// If an error occurred while trying to save previously, give the user a clue!
-	echo '
-			', template_error_message();
-
-	// If the profile was update successfully, let the user know this.
-	if (!empty(Utils::$context['profile_updated'])) {
-		echo '
-			<div class="infobox">
-				', Utils::$context['profile_updated'], '
-			</div>';
-	}
-}
-
-/**
- * Template for any HTML needed below the profile (closing off divs/tables, etc.)
- */
-function template_profile_below() {}
-
-/**
- * Template for showing off the spiffy popup of the menu
- */
-function template_profile_popup()
-{
-	// Unlike almost every other template, this is designed to be included into the HTML directly via $().load()
-
-	echo '
-		<div class="profile_user_avatar floatleft">
-			<a href="', Config::$scripturl, '?action=profile;u=', User::$me->id, '">', Utils::$context['member']['avatar']['image'], '</a>
-		</div>
-		<div class="profile_user_info floatleft">
-			<span class="profile_username"><a href="', Config::$scripturl, '?action=profile;u=', User::$me->id, '">', User::$me->name, '</a></span>
-			<span class="profile_group">', Utils::$context['member']['group'], '</span>
-		</div>
-		<div class="profile_user_links">
-			<ol>';
-
-	$menu_context = &Utils::$context[Utils::$context['profile_menu_name']];
-
-	foreach (Utils::$context['profile_items'] as $item) {
-		$area = $menu_context['sections'][$item['menu']]['areas'][$item['area']];
-		$item_url = ($item['url'] ?? ($area['url'] ?? $menu_context['base_url'] . ';area=' . $item['area'])) . $menu_context['extra_parameters'];
-		echo '
-				<li>
-					', $area['icon'], '<a href="', $item_url, '">', !empty($item['title']) ? $item['title'] : $area['label'], '</a>
-				</li>';
-	}
-
-	echo '
-			</ol>
-		</div><!-- .profile_user_links -->';
-}
-
-/**
- * The "popup" showing the user's alerts
- */
-function template_alerts_popup()
-{
-	// Unlike almost every other template, this is designed to be included into the HTML directly via $().load()
-	echo '
-		<div class="alert_bar">
-			<div class="alerts_opts block">
-				<a href="' . Config::$scripturl . '?action=profile;area=notification;sa=markread;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" onclick="return markAlertsRead(this)">', Lang::getTxt('mark_alerts_read', file: 'Alerts'), '</a>
-				<a href="', Config::$scripturl, '?action=profile;area=notification;sa=alerts" class="floatright">', Lang::getTxt('alert_settings', file: 'Alerts'), '</a>
-			</div>
-			<div class="alerts_box centertext">
-				<a href="', Config::$scripturl, '?action=profile;area=showalerts" class="button">', Lang::getTxt('all_alerts', file: 'Alerts'), '</a>
-			</div>
-		</div>
-		<div class="alerts_unread">';
-
-	if (empty(Utils::$context['unread_alerts'])) {
-		template_alerts_all_read();
-	} else {
-		foreach (Utils::$context['unread_alerts'] as $id_alert => $details) {
-			echo '
-			<', !$details['show_links'] ? 'a href="' . Config::$scripturl . '?action=profile;area=showalerts;alert=' . $id_alert . '" onclick="this.classList.add(\'alert_read\')"' : 'div', ' class="unread_notify">
-				<div class="unread_notify_image">
-					', empty($details['sender']['avatar']['image']) ? '' : $details['sender']['avatar']['image'] . '
-					', $details['icon'], '
-				</div>
-				<div class="details">
-					<span class="alert_text">', $details['text'], '</span> - <span class="alert_time">', $details['time'], '</span>
-				</div>
-			</', !$details['show_links'] ? 'a' : 'div', '>';
-		}
-	}
-
-	echo '
-		</div><!-- .alerts_unread -->
-		<script>
-			function markAlertsRead(obj) {
-				ajax_indicator(true);
-				$.get(
-					obj.href,
-					function(data) {
-						ajax_indicator(false);
-						$("#alerts_menu_top span.amt").remove();
-						$("#alerts_menu div.alerts_unread").html(data);
-						if (typeof localStorage != "undefined")
-							localStorage.setItem("alertsCounter", 0);
-					}
-				);
-				return false;
-			}
-		</script>';
-}
-
-/**
- * A simple template to say "You don't have any unread alerts".
- */
-function template_alerts_all_read()
-{
-	echo '<div class="no_unread">', Lang::getTxt('alerts_no_unread', file: 'Alerts'), '</div>';
-}
-
-/**
- * This template displays a user's details without any option to edit them.
- */
-function template_summary()
-{
-	// Display the basic information about the user
-	echo '
-	<div id="profileview" class="roundframe flow_auto noup">
-		<div id="basicinfo">';
-
-	// Are there any custom profile fields for above the name?
-	if (!empty(Utils::$context['print_custom_fields']['above_member'])) {
-		$fields = '';
-
-		foreach (Utils::$context['print_custom_fields']['above_member'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields .= '
-					<li>' . $field['output_html'] . '</li>';
-			}
-		}
-
-		if (!empty($fields)) {
-			echo '
-			<div class="custom_fields_above_name">
-				<ul>', $fields, '
-				</ul>
-			</div>';
-		}
-	}
-
-	echo '
-			<div class="username clear">
-				<h4>';
-
-	if (!empty(Utils::$context['print_custom_fields']['before_member'])) {
-		foreach (Utils::$context['print_custom_fields']['before_member'] as $field) {
-			if (!empty($field['output_html'])) {
-				echo '
-					<span>', $field['output_html'], '</span>';
-			}
-		}
-	}
-
-	echo '
-					', Utils::$context['member']['name'];
-
-	if (!empty(Utils::$context['print_custom_fields']['after_member'])) {
-		foreach (Utils::$context['print_custom_fields']['after_member'] as $field) {
-			if (!empty($field['output_html'])) {
-				echo '
-					<span>', $field['output_html'], '</span>';
-			}
-		}
-	}
-
-	echo '
-					<span class="position">', (!empty(Utils::$context['member']['group']) ? Utils::$context['member']['group'] : Utils::$context['member']['post_group']), '</span>
-				</h4>
-			</div>
-			', Utils::$context['member']['avatar']['image'];
-
-	// Are there any custom profile fields for below the avatar?
-	if (!empty(Utils::$context['print_custom_fields']['below_avatar'])) {
-		$fields = '';
-
-		foreach (Utils::$context['print_custom_fields']['below_avatar'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields .= '
-					<li>' . $field['output_html'] . '</li>';
-			}
-		}
-
-		if (!empty($fields)) {
-			echo '
-			<div class="custom_fields_below_avatar">
-				<ul>', $fields, '
-				</ul>
-			</div>';
-		}
-	}
-
-	echo '
-			<ul class="icon_fields clear">';
-
-	// Email is only visible if it's your profile or you have the moderate_forum permission
-	if (Utils::$context['member']['show_email']) {
-		echo '
-				<li><a href="mailto:', Utils::$context['member']['email'], '" title="', Utils::$context['member']['email'], '" rel="nofollow"><span class="main_icons mail" title="' . Lang::getTxt('email', file: 'General') . '"></span></a></li>';
-	}
-
-	// Don't show an icon if they haven't specified a website.
-	if (Utils::$context['member']['website']['url'] !== '' && !isset(Utils::$context['disabled_fields']['website'])) {
-		echo '
-				<li><a href="', Utils::$context['member']['website']['url'], '" title="' . Utils::$context['member']['website']['title'] . '" target="_blank" rel="noopener"><span class="main_icons www" title="' . Utils::$context['member']['website']['title'] . '"></span></a></li>';
-	}
-
-	// Are there any custom profile fields as icons?
-	if (!empty(Utils::$context['print_custom_fields']['icons'])) {
-		foreach (Utils::$context['print_custom_fields']['icons'] as $field) {
-			if (!empty($field['output_html'])) {
-				echo '
-				<li class="custom_field">', $field['output_html'], '</li>';
-			}
-		}
-	}
-
-	echo '
-			</ul>
-			<span id="userstatus">
-				', Utils::$context['can_send_pm'] ? '<a href="' . Utils::$context['member']['online']['href'] . '" title="' . Utils::$context['member']['online']['text'] . '" rel="nofollow">' : '', '<span class="' . (Utils::$context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . Utils::$context['member']['online']['text'] . '"></span>', Utils::$context['can_send_pm'] ? '</a>' : '', '<span class="smalltext"> ' . Utils::$context['member']['online']['label'] . '</span>';
-
-	// Can they add this member as a buddy?
-	if (!empty(Utils::$context['can_have_buddy']) && !Profile::$member->is_me) {
-		echo '
-				<br>
-				<a href="', Config::$scripturl, '?action=buddy;u=', Utils::$context['id_member'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('buddy_' . (Utils::$context['member']['is_buddy'] ? 'remove' : 'add'), file: 'Profile'), '</a>';
-	}
-
-	echo '
-			</span>';
-
-	if (!Profile::$member->is_me && Utils::$context['can_send_pm']) {
-		echo '
-			<a href="', Config::$scripturl, '?action=pm;sa=send;u=', Utils::$context['id_member'], '" class="infolinks">', Lang::getTxt('profile_sendpm_short', file: 'Profile'), '</a>';
-	}
-
-	echo '
-			<a href="', Config::$scripturl, '?action=profile;area=showposts;u=', Utils::$context['id_member'], '" class="infolinks">', Lang::getTxt('showPosts', file: 'Profile'), '</a>';
-
-	if (Profile::$member->is_me && !empty(Config::$modSettings['drafts_post_enabled'])) {
-		echo '
-			<a href="', Config::$scripturl, '?action=profile;area=showdrafts;u=', Utils::$context['id_member'], '" class="infolinks">', Lang::getTxt('drafts_show', file: 'Drafts'), '</a>';
-	}
-
-	echo '
-			<a href="', Config::$scripturl, '?action=profile;area=statistics;u=', Utils::$context['id_member'], '" class="infolinks">', Lang::getTxt('statPanel', file: 'Profile'), '</a>';
-
-	// Are there any custom profile fields for bottom?
-	if (!empty(Utils::$context['print_custom_fields']['bottom_poster'])) {
-		$fields = '';
-
-		foreach (Utils::$context['print_custom_fields']['bottom_poster'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields .= '
-					<li>' . $field['output_html'] . '</li>';
-			}
-		}
-
-		if (!empty($fields)) {
-			echo '
-			<div class="custom_fields_bottom">
-				<ul class="nolist">', $fields, '
-				</ul>
-			</div>';
-		}
-	}
-
-	echo '
-		</div><!-- #basicinfo -->
-
-		<div id="detailedinfo">
-			<dl class="settings">';
-
-	if (Profile::$member->is_me || User::$me->is_admin) {
-		echo '
-				<dt>', Lang::getTxt('username', file: 'General'), '</dt>
-				<dd>', Utils::$context['member']['username'], '</dd>';
-	}
-
-	if (!isset(Utils::$context['disabled_fields']['posts'])) {
-		echo '
-				<dt>', Lang::getTxt('profile_posts', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['posts'], ' (', is_numeric(Utils::$context['member']['posts_per_day']) ? Lang::getTxt('posts_per_day', [Utils::$context['member']['posts_per_day']], file: 'Profile') : Utils::$context['member']['posts_per_day'], ')</dd>';
-	}
-
-	if (Utils::$context['member']['show_email']) {
-		echo '
-				<dt>', Lang::getTxt('email', file: 'General'), '</dt>
-				<dd><a href="mailto:', Utils::$context['member']['email'], '">', Utils::$context['member']['email'], '</a></dd>';
-	}
-
-	if (!empty(Config::$modSettings['titlesEnable']) && !empty(Utils::$context['member']['title'])) {
-		echo '
-				<dt>', Lang::getTxt('custom_title', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['title'], '</dd>';
-	}
-
-	if (!empty(Utils::$context['member']['blurb'])) {
-		echo '
-				<dt>', Lang::getTxt('personal_text', file: 'General'), '</dt>
-				<dd>', Utils::$context['member']['blurb'], '</dd>';
-	}
-
-	echo '
-				<dt>', Lang::getTxt('age', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['age'] . (Utils::$context['member']['today_is_birthday'] ? ' &nbsp; <img src="' . Theme::$current->settings['images_url'] . '/cake.png" alt="">' : ''), '</dd>';
-
-	echo '
-			</dl>';
-
-	// Any custom fields for standard placement?
-	if (!empty(Utils::$context['print_custom_fields']['standard'])) {
-		$fields = [];
-
-		foreach (Utils::$context['print_custom_fields']['standard'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields[] = $field;
-			}
-		}
-
-		if (count($fields) > 0) {
-			echo '
-			<dl class="settings">';
-
-			foreach ($fields as $field) {
-				echo '
-				<dt>', $field['name'], ':</dt>
-				<dd>', $field['output_html'], '</dd>';
-			}
-
-			echo '
-			</dl>';
-		}
-	}
-
-	echo '
-			<dl class="settings">
-				<dt>', Lang::getTxt('date_registered', file: 'General'), '</dt>
-				<dd>', Utils::$context['member']['registered'], '</dd>';
-
-	// If the person looking is allowed, they can check the members IP address and hostname.
-	if (Utils::$context['can_see_ip']) {
-		if (!empty(Utils::$context['member']['ip'])) {
-			echo '
-				<dt>', Lang::getTxt('ip', file: 'General'), '</dt>
-				<dd><a href="', Config::$scripturl, '?action=profile;area=tracking;sa=ip;searchip=', Utils::$context['member']['ip'], ';u=', Utils::$context['member']['id'], '">', Utils::$context['member']['ip'], '</a></dd>';
-		}
-
-		if (!empty(Utils::$context['member']['hostname'])) {
-			echo '
-				<dt>', Lang::getTxt('hostname', file: 'General'), '</dt>
-				<dd>', Utils::$context['member']['hostname'], '</dd>';
-		}
-	}
-
-	echo '
-				<dt>', Lang::getTxt('local_time', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['local_time'], '</dd>';
-
-	if (!empty(Config::$modSettings['userLanguage']) && !empty(Utils::$context['member']['language'])) {
-		echo '
-				<dt>', Lang::getTxt('language', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['language'], '</dd>';
-	}
-
-	if (Utils::$context['member']['show_last_login']) {
-		echo '
-				<dt>', Lang::getTxt('lastLoggedIn', file: 'Profile'), '</dt>
-				<dd>', Utils::$context['member']['last_login'], (!empty(Utils::$context['member']['is_hidden']) ? ' (' . Lang::getTxt('hidden', file: 'Profile') . ')' : ''), '</dd>';
-	}
-
-	echo '
-			</dl>';
-
-	// Are there any custom profile fields for above the signature?
-	if (!empty(Utils::$context['print_custom_fields']['above_signature'])) {
-		$fields = '';
-
-		foreach (Utils::$context['print_custom_fields']['above_signature'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields .= '
-					<li>' . $field['output_html'] . '</li>';
-			}
-		}
-
-		if (!empty($fields)) {
-			echo '
-			<div class="custom_fields_above_signature">
-				<ul class="nolist">', $fields, '
-				</ul>
-			</div>';
-		}
-	}
-
-	// Show the users signature.
-	if (Utils::$context['signature_enabled'] && !empty(Utils::$context['member']['signature'])) {
-		echo '
-			<div class="signature">
-				<h5>', Lang::getTxt('signature', file: 'Profile'), '</h5>
-				', Utils::$context['member']['signature'], '
-			</div>';
-	}
-
-	// Are there any custom profile fields for below the signature?
-	if (!empty(Utils::$context['print_custom_fields']['below_signature'])) {
-		$fields = '';
-
-		foreach (Utils::$context['print_custom_fields']['below_signature'] as $field) {
-			if (!empty($field['output_html'])) {
-				$fields .= '
-					<li>' . $field['output_html'] . '</li>';
-			}
-		}
-
-		if (!empty($fields)) {
-			echo '
-			<div class="custom_fields_below_signature">
-				<ul class="nolist">', $fields, '
-				</ul>
-			</div>';
-		}
-	}
-
-	if (
-		(Utils::$context['can_view_warning'] && Utils::$context['member']['warning'])
-		|| !empty(Utils::$context['activate_message'])
-		|| !empty(Utils::$context['member']['bans'])
-	) {
-		echo '
-			<dl class="settings">';
-
-		// Can they view/issue a warning?
-		if (Utils::$context['can_view_warning'] && Utils::$context['member']['warning']) {
-			echo '
-					<dt>', Lang::getTxt('profile_warning_level', file: 'Profile'), '</dt>
-					<dd>
-						<a href="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=', (Utils::$context['can_issue_warning'] && !Profile::$member->is_me ? 'issuewarning' : 'viewwarning'), '">', Lang::formatText('{0, number, :: percent}', [Utils::$context['member']['warning']]), '</a>';
-
-			// Can we provide information on what this means?
-			if (!empty(Utils::$context['warning_status'])) {
-				echo '
-						<span class="smalltext">(', Utils::$context['warning_status'], ')</span>';
-			}
-
-			echo '
-					</dd>';
-		}
-
-		// Is this member requiring activation and/or banned?
-		if (!empty(Utils::$context['activate_message']) || !empty(Utils::$context['member']['bans'])) {
-			// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
-			if (!empty(Utils::$context['activate_message'])) {
-				echo '
-					<dt>
-						<span class="alert">', Utils::$context['activate_message'], '</span>
-					</dt>
-					<dd>
-						<a href="', Utils::$context['activate_link'], '" class="button">', Utils::$context['activate_link_text'], '</a>
-					</dd>';
-			}
-
-				if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])) {
-					echo '
-					<dt></dt>
-					<dd>
-						' . Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile') . '
-					</dd>';
-				} elseif (Utils::$context['activate_type'] % User::BANNED == User::REQUESTED_DELETE) {
-					echo '
-					<dt>
-						<label>' . Lang::getTxt('deleteAccount_anonymize', file: 'Profile') . '</label>
-					</dt>
-					<dd>
-						<input type="checkbox" name="anonymize" id="anonymize" value="1"', !empty(Config::$modSettings['always_anonymize_deleted_accounts']) ? ' checked disabled' : '', '>
-					</dd>';
-				}
-
-			// If the current member is banned, show a message and possibly a link to the ban.
-			if (!empty(Utils::$context['member']['bans'])) {
-				echo '
-					<dt class="clear">
-						<span class="alert">', Lang::getTxt('user_is_banned', file: 'Profile'), '</span>&nbsp;<a href="#" onclick="document.getElementById(\'ban_info\').classList.toggle(\'hidden\');return false;">' . Lang::getTxt('view_ban', file: 'Profile') . '</a>
-					</dt>
-					<dt class="clear hidden" id="ban_info">
-						<strong>', Lang::getTxt('user_banned_by_following', file: 'Profile'), '</strong>';
-
-				foreach (Utils::$context['member']['bans'] as $ban) {
-					echo '
-						<br>
-						<span class="smalltext">', $ban['explanation'], '</span>';
-				}
-
-				echo '
-					</dt>';
-			}
-		}
-
-		echo '
-			</dl>';
-	}
-
-	echo '
-		</div><!-- #detailedinfo -->
-	</div><!-- #profileview -->';
-}
-
-/**
- * Template for showing all the posts of the user, in chronological order.
- */
-function template_showPosts()
-{
-	echo '
-		<div class="cat_bar', !isset(Utils::$context['attachments']) ? ' cat_bar_round' : '', '">
-			<h3 class="catbg">
-				', Lang::getTxt(
-		!isset(Utils::$context['attachments']) && empty(Utils::$context['is_topics'])
-					? 'showMessages'
-					: (
-						!empty(Utils::$context['is_topics'])
-						? 'showTopics'
-						: 'showAttachments'
-					),
-		file: 'Profile',
-	),
-				!Profile::$member->is_me ? ' - ' . Utils::$context['member']['name'] : '', '
-			</h3>
-		</div>', !empty(Utils::$context['page_index']) ? '
-		<div class="pagesection">
-			<div class="pagelinks">' . Utils::$context['page_index'] . '</div>
-		</div>' : '';
-
-	// Are we displaying posts or attachments?
-	if (!isset(Utils::$context['attachments'])) {
-		// For every post to be displayed, give it its own div, and show the important details of the post.
-		foreach (Utils::$context['posts'] as $post) {
-			echo '
-		<div class="', $post['css_class'], '">
-			<div class="page_number floatright"> #', $post['counter'], '</div>
-			<div class="topic_details">
-				<h4>
-					<strong><a href="', Config::$scripturl, '?board=', $post['board']['id'], '.0">', $post['board']['name'], '</a> / <a href="', Config::$scripturl, '?topic=', $post['topic'], '.', $post['start'], '#msg', $post['id'], '">', $post['subject'], '</a></strong>
-				</h4>
-				<span class="smalltext">', $post['time'], '</span>
-			</div>';
-
-			if (!$post['approved']) {
-				echo '
-			<div class="noticebox">
-				', Lang::getTxt('post_awaiting_approval', file: 'General'), '
-			</div>';
-			}
-
-			echo '
-			<div class="post">
-				<div class="inner">
-					', Utils::adjustHeadingLevels($post['body'], 4), '
-				</div>
-			</div><!-- .post -->';
-
-			// Post options
-			template_quickbuttons($post['quickbuttons'], 'profile_showposts');
-
-			echo '
-		</div><!-- .', $post['css_class'], ' -->';
-		}
-	} else {
-	template_show_list('attachments');
-	}
-
-	// No posts? Just end with an informative message.
-	if ((isset(Utils::$context['attachments']) && empty(Utils::$context['attachments'])) || (!isset(Utils::$context['attachments']) && empty(Utils::$context['posts']))) {
-		echo '
-		<div class="windowbg">
-			', Lang::getTxt(
-			isset(Utils::$context['attachments'])
-				? 'show_attachments_none'
-				: (
-					Utils::$context['is_topics']
-					? 'show_topics_none'
-					: 'show_posts_none'
-				),
-			file: 'Profile',
-		), '
-		</div>';
-	}
-
-	// Show more page numbers.
-	if (!empty(Utils::$context['page_index'])) {
-		echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-	}
-}
-
-/**
- * Template for showing all alerts
- */
-function template_showAlerts()
-{
-	// Do we have an update message?
-	if (!empty(Utils::$context['update_message'])) {
-		echo '
-		<div class="infobox">
-			', Utils::$context['update_message'], '
-		</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-			', Lang::getTxt(!Profile::$member->is_me ? 'alerts_member' : 'alerts', ['member' => Utils::$context['member']['name']], file: 'General'), '
-			</h3>
-		</div>';
-
-	if (empty(Utils::$context['alerts'])) {
-		echo '
-		<div class="information">
-			', Lang::getTxt('alerts_none', file: 'Alerts'), '
-		</div>';
-	} else {
-		// Start the form if checkboxes are in use
-		if (Utils::$context['showCheckboxes']) {
-			echo '
-		<form action="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=showalerts;save" method="post" accept-charset="UTF-8" id="mark_all">';
-		}
-
-		echo '
-			<table id="alerts" class="table_grid">';
-
-		foreach (Utils::$context['alerts'] as $id => $alert) {
-			echo '
-				<tr class="windowbg">
-					<td class="alert_image">
-						<div>
-							', empty($alert['sender']['avatar']['image']) ? '' : $alert['sender']['avatar']['image'] . '
-							', $alert['icon'], '
-						</div>
-					</td>
-					<td class="alert_text">
-						<div>', $alert['text'], '</div>
-						<time class="alert_inline_time" datetime="', $alert['alert_time'], '">', $alert['time'], '</time>
-					</td>
-					<td class="alert_time">
-						<time datetime="', $alert['alert_time'], '">', $alert['time'], '</time>
-					</td>
-					<td class="alert_buttons">';
-
-			// Alert options
-			template_quickbuttons($alert['quickbuttons'], 'profile_alerts');
-
-			echo '
-					</td>
-				</tr>';
-		}
-
-		echo '
-			</table>
-			<div class="pagesection">
-				<div class="pagelinks">', Utils::$context['pagination'], '</div>
-				<div class="floatright">';
-
-		if (Utils::$context['showCheckboxes']) {
-			echo '
-					', Lang::getTxt('check_all', file: 'General'), ' <input type="checkbox" name="select_all" id="select_all">
-					<select name="mark_as">
-						<option value="read">', Lang::getTxt('quick_mod_markread', file: 'General'), '</option>
-						<option value="unread">', Lang::getTxt('quick_mod_markunread', file: 'General'), '</option>
-						<option value="remove">', Lang::getTxt('quick_mod_remove', file: 'General'), '</option>
-					</select>
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="start" value="', Utils::$context['start'], '">
-					<input type="submit" name="req" value="', Lang::getTxt('quick_mod_go', file: 'General'), '" class="button you_sure">';
-		}
-
-		echo '
-					<a href="', Utils::$context['alert_purge_link'], '" class="button you_sure">', Lang::getTxt('alert_purge', file: 'Profile'), '</a>
-				</div>
-			</div>';
-
-		if (Utils::$context['showCheckboxes']) {
-			echo '
-		</form>';
-		}
-	}
-}
-
-/**
- * Template for showing all of a user's drafts
- */
-function template_showDrafts()
-{
-	echo '
-		<div class="cat_bar cat_bar_round">
-			<h3 class="catbg">
-				', !Profile::$member->is_me ? Lang::getTxt('drafts_member', ['member' => Utils::$context['member']['name']], file: 'Drafts') : Lang::getTxt('drafts', file: 'Drafts'), '
-			</h3>
-		</div>', !empty(Utils::$context['page_index']) ? '
-		<div class="pagesection">
-			<div class="pagelinks">' . Utils::$context['page_index'] . '</div>
-		</div>' : '';
-
-	// No drafts? Just show an informative message.
-	if (empty(Utils::$context['drafts'])) {
-		echo '
-		<div class="windowbg centertext">
-			', Lang::getTxt('draft_none', file: 'Drafts'), '
-		</div>';
-	} else {
-		// For every draft to be displayed, give it its own div, and show the important details of the draft.
-		foreach (Utils::$context['drafts'] as $draft) {
-			echo '
-		<div class="windowbg">
-			<div class="page_number floatright"> #', $draft['counter'], '</div>
-			<div class="topic_details">
-				<h4>
-					<strong><a href="', Config::$scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong> &nbsp; &nbsp;';
-
-			if (!empty($draft['sticky'])) {
-				echo '
-					<span class="main_icons sticky" title="', Lang::getTxt('sticky_topic', file: 'General'), '"></span>';
-			}
-
-			if (!empty($draft['locked'])) {
-				echo '
-					<span class="main_icons lock" title="', Lang::getTxt('locked_topic', file: 'General'), '"></span>';
-			}
-
-			echo '
-				</h4>
-				<span class="smalltext">', Lang::getTxt('draft_saved_on', ['date' => $draft['time']], file: 'Drafts'), '</span>
-			</div><!-- .topic_details -->
-			<div class="list_posts">
-				', Utils::adjustHeadingLevels($draft['body'], 4), '
-			</div>
-			<div class="floatright">';
-
-			// Draft buttons
-			template_quickbuttons($draft['quickbuttons'], 'profile_drafts');
-
-			echo '
-			</div><!-- .floatright -->
-		</div><!-- .windowbg -->';
-		}
-	}
-
-	// Show page numbers.
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-}
-
-/**
- * Template for showing and managing the buddy list.
- */
-function template_editBuddies()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-	<div class="infobox">', Lang::getTxt(Profile::$member->is_me ? 'profile_updated_own' : 'profile_updated_else', Utils::$context['member'], file: 'Profile'), '</div>';
-	} elseif (!empty(Utils::$context['saved_failed'])) {
-		echo '
-	<div class="errorbox">', Utils::$context['saved_failed'], '</div>';
-	}
-
-	echo '
-	<div id="edit_buddies">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons people icon"></span> ', Lang::getTxt('editBuddies', file: 'Profile'), '
-			</h3>
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th scope="col" class="quarter_table buddy_link">', Lang::getTxt('name', file: 'General'), '</th>
-					<th scope="col" class="buddy_status">', Lang::getTxt('status', file: 'General'), '</th>';
-
-	if (Utils::$context['can_moderate_forum']) {
-		echo '
-					<th scope="col" class="buddy_email">', Lang::getTxt('email', file: 'General'), '</th>';
-	}
-
-	if (!empty(Utils::$context['custom_pf'])) {
-		foreach (Utils::$context['custom_pf'] as $column) {
-			echo '
-					<th scope="col" class="buddy_custom_fields">', $column['label'], '</th>';
-		}
-	}
-
-	echo '
-					<th scope="col" class="buddy_remove">', Lang::getTxt('remove', file: 'General'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	// If they don't have any buddies don't list them!
-	if (empty(Utils::$context['buddies'])) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="', Utils::$context['can_moderate_forum'] ? '10' : '9', '">
-						<strong>', Lang::getTxt('no_buddies', file: 'Profile'), '</strong>
-					</td>
-				</tr>';
-	}
-
-	// Now loop through each buddy showing info on each.
-	else {
-		foreach (Utils::$context['buddies'] as $buddy) {
-			echo '
-				<tr class="windowbg">
-					<td class="buddy_link">', $buddy['link'], '</td>
-					<td class="centertext buddy_status">
-						<a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a>
-					</td>';
-
-			if ($buddy['show_email']) {
-				echo '
-					<td class="buddy_email centertext">
-						<a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="main_icons mail icon" title="' . Lang::getTxt('email', file: 'General') . ' ' . $buddy['name'] . '"></span></a>
-					</td>';
-			}
-
-			// Show the custom profile fields for this user.
-			if (!empty(Utils::$context['custom_pf'])) {
-				foreach (Utils::$context['custom_pf'] as $key => $column) {
-					echo '
-					<td class="centertext buddy_custom_fields">', $buddy['options'][$key], '</td>';
-				}
-			}
-
-			echo '
-					<td class="centertext buddy_remove">
-						<a href="', Config::$scripturl, '?action=profile;area=lists;sa=buddies;u=', Utils::$context['id_member'], ';remove=', $buddy['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="main_icons delete" title="', Lang::getTxt('buddy_remove', file: 'Profile'), '"></span></a>
-					</td>
-				</tr>';
-		}
-	}
-
-	echo '
-			</tbody>
-		</table>
-	</div><!-- #edit_buddies -->';
-
-	// Add a new buddy?
-	echo '
-	<form action="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=lists;sa=buddies" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('buddy_add', file: 'Profile'), '</h3>
-		</div>
-		<div class="information">
-			<dl class="settings">
-				<dt>
-					<label for="new_buddy"><strong>', Lang::getTxt('who_member', file: 'General'), ':</strong></label>
-				</dt>
-				<dd>
-					<input type="text" name="new_buddy" id="new_buddy" size="30">
-					<input type="submit" value="', Lang::getTxt('buddy_add_button', file: 'Profile'), '" class="button floatnone">
-				</dd>
-			</dl>
-		</div>';
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-		<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<script>
-		var oAddBuddySuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'new_buddy\',
-			sControlId: \'new_buddy\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-		});
-	</script>';
-}
-
-/**
- * Template for showing the ignore list of the current user.
- */
-function template_editIgnoreList()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-	<div class="infobox">', Lang::getTxt(Profile::$member->is_me ? 'profile_updated_own' : 'profile_updated_else', Utils::$context['member'], file: 'Profile'), '</div>';
-	} elseif (!empty(Utils::$context['saved_failed'])) {
-		echo '
-	<div class="errorbox">', Utils::$context['saved_failed'], '</div>';
-	}
-
-	echo '
-	<div id="edit_buddies">
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt('editIgnoreList', file: 'Profile'), '
-			</h3>
-		</div>
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th scope="col" class="quarter_table buddy_link">', Lang::getTxt('name', file: 'General'), '</th>
-					<th scope="col" class="buddy_status">', Lang::getTxt('status', file: 'General'), '</th>';
-
-	if (Utils::$context['can_moderate_forum']) {
-		echo '
-					<th scope="col" class="buddy_email">', Lang::getTxt('email', file: 'General'), '</th>';
-	}
-
-	echo '
-					<th scope="col" class="buddy_remove">', Lang::getTxt('ignore_remove', file: 'Profile'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	// If they don't have anyone on their ignore list, don't list it!
-	if (empty(Utils::$context['ignore_list'])) {
-		echo '
-				<tr class="windowbg">
-					<td colspan="', Utils::$context['can_moderate_forum'] ? '4' : '3', '">
-						<strong>', Lang::getTxt('no_ignore', file: 'Profile'), '</strong>
-					</td>
-				</tr>';
-	}
-
-	// Now loop through each buddy showing info on each.
-	foreach (Utils::$context['ignore_list'] as $member) {
-		echo '
-				<tr class="windowbg">
-					<td class="buddy_link">', $member['link'], '</td>
-					<td class="centertext buddy_status">
-						<a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a>
-					</td>';
-
-		if (Utils::$context['can_moderate_forum']) {
-			echo '
-					<td class="centertext buddy_email">
-						<a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="main_icons mail icon" title="' . Lang::getTxt('email', file: 'General') . ' ' . $member['name'] . '"></span></a>
-					</td>';
-		}
-		echo '
-					<td class="centertext buddy_remove">
-						<a href="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '"><span class="main_icons delete" title="', Lang::getTxt('ignore_remove', file: 'Profile'), '"></span></a>
-					</td>
-				</tr>';
-	}
-
-	echo '
-			</tbody>
-		</table>
-	</div><!-- #edit_buddies -->';
-
-	// Add to the ignore list?
-	echo '
-	<form action="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=lists;sa=ignore" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('ignore_add', file: 'Profile'), '</h3>
-		</div>
-		<div class="information">
-			<dl class="settings">
-				<dt>
-					<label for="new_ignore"><strong>', Lang::getTxt('who_member', file: 'General'), '</strong></label>
-				</dt>
-				<dd>
-					<input type="text" name="new_ignore" id="new_ignore" size="30">
-					<input type="submit" value="', Lang::getTxt('ignore_add_button', file: 'Profile'), '" class="button">
-				</dd>
-			</dl>
-		</div>';
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-		<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>
-	<script>
-		var oAddIgnoreSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sSuggestId: \'new_ignore\',
-			sControlId: \'new_ignore\',
-			sSearchType: \'member\',
-			sTextDeleteItem: \'', Lang::getTxt('autosuggest_delete_item', file: 'General'), '\',
-		});
-	</script>';
-}
-
-/**
- * This template shows an admin information on a users IP addresses used and errors attributed to them.
- */
-function template_trackActivity()
-{
-	// The first table shows IP information about the user.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('view_ips_by', ['member' => Utils::$context['member']['name']], file: 'Profile'), '</h3>
-		</div>';
-
-	// The last IP the user used.
-	echo '
-		<div id="tracking" class="windowbg">
-			<dl class="settings noborder">
-				<dt>
-					', Lang::getTxt('most_recent_ip', file: 'Profile'), '
-					', (empty(Utils::$context['last_ip2']) ? '' : '<br>
-					<span class="smalltext"><a href="' . Config::$scripturl . '?action=helpadmin;help=whytwoip" onclick="return reqOverlayDiv(this.href);">' . Lang::getTxt('why_two_ip_address', file: 'Profile') . '</a></span>'), '
-				</dt>
-				<dd>
-					<a href="', Config::$scripturl, '?action=profile;area=tracking;sa=ip;searchip=', Utils::$context['last_ip'], ';u=', Utils::$context['member']['id'], '">', Utils::$context['last_ip'], '</a>';
-
-	// Second address detected?
-	if (!empty(Utils::$context['last_ip2'])) {
-		echo '
-					, <a href="', Config::$scripturl, '?action=profile;area=tracking;sa=ip;searchip=', Utils::$context['last_ip2'], ';u=', Utils::$context['member']['id'], '">', Utils::$context['last_ip2'], '</a>';
-	}
-
-	echo '
-				</dd>';
-
-	// Lists of IP addresses used in messages / error messages.
-	echo '
-				<dt>', Lang::getTxt('ips_in_messages', file: 'Profile'), '</dt>
-				<dd>
-					', (count(Utils::$context['ips']) > 0 ? Lang::sentenceList(Utils::$context['ips']) : Lang::getTxt('none', file: 'General')), '
-				</dd>
-				<dt>', Lang::getTxt('ips_in_errors', file: 'Profile'), '</dt>
-				<dd>
-					', (count(Utils::$context['error_ips']) > 0 ? Lang::sentenceList(Utils::$context['error_ips']) : Lang::getTxt('none', file: 'General')), '
-				</dd>';
-
-	// List any members that have used the same IP addresses as the current member.
-	echo '
-				<dt>', Lang::getTxt('members_in_range', file: 'Profile'), '</dt>
-				<dd>
-					', (count(Utils::$context['members_in_range']) > 0 ? Lang::sentenceList(Utils::$context['members_in_range']) : Lang::getTxt('none', file: 'General')), '
-				</dd>
-			</dl>
-		</div><!-- #tracking -->';
-
-	// Show the track user list.
-	template_show_list('track_user_list');
-}
-
-/**
- * The template for trackIP, allowing the admin to see where/who a certain IP has been used.
- */
-function template_trackIP()
-{
-	// This function always defaults to the last IP used by a member but can be set to track any IP.
-	// The first table in the template gives an input box to allow the admin to enter another IP to track.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('trackIP', file: 'Profile'), '</h3>
-		</div>
-		<div class="windowbg">
-			<form action="', Utils::$context['base_url'], '" method="post" accept-charset="UTF-8">
-				<dl class="settings">
-					<dt>
-						<label for="searchip"><strong>', Lang::getTxt('enter_ip', file: 'Profile'), '</strong></label>
-					</dt>
-					<dd>
-						<input type="text" name="searchip" id="searchip" value="', Utils::$context['ip'], '">
-					</dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('trackIP', file: 'Profile'), '" class="button">
-			</form>
-		</div>
-		<br>';
-
-	// The table inbetween the first and second table shows links to the whois server for every region.
-	if (Utils::$context['single_ip']) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('whois_title', Utils::$context, file: 'Profile'), '</h3>
-		</div>
-		<div class="windowbg">';
-
-		foreach (Utils::$context['whois_servers'] as $server) {
-			echo '
-			<a href="', $server['url'], '" target="_blank" rel="noopener"', '>', $server['name'], '</a><br>';
-		}
-		echo '
-		</div>
-		<br>';
-	}
-
-	// The second table lists all the members who have been logged as using this IP address.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('members_from_ip', Utils::$context, file: 'Profile'), '</h3>
-		</div>';
-
-	if (empty(Utils::$context['ips'])) {
-		echo '
-		<p class="windowbg description">
-			<em>', Lang::getTxt('no_members_from_ip', file: 'Profile'), '</em>
-		</p>';
-	} else {
-		echo '
-		<table class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th scope="col">', Lang::getTxt('ip_address', file: 'General'), '</th>
-					<th scope="col">', Lang::getTxt('display_name', file: 'General'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-		// Loop through each of the members and display them.
-		foreach (Utils::$context['ips'] as $ip => $memberlist) {
-			echo '
-				<tr class="windowbg">
-					<td><a href="', Utils::$context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td>
-					<td>', implode(', ', $memberlist), '</td>
-				</tr>';
-		}
-
-		echo '
-			</tbody>
-		</table>';
-	}
-
-	echo '
-		<br>';
-
-	template_show_list('track_message_list');
-
-	echo '<br>';
-
-	template_show_list('track_user_list');
-
-	// 3rd party integrations may have added additional tracking.
-	if (!empty(Utils::$context['additional_track_lists'])) {
-		foreach (Utils::$context['additional_track_lists'] as $list) {
-			echo '<br>';
-
-			template_show_list($list);
-		}
-	}
-}
-
-/**
- * This template shows an admin which permissions a user have and which group(s) give them each permission.
- */
-function template_showPermissions()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt('showPermissions', file: 'Profile'), '
-			</h3>
-		</div>';
-
-	if (Utils::$context['member']['has_all_permissions']) {
-		echo '
-		<div class="information">', Lang::getTxt('showPermissions_all', file: 'Profile'), '</div>';
-	} else {
-		echo '
-		<div class="information">', Lang::getTxt('showPermissions_help', file: 'Profile'), '</div>
-		<div id="permissions" class="flow_hidden">';
-
-		if (!empty(Utils::$context['no_access_boards'])) {
-			echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('showPermissions_restricted_boards', file: 'Profile'), '</h3>
-			</div>
-			<div class="windowbg smalltext">',
-			Lang::getTxt(
-				'showPermissions_restricted_boards_desc',
-				[
-					'list' => Lang::sentenceList(array_map(
-						fn($brd) => '<a href="' . Config::$scripturl . '?board=' . $brd['id'] . '.0" class="bbc_link">' . $brd['name'] . '</a>',
-						Utils::$context['no_access_boards'],
-					)),
-				],
-				file: 'Profile',
-			), '
-			</div>';
-		}
-
-		// General Permissions section.
-		echo '
-			<div class="tborder">
-				<div class="cat_bar">
-					<h3 class="catbg">', Lang::getTxt('showPermissions_general', file: 'Profile'), '</h3>
-				</div>';
-
-		if (!empty(Utils::$context['member']['permissions']['general'])) {
-			echo '
-				<table class="table_grid">
-					<thead>
-						<tr class="title_bar">
-							<th class="lefttext half_table">', Lang::getTxt('showPermissions_permission', file: 'Profile'), '</th>
-							<th class="lefttext half_table">', Lang::getTxt('showPermissions_status', file: 'Profile'), '</th>
-						</tr>
-					</thead>
-					<tbody>';
-
-			foreach (Utils::$context['member']['permissions']['general'] as $permission) {
-				echo '
-						<tr class="windowbg">
-							<td title="', $permission['id'], '">
-								', $permission['is_denied'] ? '<del>' . $permission['name'] . '</del>' : $permission['name'], '
-							</td>
-							<td class="smalltext">';
-
-				if ($permission['is_denied']) {
-					echo '
-								<span class="alert">', Lang::getTxt('showPermissions_denied', ['list' => Lang::sentenceList($permission['groups']['denied'])], file: 'Profile'), '</span>';
-				} else {
-				echo '
-								', Lang::getTxt('showPermissions_given', ['list' => Lang::sentenceList($permission['groups']['allowed'])], file: 'Profile');
-				}
-
-				echo '
-							</td>
-						</tr>';
-			}
-			echo '
-					</tbody>
-				</table>
-			</div><!-- .tborder -->
-			<br>';
-		} else {
-		echo '
-			<p class="windowbg">', Lang::getTxt('showPermissions_none_general', file: 'Profile'), '</p>';
-		}
-
-		// Board permission section.
-		echo '
-			<form action="' . Config::$scripturl . '?action=profile;u=', Utils::$context['id_member'], ';area=permissions#board_permissions" method="post" accept-charset="UTF-8">
-				<div class="cat_bar">
-					<h3 class="catbg">
-						<span id="board_permissions">', Lang::getTxt('showPermissions_select', file: 'Profile'), '</span>
-						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
-							<option value="0"', Utils::$context['board'] == 0 ? ' selected' : '', '>', Lang::getTxt('showPermissions_global', file: 'Profile'), '</option>';
-
-		if (!empty(Utils::$context['boards'])) {
-			echo '
-							<option value="" disabled>---------------------------</option>';
-		}
-
-		// Fill the box with any local permission boards.
-		foreach (Utils::$context['boards'] as $board) {
-			echo '
-							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>';
-		}
-
-		echo '
-						</select>
-					</h3>
-				</div><!-- .cat_bar -->
-			</form>';
-
-		if (!empty(Utils::$context['member']['permissions']['board'])) {
-			echo '
-			<table class="table_grid">
-				<thead>
-					<tr class="title_bar">
-						<th class="lefttext half_table">', Lang::getTxt('showPermissions_permission', file: 'Profile'), '</th>
-						<th class="lefttext half_table">', Lang::getTxt('showPermissions_status', file: 'Profile'), '</th>
-					</tr>
-				</thead>
-				<tbody>';
-
-			foreach (Utils::$context['member']['permissions']['board'] as $permission) {
-				echo '
-					<tr class="windowbg">
-						<td title="', $permission['id'], '">
-							', $permission['is_denied'] ? '<del class="error">' . $permission['name'] . '</del>' : $permission['name'], '
-						</td>
-						<td class="smalltext">';
-
-				if ($permission['is_denied']) {
-					echo '
-							<span class="alert">', Lang::getTxt('showPermissions_denied', ['list' => Lang::sentenceList($permission['groups']['denied'])], file: 'Profile'), '</span>';
-				} else {
-				echo '
-							', Lang::getTxt('showPermissions_given', ['list' => Lang::sentenceList($permission['groups']['allowed'])], file: 'Profile');
-				}
-
-				echo '
-						</td>
-					</tr>';
-			}
-			echo '
-				</tbody>
-			</table>';
-		} else {
-		echo '
-			<p class="windowbg">', Lang::getTxt('showPermissions_none_board', file: 'Profile'), '</p>';
-		}
-		echo '
-		</div><!-- #permissions -->';
-	}
-}
-
-/**
- * Template for user statistics, showing graphs and the like.
- */
-function template_statPanel()
-{
-	// First, show a few text statistics such as post/topic count.
-	echo '
-	<div id="profileview" class="roundframe noup">
-		<div id="generalstats">
-			<dl class="stats">';
-
-	foreach (Utils::$context['text_stats'] as $key => $stat) {
-		echo '
-				<dt>', Lang::getTxt('statPanel_' . $key, file: 'Profile'), '</dt>';
-
-		if (!empty($stat['url'])) {
-			echo '
-				<dd><a href="', $stat['url'], '">', $stat['text'], '</a></dd>';
-		} else {
-		echo '
-				<dd>', $stat['text'], '</dd>';
-		}
-	}
-
-	echo '
-			</dl>
-		</div>';
-
-	// This next section draws a graph showing what times of day they post the most.
-	echo '
-		<div id="activitytime" class="flow_hidden">
-			<div class="title_bar">
-				<h3 class="titlebg">
-					<span class="main_icons history"></span> ', Lang::getTxt('statPanel_activityTime', file: 'Profile'), '
-				</h3>
-			</div>';
-
-	// If they haven't post at all, don't draw the graph.
-	if (empty(Utils::$context['posts_by_time'])) {
-		echo '
-			<p class="centertext padding">', Lang::getTxt('statPanel_noPosts', file: 'Profile'), '</p>';
-	}
-
-	// Otherwise do!
-	else {
-		echo '
-			<ul class="activity_stats flow_hidden">';
-
-		// The labels.
-		foreach (Utils::$context['posts_by_time'] as $time_of_day) {
-			echo '
-				<li>
-					<div class="generic_bar vertical">
-						<div class="bar" style="height: ', (int) $time_of_day['relative_percent'], '%;">
-							<span>', Lang::getTxt('statPanel_activityTime_posts', [$time_of_day['posts'], $time_of_day['posts_percent'] / 100], file: 'Profile'), '</span>
-						</div>
-					</div>
-					<span class="stats_hour">', $time_of_day['hour_format'], '</span>
-				</li>';
-		}
-
-		echo '
-			</ul>';
-	}
-
-	echo '
-		</div><!-- #activitytime -->';
-
-	// Two columns with the most popular boards by posts and activity (activity = users posts / total posts).
-	echo '
-		<div class="flow_hidden">
-			<div class="half_content">
-				<div class="title_bar">
-					<h3 class="titlebg">
-						<span class="main_icons replies"></span> ', Lang::getTxt('statPanel_topBoards', file: 'Profile'), '
-					</h3>
-				</div>';
-
-	if (empty(Utils::$context['popular_boards'])) {
-		echo '
-				<p class="centertext padding">', Lang::getTxt('statPanel_noPosts', file: 'Profile'), '</p>';
-	} else {
-		echo '
-				<dl class="stats">';
-
-		// Draw a bar for every board.
-		foreach (Utils::$context['popular_boards'] as $board) {
-			echo '
-					<dt>', $board['link'], '</dt>
-					<dd>
-						<div class="profile_pie" style="background-position: -', ((int) ($board['posts_percent'] / 5) * 20), 'px 0;" title="', Lang::getTxt('statPanel_topBoards_memberposts', [$board['posts'], $board['total_posts_member'], $board['posts_percent'] / 100], file: 'Profile'), '">
-							', Lang::getTxt('statPanel_topBoards_memberposts', [$board['posts'], $board['total_posts_member'], $board['posts_percent'] / 100], file: 'Profile'), '
-						</div>
-						', empty(Utils::$context['hide_num_posts']) ? $board['posts'] : '', '
-					</dd>';
-		}
-
-		echo '
-				</dl>';
-	}
-	echo '
-			</div><!-- .half_content -->
-			<div class="half_content">
-				<div class="title_bar">
-					<h3 class="titlebg">
-						<span class="main_icons replies"></span> ', Lang::getTxt('statPanel_topBoardsActivity', file: 'Profile'), '
-					</h3>
-				</div>';
-
-	if (empty(Utils::$context['board_activity'])) {
-		echo '
-				<p class="centertext padding">', Lang::getTxt('statPanel_noPosts', file: 'Profile'), '</p>';
-	} else {
-		echo '
-				<dl class="stats">';
-
-		// Draw a bar for every board.
-		foreach (Utils::$context['board_activity'] as $activity) {
-			echo '
-					<dt>', $activity['link'], '</dt>
-					<dd>
-						<div class="profile_pie" style="background-position: -', ((int) ($activity['posts_percent'] / 5) * 20), 'px 0;" title="', Lang::getTxt('statPanel_topBoards_posts', [$activity['posts'], $activity['total_posts'], $activity['posts_percent'] / 100], file: 'Profile'), '">
-							', Lang::getTxt('statPanel_topBoards_posts', [$activity['posts'], $activity['total_posts'], $activity['posts_percent'] / 100], file: 'Profile'), '
-						</div>
-						', Lang::formatText('{0, number, percent}', [$activity['percent'] / 100]), '
-					</dd>';
-		}
-
-		echo '
-				</dl>';
-	}
-	echo '
-			</div><!-- .half_content -->
-		</div><!-- .flow_hidden -->';
-
-	echo '
-	</div><!-- #profileview -->';
-}
-
-/**
- * Template for editing profile options.
- */
-function template_edit_options()
-{
-	// The main header!
-	// because some browsers ignore autocomplete=off and fill username in display name and/ or email field, fake them out.
-	$url = !empty(Utils::$context['profile_custom_submit_url']) ? Utils::$context['profile_custom_submit_url'] : Config::$scripturl . '?action=profile;area=' . Utils::$context['menu_item_selected'] . ';u=' . Utils::$context['id_member'];
-	$url = Utils::$context['require_password'] && !empty(Config::$modSettings['force_ssl']) ? strtr($url, ['http://' => 'https://']) : $url;
-
-	echo '
-		<form action="', $url, '" method="post" accept-charset="UTF-8" name="creator" id="creator" enctype="multipart/form-data"', (Utils::$context['menu_item_selected'] == 'account' ? ' autocomplete="off"' : ''), '>
-			<div class="cat_bar">
-				<h3 class="catbg profile_hd">';
-
-	// Don't say "Profile" if this isn't the profile...
-	if (!empty(Utils::$context['profile_header_text'])) {
-		echo '
-					', Utils::$context['profile_header_text'];
-	} else {
-	echo '
-					', Lang::getTxt('profile', file: 'General');
-	}
-
-	echo '
-				</h3>
-			</div>';
-
-	// Have we some description?
-	if (Utils::$context['page_desc']) {
-		echo '
-			<p class="information">', Utils::$context['page_desc'], '</p>';
-	}
-
-	echo '
-			<div class="roundframe">';
-
-	// Any bits at the start?
-	if (!empty(Utils::$context['profile_prehtml'])) {
-		echo '
-				<div>', Utils::$context['profile_prehtml'], '</div>';
-	}
-
-	if (!empty(Utils::$context['profile_fields'])) {
-		echo '
-				<dl class="settings">';
-	}
-
-	// Start the big old loop 'of love.
-	$lastItem = 'hr';
-
-	foreach (Utils::$context['profile_fields'] as $key => $field) {
-		// We add a little hack to be sure we never get more than one hr in a row!
-		if ($lastItem == 'hr' && $field['type'] == 'hr') {
-			continue;
-		}
-
-		$lastItem = $field['type'];
-
-		if ($field['type'] == 'hr') {
-			echo '
-				</dl>
-				<hr>
-				<dl class="settings">';
-		} elseif ($field['type'] == 'callback') {
-			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func'])) {
-				$callback_func = 'template_profile_' . $field['callback_func'];
-				$callback_func();
-			}
-		} else {
-			echo '
-					<dt>
-						<strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>';
-
-			// Does it have any subtext to show?
-			if (!empty($field['subtext'])) {
-				echo '
-						<br>
-						<span class="smalltext">', $field['subtext'], '</span>';
-			}
-
-			echo '
-					</dt>
-					<dd>';
-
-			// Want to put something infront of the box?
-			if (!empty($field['preinput'])) {
-				echo '
-						', $field['preinput'];
-			}
-
-			// What type of data are we showing?
-			if ($field['type'] == 'label') {
-				echo '
-						', $field['value'];
-			}
-
-			// Maybe it's a text box - very likely!
-			elseif (in_array($field['type'], ['int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url'])) {
-				if ($field['type'] == 'int' || $field['type'] == 'float') {
-					$type = 'number';
-				} else {
-				$type = $field['type'];
-				}
-				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
-
-				echo '
-						<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '"', isset($field['min']) ? ' min="' . $field['min'] . '"' : '', isset($field['max']) ? ' max="' . $field['max'] . '"' : '', ' value="', $field['value'], '" ', $field['input_attr'], ' ', $step, '>';
-			}
-			// You "checking" me out? ;)
-			elseif ($field['type'] == 'check') {
-				echo '
-						<input type="hidden" name="', $key, '" value="0">
-						<input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>';
-			}
-
-			// Always fun - select boxes!
-			elseif ($field['type'] == 'select') {
-				echo '
-						<select name="', $key, '" id="', $key, '">';
-
-				if (isset($field['options'])) {
-					// Is this some code to generate the options?
-					if (!is_array($field['options'])) {
-						$field['options'] = $field['options']();
-					}
-
-					// Assuming we now have some!
-					if (is_array($field['options'])) {
-						foreach ($field['options'] as $value => $name) {
-							echo '
-							<option value="' . $value . '"', (!empty($field['disabled_options']) && is_array($field['disabled_options']) && in_array($value, $field['disabled_options'], true) ? ' disabled' : ($value == $field['value'] ? ' selected' : '')), '>', $name, '</option>';
-						}
-					}
-				}
-
-				echo '
-						</select>';
-			}
-
-			// Something to end with?
-			if (!empty($field['postinput'])) {
-				echo '
-						', $field['postinput'];
-			}
-
-			echo '
-					</dd>';
-		}
-	}
-
-	if (!empty(Utils::$context['profile_fields'])) {
-		echo '
-				</dl>';
-	}
-
-	// Are there any custom profile fields - if so print them!
-	if (!empty(Utils::$context['custom_fields'])) {
-		if ($lastItem != 'hr') {
-			echo '
-				<hr>';
-		}
-
-		echo '
-				<dl class="settings">';
-
-		foreach (Utils::$context['custom_fields'] as $field) {
-			echo '
-					<dt>
-						<strong>', $field['name'], '</strong><br>
-						<span class="smalltext">', $field['desc'], '</span>
-					</dt>
-					<dd>
-						', $field['input_html'], '
-					</dd>';
-		}
-
-		echo '
-				</dl>';
-	}
-
-	// Any closing HTML?
-	if (!empty(Utils::$context['profile_posthtml'])) {
-		echo '
-				<div>', Utils::$context['profile_posthtml'], '</div>';
-	}
-
-	// Only show the password box if it's actually needed.
-	if (Utils::$context['require_password']) {
-		echo '
-				<dl class="settings">
-					<dt>
-						<strong', isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', Lang::getTxt('current_password', file: 'Profile'), '</label></strong><br>
-						<span class="smalltext">', Lang::getTxt('required_security_reasons', file: 'Profile'), '</span>
-					</dt>
-					<dd>
-						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20">
-					</dd>
-				</dl>';
-	}
-
-	// The button shouldn't say "Change profile" unless we're changing the profile...
-	if (!empty(Utils::$context['submit_button_text'])) {
-		echo '
-				<input type="submit" name="save" value="', Utils::$context['submit_button_text'], '" class="button floatright">';
-	} else {
-	echo '
-				<input type="submit" name="save" value="', Lang::getTxt('change_profile', file: 'Profile'), '" class="button floatright">';
-	}
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-				<input type="hidden" name="sa" value="', Utils::$context['menu_item_selected'], '">
-			</div><!-- .roundframe -->
-		</form>';
-
-	// Any final spellchecking stuff?
-	if (!empty(Utils::$context['show_spellchecking'])) {
-		echo '
-		<form name="spell_form" id="spell_form" method="post" accept-charset="UTF-8" target="spellWindow" action="', Config::$scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>';
-	}
-}
-
-/**
- * Personal Message settings.
- */
-function template_profile_pm_settings()
-{
-	echo '
-					<dt>
-						<label for="pm_prefs">', Lang::getTxt('pm_display_mode', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<select name="pm_prefs" id="pm_prefs">
-							<option value="0"', Utils::$context['display_mode'] == 0 ? ' selected' : '', '>', Lang::getTxt('pm_display_mode_all', file: 'Profile'), '</option>
-							<option value="1"', Utils::$context['display_mode'] == 1 ? ' selected' : '', '>', Lang::getTxt('pm_display_mode_one', file: 'Profile'), '</option>
-							<option value="2"', Utils::$context['display_mode'] == 2 ? ' selected' : '', '>', Lang::getTxt('pm_display_mode_linked', file: 'Profile'), '</option>
-						</select>
-					</dd>
-					<dt>
-						<label for="view_newest_pm_first">', Lang::getTxt('recent_pms_at_top', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" name="default_options[view_newest_pm_first]" value="0">
-						<input type="checkbox" name="default_options[view_newest_pm_first]" id="view_newest_pm_first" value="1"', !empty(Utils::$context['member']['options']['view_newest_pm_first']) ? ' checked' : '', '>
-					</dd>
-				</dl>
-				<hr>
-				<dl class="settings">
-					<dt>
-						<label for="pm_receive_from">', Lang::getTxt('pm_receive_from', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<select name="pm_receive_from" id="pm_receive_from">
-							<option value="0"', empty(Utils::$context['receive_from']) || (empty(Config::$modSettings['enable_buddylist']) && Utils::$context['receive_from'] < 3) ? ' selected' : '', '>', Lang::getTxt('pm_receive_from_everyone', file: 'Profile'), '</option>';
-
-	if (!empty(Config::$modSettings['enable_buddylist'])) {
-		echo '
-							<option value="1"', !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] == 1 ? ' selected' : '', '>', Lang::getTxt('pm_receive_from_ignore', file: 'Profile'), '</option>
-							<option value="2"', !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] == 2 ? ' selected' : '', '>', Lang::getTxt('pm_receive_from_buddies', file: 'Profile'), '</option>';
-	}
-
-	echo '
-							<option value="3"', !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] > 2 ? ' selected' : '', '>', Lang::getTxt('pm_receive_from_admins', file: 'Profile'), '</option>
-						</select>
-					</dd>
-					<dt>
-						<label for="popup_messages">', Lang::getTxt('popup_messages', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" name="default_options[popup_messages]" value="0">
-						<input type="checkbox" name="default_options[popup_messages]" id="popup_messages" value="1"', !empty(Utils::$context['member']['options']['popup_messages']) ? ' checked' : '', '>
-					</dd>
-				</dl>
-				<hr>
-				<dl class="settings">
-					<dt>
-						<label for="pm_remove_inbox_label">', Lang::getTxt('pm_remove_inbox_label', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" name="default_options[pm_remove_inbox_label]" value="0">
-						<input type="checkbox" name="default_options[pm_remove_inbox_label]" id="pm_remove_inbox_label" value="1"', !empty(Utils::$context['member']['options']['pm_remove_inbox_label']) ? ' checked' : '', '>
-					</dd>';
-
-}
-
-/**
- * Template for showing theme settings. Note: template_options() actually adds the theme specific options.
- */
-function template_profile_theme_settings()
-{
-	$skeys = array_keys(Utils::$context['theme_options']);
-	$first_option_key = array_shift($skeys);
-	$titled_section = false;
-
-	foreach (Utils::$context['theme_options'] as $i => $setting) {
-		// Just spit out separators and move on
-		if (empty($setting) || !is_array($setting)) {
-			// Avoid double separators and empty titled sections
-			$empty_section = true;
-
-			for ($j = $i + 1; $j < count(Utils::$context['theme_options']); $j++) {
-				// Found another separator, so we're done
-				if (!is_array(Utils::$context['theme_options'][$j])) {
-					break;
-				}
-
-				// Once we know there's something to show in this section, we can stop
-				if (!isset(Utils::$context['theme_options'][$j]['enabled']) || !empty(Utils::$context['theme_options'][$j]['enabled'])) {
-					$empty_section = false;
-					break;
-				}
-			}
-
-			if ($empty_section) {
-				if ($i === $first_option_key) {
-					$first_option_key = array_shift($skeys);
-				}
-
-				continue;
-			}
-
-			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key) {
-				echo '
-				</dl>
-				<hr>
-				<dl class="settings">';
-			}
-
-			// Should we give a name to this section?
-			if (is_string($setting) && !empty($setting)) {
-				$titled_section = true;
-				echo '
-					<dt><strong>' . $setting . '</strong></dt>
-					<dd></dd>';
-			} else {
-			$titled_section = false;
-			}
-
-			continue;
-		}
-
-		// Is this disabled?
-		if (isset($setting['enabled']) && $setting['enabled'] === false) {
-			if ($i === $first_option_key) {
-				$first_option_key = array_shift($skeys);
-			}
-
-			continue;
-		}
-
-		// Some of these may not be set...  Set to defaults here
-		$opts = ['calendar_start_day', 'topics_per_page', 'messages_per_page', 'display_quick_mod'];
-
-		if (in_array($setting['id'], $opts) && !isset(Utils::$context['member']['options'][$setting['id']])) {
-			Utils::$context['member']['options'][$setting['id']] = 0;
-		}
-
-		if (!isset($setting['type']) || $setting['type'] == 'bool') {
-			$setting['type'] = 'checkbox';
-		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
-			$setting['type'] = 'number';
-		} elseif ($setting['type'] == 'string') {
-			$setting['type'] = 'text';
-		}
-
-		if (isset($setting['options'])) {
-			$setting['type'] = 'list';
-		}
-
-		echo '
-					<dt>
-						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
-
-		if (isset($setting['description'])) {
-			echo '
-						<br>
-						<span class="smalltext">', $setting['description'], '</span>';
-		}
-		echo '
-					</dt>
-					<dd>';
-
-		// Display checkbox options
-		if ($setting['type'] == 'checkbox') {
-			echo '
-						<input type="hidden" name="default_options[' . $setting['id'] . ']" value="0">
-						<input type="checkbox" name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', !empty(Utils::$context['member']['options'][$setting['id']]) ? ' checked' : '', ' value="1">';
-		}
-
-		// How about selection lists, we all love them
-		elseif ($setting['type'] == 'list') {
-			echo '
-						<select name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', '>';
-
-			foreach ($setting['options'] as $value => $label) {
-				echo '
-							<option value="', $value, '"', isset(Utils::$context['member']['options'][$setting['id']]) && $value == Utils::$context['member']['options'][$setting['id']] ? ' selected' : '', '>', $label, '</option>';
-			}
-
-			echo '
-						</select>';
-		}
-		// A textbox it is then
-		else {
-			if (isset($setting['type']) && $setting['type'] == 'number') {
-				$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
-				$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
-				$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
-
-				echo '
-						<input type="number"', $min . $max . $step;
-			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
-				echo '
-						<input type="url"';
-			} else {
-			echo '
-						<input type="text"';
-			}
-
-			echo ' name="default_options[', $setting['id'], ']" id="', $setting['id'], '" value="', Utils::$context['member']['options'][$setting['id']] ?? $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', '>';
-		}
-
-		// end of this definition
-		echo '
-					</dd>';
-	}
-}
-
-/**
- * The template for configuring alerts
- */
-function template_alert_configuration()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('alert_prefs', file: 'Profile'), '
-			</h3>
-		</div>
-		<p class="information">
-			', (empty(Utils::$context['description']) ? Lang::getTxt('alert_prefs_desc', file: 'Profile') : Utils::$context['description']), '
-		</p>
-		<form action="', Config::$scripturl, '?', Utils::$context['action'], '" method="post" accept-charset="UTF-8" id="notify_options" class="flow_auto">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('notification_general', file: 'Profile'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="notify_announcements">', Lang::getTxt('notify_important_email', file: 'Profile'), '</label>', Utils::$context['id_member'] == 0 ? '
-						<br>
-						<span class="smalltext alert">' . Lang::getTxt('notify_announcements_desc', file: 'Admin') . '</span>' : '', '
-					</dt>
-					<dd>
-						<input type="hidden" name="notify_announcements" value="0">
-						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty(Utils::$context['member']['notify_announcements']) ? ' checked' : '', '>
-					</dd>';
-
-	if (!empty(Config::$modSettings['enable_ajax_alerts'])) {
-		echo '
-					<dt>
-						<label for="notify_alert_timeout">', Lang::getTxt('notify_alert_timeout', file: 'Profile'), '</label>
-					</dt>
-					<dd>
-						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" max="127" value="', Utils::$context['member']['alert_timeout'], '">
-					</dd>';
-	}
-
-	echo '
-				</dl>
-			</div><!-- .windowbg -->
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('notify_what_how', file: 'Profile'), '
-				</h3>
-			</div>
-			<table class="table_grid">';
-
-	foreach (Utils::$context['alert_types'] as $alert_group => $alerts) {
-		echo '
-				<tr class="title_bar">
-					<th>', Lang::getTxt('alert_group_' . $alert_group, file: 'Profile'), '</th>
-					<th>', Lang::getTxt('receive_alert', file: 'Profile'), '</th>
-					<th>', Lang::getTxt('receive_mail', file: 'Profile'), '</th>
-				</tr>
-				<tr class="windowbg">';
-
-		if (isset(Utils::$context['alert_group_options'][$alert_group])) {
-			foreach (Utils::$context['alert_group_options'][$alert_group] as $opts) {
-				if ($opts[0] == 'hide') {
-					continue;
-				}
-
-				echo '
-				<tr class="windowbg">
-					<td colspan="3">';
-
-				$label = Lang::getTxt('alert_opt_' . $opts[1], file: 'Profile');
-				$label_pos = $opts['label'] ?? '';
-
-				if ($label_pos == 'before') {
-					echo '
-						<label for="opt_', $opts[1], '">', $label, '</label>';
-				}
-
-				$this_value = Utils::$context['alert_prefs'][$opts[1]] ?? 0;
-
-				switch ($opts[0]) {
-					case 'check':
-						echo '
-						<input type="checkbox" name="opt_', $opts[1], '" id="opt_', $opts[1], '"', $this_value ? ' checked' : '', '>';
-						break;
-
-					case 'select':
-						echo '
-						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
-
-						foreach ($opts['opts'] as $k => $v) {
-							echo '
-							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
-						}
-						echo '
-						</select>';
-						break;
-				}
-
-				if ($label_pos == 'after') {
-					echo '
-						<label for="opt_', $opts[1], '">', $label, '</label>';
-				}
-
-				echo '
-					</td>
-				</tr>';
-			}
-		}
-
-		foreach ($alerts as $alert_id => $alert_details) {
-			echo '
-				<tr class="windowbg">
-					<td>
-						', Lang::getTxt('alert_' . $alert_id, file: 'Profile'), isset($alert_details['help']) ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : '', '
-					</td>';
-
-			foreach (Utils::$context['alert_bits'] as $type => $bitmask) {
-				echo '
-					<td class="centercol">';
-
-				$this_value = Utils::$context['alert_prefs'][$alert_id] ?? 0;
-
-				switch ($alert_details[$type]) {
-					case 'always':
-						echo '
-						<input type="checkbox" checked disabled>';
-						break;
-
-					case 'yes':
-						echo '
-						<input type="checkbox" name="', $type, '_', $alert_id, '"', ($this_value & $bitmask) ? ' checked' : '', '>';
-						break;
-
-					case 'never':
-						echo '
-						<input type="checkbox" disabled>';
-						break;
-				}
-				echo '
-					</td>';
-			}
-
-			echo '
-				</tr>';
-		}
-	}
-
-	echo '
-			</table>
-			<br>
-			<div>
-				<input id="notify_submit" type="submit" name="notify_submit" value="', Lang::getTxt('notify_save', file: 'Profile'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">', !empty(Utils::$context['token_check']) ? '
-				<input type="hidden" name="' . Utils::$context[Utils::$context['token_check'] . '_token_var'] . '" value="' . Utils::$context[Utils::$context['token_check'] . '_token'] . '">' : '', '
-				<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-				<input type="hidden" name="sa" value="', Utils::$context['menu_item_selected'], '">
-			</div>
-		</form>
-		<br>';
-}
-
-/**
- * Template for showing which topics you're subscribed to
- */
-function template_alert_notifications_topics()
-{
-	// The main containing header.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('watched_topics', file: 'Profile'), '
-			</h3>
-		</div>
-		<p class="information">', Lang::getTxt('watched_topics_desc', file: 'Profile'), '</p>
-		<br>';
-
-	template_show_list('topic_notification_list');
-}
-
-/**
- * Template for showing which boards you're subscribed to
- */
-function template_alert_notifications_boards()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('watched_boards', file: 'Profile'), '
-			</h3>
-		</div>
-		<p class="information">', Lang::getTxt('watched_boards_desc', file: 'Profile'), '</p>
-		<br>';
-
-	template_show_list('board_notification_list');
-}
-
-/**
- * Template for choosing group membership.
- */
-function template_groupMembership()
-{
-	// The main containing header.
-	echo '
-		<form action="', Config::$scripturl, '?action=profile;area=groupmembership;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
-			<div class="cat_bar">
-				<h3 class="catbg profile_hd">
-					', Lang::getTxt('profile', file: 'General'), '
-				</h3>
-			</div>
-			<p class="information">', Lang::getTxt('groupMembership_info', file: 'Profile'), '</p>';
-
-	// Do we have an update message?
-	if (!empty(Utils::$context['update_message'])) {
-		echo '
-			<div class="infobox">
-				', Utils::$context['update_message'], '
-			</div>';
-	}
-
-	echo '
-			<div id="groups">';
-
-	// Requesting membership to a group?
-	if (!empty(Utils::$context['group_request'])) {
-		echo '
-			<div class="groupmembership">
-				<div class="cat_bar">
-					<h3 class="catbg">', Lang::getTxt('request_group_membership', file: 'Profile'), '</h3>
-				</div>
-				<div class="roundframe">
-					<span>', Lang::getTxt('request_group_membership_desc', file: 'Profile'), '</span>
-					<textarea name="reason" rows="4"></textarea>
-					<div class="righttext">
-						<input type="hidden" name="gid" value="', Utils::$context['group_request']['id'], '">
-						<input type="submit" name="req" value="', Lang::getTxt('submit_request', file: 'Profile'), '" class="button">
-						</div>
-					</div>
-				</div><!-- .groupmembership -->';
-	} else {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg">', Lang::getTxt('current_membergroups', file: 'Profile'), '</h3>
-				</div>';
-
-		foreach (Utils::$context['groups']['member'] as $group) {
-			echo '
-				<div class="windowbg" id="primdiv_', $group['id'], '">';
-
-			if (Utils::$context['can_edit_primary']) {
-				echo '
-					<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', $group['can_be_primary'] ? '' : ' disabled', '>';
-			}
-
-			echo '
-					<label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>';
-
-			// Can they leave their group?
-			if ($group['can_leave']) {
-				echo '
-					<a href="' . Config::$scripturl . '?action=profile;save;u=' . Utils::$context['id_member'] . ';area=groupmembership;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';gid=' . $group['id'] . ';', Utils::$context[Utils::$context['token_check'] . '_token_var'], '=', Utils::$context[Utils::$context['token_check'] . '_token'], '">' . Lang::getTxt('leave_group', file: 'Profile') . '</a>';
-			}
-
-			echo '
-				</div><!-- .windowbg -->';
-		}
-
-		if (Utils::$context['can_edit_primary']) {
-			echo '
-				<div class="padding righttext">
-					<input type="submit" value="', Lang::getTxt('make_primary', file: 'Profile'), '" class="button">
-				</div>';
-		}
-
-		// Any groups they can join?
-		if (!empty(Utils::$context['groups']['available'])) {
-			echo '
-				<div class="title_bar">
-					<h3 class="titlebg">', Lang::getTxt('available_groups', file: 'Profile'), '</h3>
-				</div>';
-
-			foreach (Utils::$context['groups']['available'] as $group) {
-				echo '
-				<div class="windowbg">
-					<strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '';
-
-				if ($group['type'] == 3) {
-					echo '
-					<a href="', Config::$scripturl, '?action=profile;save;u=', Utils::$context['id_member'], ';area=groupmembership;', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';gid=', $group['id'], ';', Utils::$context[Utils::$context['token_check'] . '_token_var'], '=', Utils::$context[Utils::$context['token_check'] . '_token'], '" class="button floatright">', Lang::getTxt('join_group', file: 'Profile'), '</a>';
-				} elseif ($group['type'] == 2 && $group['pending']) {
-					echo '
-					<span class="floatright">', Lang::getTxt('approval_pending', file: 'Profile'), '</span>';
-				} elseif ($group['type'] == 2) {
-					echo '
-					<a href="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', Lang::getTxt('request_group', file: 'Profile'), '</a>';
-				}
-
-				echo '
-				</div><!-- .windowbg -->';
-			}
-		}
-
-	}
-
-	echo '
-			</div><!-- #groups -->';
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-			<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-		</form>';
-}
-
-/**
- * Template for managing ignored boards
- */
-function template_ignoreboards()
-{
-	// The main containing header.
-	echo '
-	<form action="', Config::$scripturl, '?action=profile;area=ignoreboards;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt('profile', file: 'General'), '
-			</h3>
-		</div>
-		<p class="information">', Lang::getTxt('ignoreboards_info', file: 'Profile'), '</p>
-		<div class="windowbg">
-			<div class="flow_hidden boardslist">
-				<ul>';
-
-	foreach (Utils::$context['categories'] as $category) {
-		echo '
-					<li>
-						<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'creator\'); return false;">', $category['name'], '</a>
-						<ul>';
-
-		$cat_boards = array_values($category['boards']);
-
-		foreach ($cat_boards as $key => $board) {
-			echo '
-							<li>
-								<label for="brd', $board['id'], '">
-									<input type="checkbox" id="brd', $board['id'], '" name="brd[', $board['id'], ']" value="', $board['id'], '"', $board['selected'] ? ' checked' : '', '>
-									', $board['name'], '
-								</label>';
-
-			// Nest child boards inside another list.
-			$curr_child_level = $board['child_level'];
-			$next_child_level = $cat_boards[$key + 1]['child_level'] ?? 0;
-
-			if ($next_child_level > $curr_child_level) {
-				echo '
-								<ul style="margin-inline-start: 2.5ch;">';
-			} else {
-				// Close child board lists until we reach a common level
-				// with the next board.
-				while ($next_child_level < $curr_child_level--) {
-					echo '
-									</li>
-								</ul>';
-				}
-
-				echo '
-							</li>';
-			}
-		}
-
-		echo '
-						</ul>
-					</li>';
-	}
-
-	echo '
-				</ul>
-			</div><!-- .flow_hidden boardslist -->';
-
-	// Show the standard "Save Settings" profile button.
-	template_profile_save();
-
-	echo '
-		</div><!-- .windowbg -->
-	</form>
-	<br>';
-}
-
-/**
- * Simply loads some theme variables common to several warning templates.
- */
-function template_load_warning_variables()
-{
-	// Setup the warning mode
-	Utils::$context['warning_mode'] = [
-		0 => 'none',
-		Config::$modSettings['warning_watch'] => 'watched',
-		Config::$modSettings['warning_moderate'] => 'moderated',
-		Config::$modSettings['warning_mute'] => 'muted',
-	];
-
-	// Work out the starting warning.
-	Utils::$context['current_warning_mode'] = Utils::$context['warning_mode'][0];
-
-	foreach (Utils::$context['warning_mode'] as $limit => $warning) {
-		if (Utils::$context['member']['warning'] >= $limit) {
-			Utils::$context['current_warning_mode'] = $warning;
-		}
-	}
-}
-
-/**
- * Template for viewing a user's warnings
- */
-function template_viewWarning()
-{
-	template_load_warning_variables();
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt('profile_viewwarning_for_user', Utils::$context['member'], file: 'Profile'), '
-			</h3>
-		</div>
-		<p class="information">', Lang::getTxt('viewWarning_help', file: 'Profile'), '</p>
-		<div class="windowbg">
-			<dl class="settings">
-				<dt>
-					<strong>', Lang::getTxt('profile_warning_name', file: 'Profile'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['member']['name'], '
-				</dd>
-				<dt>
-					<strong>', Lang::getTxt('profile_warning_level', file: 'Profile'), '</strong>
-				</dt>
-				<dd>
-					<div class="generic_bar warning_level ', Utils::$context['current_warning_mode'], '">
-						<div class="bar" style="width: ', Utils::$context['member']['warning'], '%;"></div>
-						<span>', Utils::$context['member']['warning'], '%</span>
-					</div>
-				</dd>';
-
-	// There's some impact of this?
-	if (!empty(Utils::$context['level_effects'][Utils::$context['current_level']])) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('profile_viewwarning_impact', file: 'Profile'), '</strong>
-				</dt>
-				<dd>
-					', Utils::$context['level_effects'][Utils::$context['current_level']], '
-				</dd>';
-	}
-
-	echo '
-			</dl>
-		</div><!-- .windowbg -->';
-
-	template_show_list('view_warnings');
-}
-
-/**
- * Template for issuing warnings
- */
-function template_issueWarning()
-{
-	template_load_warning_variables();
-
-	// The bodies of the notification templates and the text for each warning
-	// level. profile.js does the rest; all it needs from here is the data.
-	echo '
-	<script>
-		var notification_templates = ', json_encode(array_column(Utils::$context['notification_templates'], 'body'), JSON_UNESCAPED_SLASHES), ';
-		var level_effects = ', json_encode(Utils::$context['level_effects'], JSON_UNESCAPED_SLASHES | JSON_FORCE_OBJECT), ';
-	</script>';
-
-	echo '
-	<form action="', Config::$scripturl, '?action=profile;u=', Utils::$context['id_member'], ';area=issuewarning" method="post" class="flow_hidden" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt(Profile::$member->is_me ? 'profile_warning_level' : 'profile_issue_warning', file: 'Profile'), '
-			</h3>
-		</div>';
-
-	if (!Profile::$member->is_me) {
-		echo '
-		<p class="information">', Lang::getTxt('profile_warning_desc', file: 'Profile'), '</p>';
-	}
-
-	echo '
-		<div class="windowbg">
-			<dl class="settings">';
-
-	if (!Profile::$member->is_me) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('profile_warning_name', file: 'Profile'), '</strong>
-				</dt>
-				<dd>
-					<strong>', Utils::$context['member']['name'], '</strong>
-				</dd>';
-	}
-
-	echo '
-				<dt>
-					<strong>', Lang::getTxt('profile_warning_level', file: 'Profile'), '</strong>';
-
-	// Is there only so much they can apply?
-	if (Utils::$context['warning_limit']) {
-		echo '
-					<br>
-					<span class="smalltext">', Lang::getTxt('profile_warning_limit_attribute', [Utils::$context['warning_limit'] / 100], file: 'Profile'), '</span>';
-	}
-
-	echo '
-				</dt>
-				<dd>
-					', Lang::formatText('{0, number, :: percent}', [0]), ' <input name="warning_level" id="warning_level" type="range" min="0" max="100" step="5" value="', Utils::$context['member']['warning'], '"> ', Lang::formatText('{0, number, :: percent}', [100]), '
-					<div class="clear_left">
-						', Lang::getTxt('profile_warning_impact', file: 'Profile'), ': <output name="cur_level" for="warning_level" data-format="', Lang::getTxt('percent_format', file: 'General'), '">', Lang::formatText('{0, number, :: percent}', [Utils::$context['member']['warning']]), ' (', Utils::$context['level_effects'][Utils::$context['current_level']], ')</output>
-					</div>
-				</dd>';
-
-	if (!Profile::$member->is_me) {
-		echo '
-				<dt>
-					<strong>', Lang::getTxt('profile_warning_reason', file: 'Profile'), '</strong><br>
-					<span class="smalltext">', Lang::getTxt('profile_warning_reason_desc', file: 'Profile'), '</span>
-				</dt>
-				<dd>
-					<input type="text" name="warn_reason" id="warn_reason" value="', Utils::$context['warning_data']['reason'], '" size="50">
-				</dd>
-			</dl>
-			<hr>
-			<div id="box_preview"', !empty(Utils::$context['warning_data']['body_preview']) ? '' : ' style="display:none"', '>
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('preview', file: 'General'), '</strong>
-					</dt>
-					<dd id="body_preview">
-						', !empty(Utils::$context['warning_data']['body_preview']) ? Utils::adjustHeadingLevels(Utils::$context['warning_data']['body_preview'], 3) : '', '
-					</dd>
-				</dl>
-				<hr>
-			</div>
-			<dl class="settings">
-				<dt>
-					<strong><label for="warn_notify">', Lang::getTxt('profile_warning_notify', file: 'Profile'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="checkbox" name="warn_notify" id="warn_notify"', Utils::$context['warning_data']['notify'] ? ' checked' : '', '>
-				</dd>
-				<dt>
-					<strong><label for="warn_sub">', Lang::getTxt('profile_warning_notify_subject', file: 'Profile'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="text" name="warn_sub" id="warn_sub" value="', empty(Utils::$context['warning_data']['notify_subject']) ? Lang::getTxt('profile_warning_notify_template_subject', file: 'Profile') : Utils::$context['warning_data']['notify_subject'], '" size="50">
-				</dd>
-				<dt>
-					<strong><label for="warn_temp">', Lang::getTxt('profile_warning_notify_body', file: 'Profile'), '</label></strong>
-				</dt>
-				<dd>
-					<select name="warn_temp" id="warn_temp" disabled>
-						<option value="-1">', Lang::getTxt('profile_warning_notify_template', file: 'Profile'), '</option>
-						<option value="-1" disabled>------------------------------</option>';
-
-		foreach (Utils::$context['notification_templates'] as $id_template => $template) {
-			echo '
-						<option value="', $id_template, '">', $template['title'], '</option>';
-		}
-
-		echo '
-					</select>
-					<span id="new_template_link" hidden><a href="', Config::$scripturl, '?action=moderate;area=warnings;sa=templateedit;tid=0" class="button floatnone" target="_blank" rel="noopener">', Lang::getTxt('profile_warning_new_template', file: 'Profile'), '</a></span>
-					<br>
-					<textarea name="warn_body" id="warn_body" cols="40" rows="8">', Utils::$context['warning_data']['notify_body'], '</textarea>
-				</dd>';
-	}
-	echo '
-			</dl>
-			<div class="righttext">';
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="button" name="preview" id="preview_button" value="', Lang::getTxt('preview', file: 'General'), '" class="button">
-				<input type="submit" name="save" value="', Lang::getTxt(Profile::$member->is_me ? 'change_profile' : 'profile_warning_issue', file: 'Profile'), '" class="button">
-			</div><!-- .righttext -->
-		</div><!-- .windowbg -->
-	</form>';
-
-	// Previous warnings?
-	template_show_list('view_warnings');
-}
-
-/**
- * Template to show for deleting a user's account - now with added delete post capability!
- */
-function template_deleteAccount()
-{
-	// The main containing header.
-	echo '
-		<form action="', Config::$scripturl, '?action=profile;area=deleteaccount;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
-			<div class="cat_bar">
-				<h3 class="catbg profile_hd">
-					', Lang::getTxt('deleteAccount', file: 'Profile'), '
-				</h3>
-			</div>';
-
-	// If deleting another account give them a lovely info box.
-	if (!Profile::$member->is_me) {
-		echo '
-			<p class="information">', Lang::getTxt('deleteAccount_desc', file: 'Profile'), '</p>';
-	}
-
-	echo '
-			<div class="windowbg">';
-
-	// If they are deleting their account AND the admin needs to approve it - give them another piece of info ;)
-	if (Utils::$context['needs_approval']) {
-		echo '
-				<div class="noticebox">', Lang::getTxt('deleteAccount_approval', file: 'Profile'), '</div>';
-	}
-
-	// If the user is deleting their own account warn them first - and require a password!
-	if (Profile::$member->is_me) {
-		echo '
-				<div class="errorbox">', Lang::getTxt('own_profile_confirm', file: 'Profile'), '</div>
-				<fieldset>';
-
-		if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])) {
-			echo '
-					' . Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile');
-		} else {
-			echo '
-					<label for="anonymize">
-						<input type="checkbox" name="anonymize" id="anonymize" value="1"> ', Lang::getTxt('deleteAccount_anonymize', file: 'Profile'), '
-					</label>';
-		}
-
-		echo '
-				</fieldset>
-				<fieldset>
-					<legend>', Lang::getTxt('required_security_reasons', file: 'Profile'), '</legend>
-					<strong', (isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : ''), '>', Lang::getTxt('current_password', file: 'Profile'), '</strong>
-					<input type="password" name="oldpasswrd" size="20">
-				</fieldset>
-				<input type="submit" value="', Lang::getTxt('delete', file: 'General'), '" class="button floatright">';
-
-		if (!empty(Utils::$context['token_check'])) {
-			echo '
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-		}
-
-		echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-				<input type="hidden" name="sa" value="', Utils::$context['menu_item_selected'], '">';
-	}
-	// Otherwise an admin doesn't need to enter a password - but they still get a warning - plus the option to delete lovely posts!
-	else {
-		echo '
-				<div class="errorbox">', Lang::getTxt('deleteAccount_warning', file: 'Profile'), '</div>';
-
-		// Only actually give these options if they are kind of important.
-		if (Utils::$context['can_delete_posts']) {
-			echo '
-				<fieldset>
-					<label for="deleteVotes">
-						<input type="checkbox" name="deleteVotes" id="deleteVotes" value="1"> ', Lang::getTxt('deleteAccount_votes', file: 'Profile'), '
-					</label>
-				</fieldset>
-				<fieldset>
-					<label for="deletePosts">
-						<input type="checkbox" name="deletePosts" id="deletePosts" value="1"> ', Lang::getTxt('deleteAccount_posts', file: 'Profile'), '
-					</label>
-					<select name="remove_type">
-						<option value="posts">', Lang::getTxt('deleteAccount_all_posts', file: 'Profile'), '</option>
-						<option value="topics">', Lang::getTxt('deleteAccount_topics', file: 'Profile'), '</option>
-					</select>';
-
-			if (Utils::$context['show_perma_delete']) {
-				echo '
-					<br>
-					<label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1"> ', Lang::getTxt('deleteAccount_permanent', file: 'Profile'), '</label>';
-			}
-
-			echo '
-				</fieldset>';
-		}
-
-		echo '
-				<fieldset>
-					<label for="deleteAccount">
-						<input type="checkbox" name="deleteAccount" id="deleteAccount" value="1" onclick="if (this.checked) return confirm(\'', Lang::getTxt('deleteAccount_confirm', file: 'Profile'), '\');"> ', Lang::getTxt('deleteAccount_member', file: 'Profile'), '
-					</label>
-					<br>';
-
-		if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])) {
-			echo '
-					' . Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile');
-		} else {
-			echo '
-					<label for="anonymize">
-						<input type="checkbox" name="anonymize" id="anonymize" value="1"> ', Lang::getTxt('deleteAccount_anonymize', file: 'Profile'), '
-					</label>';
-		}
-
-		echo '
-				</fieldset>
-				<div>
-					<input type="submit" value="', Lang::getTxt('delete', file: 'General'), '" class="button floatright">';
-
-		if (!empty(Utils::$context['token_check'])) {
-			echo '
-				<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-		}
-
-		echo '
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-					<input type="hidden" name="sa" value="', Utils::$context['menu_item_selected'], '">
-				</div>';
-	}
-	echo '
-			</div><!-- .windowbg -->
-			<br>
-		</form>';
-}
-
-/**
- * Template for the password box/save button stuck at the bottom of every profile page.
- */
-function template_profile_save()
-{
-	echo '
-
-					<hr>';
-
-	// Only show the password box if it's actually needed.
-	if (Utils::$context['require_password']) {
-		echo '
-					<dl class="settings">
-						<dt>
-							<strong', isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '', '>', Lang::getTxt('current_password', file: 'Profile'), '</strong><br>
-							<span class="smalltext">', Lang::getTxt('required_security_reasons', file: 'Profile'), '</span>
-						</dt>
-						<dd>
-							<input type="password" name="oldpasswrd" size="20">
-						</dd>
-					</dl>';
-	}
-
-	echo '
-					<div class="righttext">';
-
-	if (!empty(Utils::$context['token_check'])) {
-		echo '
-						<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">';
-	}
-
-	echo '
-						<input type="submit" value="', Lang::getTxt('change_profile', file: 'Profile'), '" class="button">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-						<input type="hidden" name="sa" value="', Utils::$context['menu_item_selected'], '">
-					</div>';
-}
-
-/**
- * Small template for showing an error message upon a save problem in the profile.
- */
-function template_error_message()
-{
-	echo '
-		<div class="errorbox" ', empty(Utils::$context['post_errors']) ? 'style="display:none" ' : '', 'id="profile_error">';
-
-	if (!empty(Utils::$context['post_errors'])) {
-		echo '
-			<span>', !empty(Utils::$context['custom_error_title']) ? Utils::$context['custom_error_title'] : Lang::getTxt('profile_errors_occurred', file: 'Errors'), '</span>
-			<ul id="list_errors">';
-
-		// Cycle through each error and display an error message.
-		foreach (Utils::$context['post_errors'] as $error) {
-			if ($error == 'password_short') {
-				$error_message = Lang::getTxt('profile_error_' . $error, [Security::minimumPasswordLength()], file: 'Profile');
-			} else {
-				$error_message = Lang::txtExists('profile_error_' . $error, file: 'Profile') ? Lang::getTxt('profile_error_' . $error, file: 'Profile') : $error;
-			}
-
-			echo '
-				<li>', $error_message, '</li>';
-		}
-
-		echo '
-			</ul>';
-	}
-
-	echo '
-		</div><!-- #profile_error -->';
-}
-
-/**
- * Display a load of drop down selectors for allowing the user to change group.
- */
-function template_profile_group_manage()
-{
-	echo '
-							<dt>
-								<label for="id_group"><strong>', Lang::getTxt('primary_membergroup', file: 'Profile'), '</strong></label><br>
-								<span class="smalltext"><a href="', Config::$scripturl, '?action=helpadmin;help=moderator_why_missing" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help"></span> ', Lang::getTxt('moderator_why_missing', file: 'Profile'), '</a></span>
-							</dt>
-							<dd>
-								<select name="id_group" id="id_group" ', (Profile::$member->is_me && Utils::$context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . Lang::getTxt('deadmin_confirm', file: 'Profile') . '\')) this.value = 1;"' : ''), '>';
-
-	// Fill the select box with all primary member groups that can be assigned to a member.
-	foreach (Utils::$context['member_groups'] as $member_group) {
-		if (!empty($member_group['can_be_primary'])) {
-			echo '
-									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '>
-										', $member_group['name'], '
-									</option>';
-		}
-	}
-
-	echo '
-								</select>
-							</dd>
-							<dt>
-								<strong>', Lang::getTxt('additional_membergroups', file: 'Profile'), '</strong>
-							</dt>
-							<dd>
-								<span id="additional_groupsList">
-									<input type="hidden" name="additional_groups[]" value="0">';
-
-	// For each membergroup show a checkbox so members can be assigned to more than one group.
-	foreach (Utils::$context['member_groups'] as $member_group) {
-		if ($member_group['can_be_additional']) {
-			echo '
-									<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', '> ', $member_group['name'], '</label><br>';
-		}
-	}
-
-	echo '
-								</span>
-								<a href="javascript:void(0);" onclick="document.getElementById(\'additional_groupsList\').style.display = \'block\'; document.getElementById(\'additional_groupsLink\').style.display = \'none\'; return false;" id="additional_groupsLink" style="display: none;" class="toggle_down">', Lang::getTxt('additional_membergroups_show', file: 'Profile'), '</a>
-								<script>
-									document.getElementById("additional_groupsList").style.display = "none";
-									document.getElementById("additional_groupsLink").style.display = "";
-								</script>
-							</dd>';
-
-}
-
-/**
- * Show the signature editing box?
- */
-function template_profile_signature_modify()
-{
-	echo '
-							<dt id="current_signature" style="display:none">
-								<strong>', Lang::getTxt('current_signature', file: 'Profile'), '</strong>
-							</dt>
-							<dd id="current_signature_display" style="display:none">
-								<hr>
-							</dd>
-
-							<dt id="preview_signature" style="display:none">
-								<strong>', Lang::getTxt('signature_preview', file: 'Profile'), '</strong>
-							</dt>
-							<dd id="preview_signature_display" style="display:none">
-								<hr>
-							</dd>
-
-							<dt>
-								<label for="signature"><strong>', Lang::getTxt('signature', file: 'Profile'), '</strong></label><br>
-								<span class="smalltext">', Lang::getTxt('sig_info', file: 'Profile'), '</span><br>
-								<br>';
-
-	if (Utils::$context['show_spellchecking']) {
-		echo '
-								<input type="button" value="', Lang::getTxt('spell_check', file: 'General'), '" onclick="spellCheck(\'creator\', \'signature\');" class="button">';
-	}
-
-	echo '
-							</dt>
-							<dd>
-								<textarea class="editor" id="signature" name="signature" rows="5" cols="50"', empty(Utils::$context['signature_limits']['max_length']) ? '' : ' data-max-length="' . (int) Utils::$context['signature_limits']['max_length'] . '"', '>', Utils::$context['member']['signature'], '</textarea><br>';
-
-	// If there is a limit at all!
-	if (!empty(Utils::$context['signature_limits']['max_length'])) {
-		echo '
-								<span class="smalltext">', Lang::getTxt('max_sig_characters', Utils::$context['signature_limits'], file: 'Profile'), '</span><br>';
-	}
-
-	if (!empty(Utils::$context['show_preview_button'])) {
-		echo '
-								<input type="button" name="preview_signature" id="preview_button" value="', Lang::getTxt('preview_signature', file: 'Profile'), '" class="button floatright">';
-	}
-
-	if (Utils::$context['signature_warning']) {
-		echo '
-								<span class="smalltext">', Utils::$context['signature_warning'], '</span>';
-	}
-
-	echo '
-							</dd>';
-}
-
-/**
- * Template for selecting an avatar
- */
-function template_profile_avatar_select()
-{
-	// Start with the upper menu
-	echo '
-							<dt>
-								<strong id="personal_picture">
-									<label for="avatar_upload_box">', Lang::getTxt('personal_picture', file: 'Profile'), '</label>
-								</strong>';
-
-	if (empty(Config::$modSettings['gravatarEnabled']) || empty(Config::$modSettings['gravatarOverride'])) {
-		echo '
-								<input type="radio" name="avatar_choice" id="avatar_choice_none" value="none"' . (Utils::$context['member']['avatar']['choice'] == 'none' ? ' checked="checked"' : '') . '>
-								<label for="avatar_choice_none"' . (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
-									' . Lang::getTxt('no_avatar', file: 'Profile') . '
-								</label><br>';
-	}
-
-	if (!empty(Utils::$context['member']['avatar']['allow_server_stored'])) {
-		echo '
-								<input type="radio" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . (Utils::$context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . '>
-								<label for="avatar_choice_server_stored"' . (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
-									', Lang::getTxt('choose_avatar_gallery', file: 'Profile'), '
-								</label><br>';
-	}
-
-	if (!empty(Utils::$context['member']['avatar']['allow_external'])) {
-		echo '
-								<input type="radio" name="avatar_choice" id="avatar_choice_external" value="external"' . (Utils::$context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . '>
-								<label for="avatar_choice_external"' . (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
-									', Lang::getTxt('my_own_pic', file: 'Profile'), '
-								</label><br>';
-	}
-
-	if (!empty(Utils::$context['member']['avatar']['allow_upload'])) {
-		echo '
-								<input type="radio" name="avatar_choice" id="avatar_choice_upload" value="upload"' . (Utils::$context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . '>
-								<label for="avatar_choice_upload"' . (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>
-									', Lang::getTxt('avatar_will_upload', file: 'Profile'), '
-								</label><br>';
-	}
-
-	if (!empty(Utils::$context['member']['avatar']['allow_gravatar'])) {
-		echo '
-								<input type="radio" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . (Utils::$context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . '>
-								<label for="avatar_choice_gravatar"' . (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . Lang::getTxt('use_gravatar', file: 'Profile') . '</label>
-								<span class="smalltext"><a href="', Config::$scripturl, '?action=helpadmin;help=gravatar" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help"></span></a></span>';
-	}
-
-	echo '
-							</dt>
-							<dd>';
-
-	// If users are allowed to choose avatars stored on the server show selection boxes to choice them from.
-	if (!empty(Utils::$context['member']['avatar']['allow_server_stored'])) {
-		echo '
-								<div id="avatar_server_stored" data-avatar-choice="server_stored">
-									<div>
-										<select name="cat" id="cat" size="10" data-avatardir="', Config::$modSettings['avatar_url'], '/">';
-
-		// One entry per avatar, with the directories as groups. Nothing here is
-		// nested more than one deep, because that is all the picker can show.
-		foreach (Utils::$context['avatars'] as $avatar) {
-			if (!empty($avatar['is_dir'])) {
-				echo '
-											<optgroup label="', $avatar['name'], '">';
-
-				foreach ($avatar['files'] as $file) {
-					echo '
-												<option value="', $avatar['filename'], '/', $file['filename'], '"', $file['checked'] ? ' selected' : '', '>', $file['name'], '</option>';
-				}
-
-				echo '
-											</optgroup>';
-			} else {
-				echo '
-											<option value="', $avatar['filename'], '"', $avatar['checked'] ? ' selected' : '', '>', $avatar['name'], '</option>';
-			}
-		}
-
-		echo '
-										</select>
-									</div>
-									<div class="edit_avatar_img">
-										<img id="avatar" src="', Utils::$context['member']['avatar']['choice'] == 'server_stored' ? Utils::$context['member']['avatar']['href'] : Config::$modSettings['avatar_url'] . '/blank.png', '" alt="">
-									</div>
-								</div><!-- #avatar_server_stored -->';
-	}
-
-	// If the user can link to an off server avatar, show them a box to input the address.
-	if (!empty(Utils::$context['member']['avatar']['allow_external'])) {
-		echo '
-								<div id="avatar_external" data-avatar-choice="external">
-									', Utils::$context['member']['avatar']['choice'] == 'external' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt="" class="avatar"></div>' : '', '
-									<div class="smalltext">', Lang::getTxt('avatar_by_url', file: 'Profile'), '</div>', !empty(Config::$modSettings['avatar_action_too_large']) && Config::$modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? template_max_size('external') : '', '
-									<input type="text" name="userpicpersonal" size="45" value="', ((stristr(Utils::$context['member']['avatar']['external'], 'http://') || stristr(Utils::$context['member']['avatar']['external'], 'https://')) ? Utils::$context['member']['avatar']['external'] : 'http://'), '"><br>
-								</div>';
-	}
-
-	// If the user is able to upload avatars to the server show them an upload box.
-	if (!empty(Utils::$context['member']['avatar']['allow_upload'])) {
-		echo '
-								<div id="avatar_upload" data-avatar-choice="upload">
-									', Utils::$context['member']['avatar']['choice'] == 'upload' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt=""></div>' : '', '
-									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" accept="image/gif, image/jpeg, image/jpg, image/png, image/svg+xml, image/webp">', template_max_size('upload'), '
-									', (!empty(Utils::$context['member']['avatar']['id_attach']) ? '<br><input type="hidden" name="id_attach" value="' . Utils::$context['member']['avatar']['id_attach'] . '">' : ''), '
-								</div>';
-	}
-
-	// if the user is able to use Gravatar avatars show then the image preview
-	if (!empty(Utils::$context['member']['avatar']['allow_gravatar'])) {
-		echo '
-								<div id="avatar_gravatar" data-avatar-choice="gravatar"', !empty(Config::$modSettings['gravatarAllowExtraEmail']) && (Utils::$context['member']['avatar']['external'] == Utils::$context['member']['email'] || str_contains(Utils::$context['member']['avatar']['external'], 'http://') || str_contains(Utils::$context['member']['avatar']['external'], 'https://')) ? ' data-clear-email' : '', '>
-									', Utils::$context['member']['avatar']['choice'] == 'gravatar' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt=""></div>' : '';
-
-		if (empty(Config::$modSettings['gravatarAllowExtraEmail'])) {
-			echo '
-									<div class="smalltext">', Lang::getTxt('gravatar_noAlternateEmail', file: 'Profile'), '</div>';
-		} else {
-			// Depending on other stuff, the stored value here might have some odd things in it from other areas.
-			if (Utils::$context['member']['avatar']['external'] == Utils::$context['member']['email']) {
-				$textbox_value = '';
-			} else {
-			$textbox_value = Utils::$context['member']['avatar']['external'];
-			}
-
-			echo '
-									<div class="smalltext">', Lang::getTxt('gravatar_alternateEmail', file: 'Profile'), '</div>
-									<input type="text" name="gravatarEmail" id="gravatarEmail" size="45" value="', $textbox_value, '">';
-		}
-		echo '
-								</div><!-- #avatar_gravatar -->';
-	}
-
-	echo '
-							</dd>';
-}
-
-/**
- * This is just a really little helper to avoid duplicating code unnecessarily
- *
- * @param string $type The type of avatar
- */
-function template_max_size($type)
-{
-	$w = !empty(Config::$modSettings['avatar_max_width_' . $type]) ? Lang::numberFormat(Config::$modSettings['avatar_max_width_' . $type]) : 0;
-	$h = !empty(Config::$modSettings['avatar_max_height_' . $type]) ? Lang::numberFormat(Config::$modSettings['avatar_max_height_' . $type]) : 0;
-
-	$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
-
-	if (empty($suffix)) {
-		return;
-	}
-
-	echo '
-								<div class="smalltext">', Lang::getTxt('avatar_max_size_' . $suffix, ['w' => $w, 'h' => $h], file: 'Profile'), '</div>';
-}
-
-/**
- * Select the time format!
- */
-function template_profile_timeformat_modify()
-{
-	echo '
-							<dt>
-								<strong><label for="easyformat">', Lang::getTxt('time_format', file: 'Profile'), '</label></strong><br>
-								<a href="', Config::$scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-								<span class="smalltext">
-									<label for="time_format">', Lang::getTxt('date_format', file: 'Profile'), '</label>
-								</span>
-							</dt>
-							<dd>
-								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">';
-
-	// Help the user by showing a list of common time formats.
-	$found = false;
-
-	foreach (Utils::$context['easy_timeformats'] as $time_format) {
-		$found = $found || $time_format['format'] == Utils::$context['member']['time_format'];
-
-		echo '
-									<option value="', $time_format['format'], '"', $time_format['format'] == Utils::$context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
-	}
-
-	echo '
-									<option value="other"', !$found ? ' selected' : '', ' disabled>', Lang::getTxt('other', file: 'General'), '</option>
-								</select>
-								<input type="text" name="time_format" id="time_format" value="', Utils::$context['member']['time_format'], '" onchange="document.forms.creator.easyformat.value = \'other\'" size="30">
-							</dd>';
-}
-
-/**
- * Template for picking a theme
- */
-function template_profile_theme_pick()
-{
-	echo '
-							<dt>
-								<strong>', Lang::getTxt('current_theme', file: 'Profile'), '</strong>
-							</dt>
-							<dd>
-								', Utils::$context['member']['theme']['name'], ' <a class="button" href="', Config::$scripturl, '?action=themechooser;u=', Utils::$context['id_member'], '">', Lang::getTxt('change', file: 'Profile'), '</a>
-							</dd>';
-}
-
-/**
- * Smiley set picker.
- */
-function template_profile_smiley_pick()
-{
-	echo '
-							<dt>
-								<strong><label for="smiley_set">', Lang::getTxt('smileys_current', file: 'General'), '</label></strong>
-							</dt>
-							<dd>
-								<select name="smiley_set" id="smiley_set">';
-
-	foreach (Utils::$context['smiley_sets'] as $set) {
-		echo '
-									<option data-preview="', $set['preview'], '" value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>';
-	}
-
-	echo '
-								</select>
-								<img id="smileypr" class="centericon" src="', Utils::$context['member']['smiley_set']['preview'], '" alt=":)">
-							</dd>';
-}
-
-/**
- * Template for setting up and managing Two-Factor Authentication.
- */
-function template_tfasetup()
-{
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('tfa_title', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<div>';
-
-	if (!empty(Utils::$context['tfa_backup'])) {
-		echo '
-					<div class="smalltext error">
-						', Lang::getTxt('tfa_backup_used_desc', file: 'Profile'), '
-					</div>';
-	} elseif (Config::$modSettings['tfa_mode'] == 2) {
-		echo '
-					<div class="smalltext">
-						<strong>', Lang::getTxt('tfa_forced_desc', file: 'Profile'), '</strong>
-					</div>';
-	}
-
-	echo '
-					<div class="smalltext">
-						', Lang::getTxt('tfa_desc', file: 'Profile'), '
-					</div>
-					<div class="floatleft">
-						<form action="', Config::$scripturl, '?action=profile;area=tfasetup" method="post">
-							<div class="block">
-								<strong>', Lang::getTxt('tfa_step1', file: 'Profile'), '</strong><br>';
-
-	if (!empty(Utils::$context['tfa_pass_error'])) {
-		echo '
-								<div class="error smalltext">
-									', Lang::getTxt('tfa_pass_invalid', file: 'Profile'), '
-								</div>';
-	}
-
-	echo '
-								<input type="password" name="oldpasswrd" size="25"', !empty(Utils::$context['password_auth_failed']) ? ' class="error"' : '', !empty(Utils::$context['tfa_pass_value']) ? ' value="' . Utils::$context['tfa_pass_value'] . '"' : '', '>
-							</div>
-							<div class="block">
-								<strong>', Lang::getTxt('tfa_step2', file: 'Profile'), '</strong>
-								<div class="smalltext">', Lang::getTxt('tfa_step2_desc', file: 'Profile'), '</div>
-								<div class="tfacode">', Utils::$context['tfa_secret'], '</div>
-							</div>
-							<div class="block">
-								<strong>', Lang::getTxt('tfa_step3', file: 'Profile'), '</strong><br>';
-
-	if (!empty(Utils::$context['tfa_error'])) {
-		echo '
-								<div class="error smalltext">
-									', Lang::getTxt('tfa_code_invalid', file: 'Profile'), '
-								</div>';
-	}
-
-	echo '
-								<input type="text" name="tfa_code" size="25"', !empty(Utils::$context['tfa_error']) ? ' class="error"' : '', !empty(Utils::$context['tfa_value']) ? ' value="' . Utils::$context['tfa_value'] . '"' : '', '>
-								<input type="submit" name="save" value="', Lang::getTxt('tfa_enable', file: 'Profile'), '" class="button">
-							</div>
-							<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						</form>
-					</div>
-					<div class="floatright tfa_qrcode">
-						<div id="qrcode"></div>
-						<script type="text/javascript">
-							new QRCode(document.getElementById("qrcode"), "', Utils::$context['tfa_qr_url'], '");
-						</script>
-					</div>';
-
-	if (!empty(Utils::$context['from_ajax'])) {
-		echo '
-					<br>
-					<a href="javascript:self.close();"></a>';
-	}
-
-	echo '
-				</div>
-			</div><!-- .roundframe -->';
-}
-
-/**
- * Template for disabling two-factor authentication.
- */
-function template_tfadisable()
-{
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('tfadisable', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<form action="', Config::$scripturl, '?action=profile;area=tfadisable" method="post">';
-
-	if (Profile::$member->is_me) {
-		echo '
-					<div class="block">
-						<strong', (isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : ''), '>', Lang::getTxt('current_password', file: 'Profile'), '</strong><br>
-						<input type="password" name="oldpasswrd" size="20">
-					</div>';
-	} else {
-	echo '
-					<div class="smalltext">
-						', Lang::getTxt('tfa_disable_for_user', ['name' => User::$me->name], file: 'Profile'), '
-					</div>';
-	}
-
-	echo '
-					<input type="submit" name="save" value="', Lang::getTxt('tfa_disable', file: 'Profile'), '" class="button floatright">
-					<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="u" value="', Utils::$context['id_member'], '">
-				</form>
-			</div><!-- .roundframe -->';
-}
-
-/**
- * Template for setting up 2FA backup code
- */
-function template_tfasetup_backup()
-{
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('tfa_backup_title', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<div>
-					<div class="smalltext">', Lang::getTxt('tfa_backup_desc', file: 'Profile'), '</div>
-					<div class="bbc_code" style="resize: none; border: none;">', Utils::$context['tfa_backup'], '</div>
-				</div>
-			</div>';
-}
-
-/**
- * Simple template for showing the 2FA area when editing a profile.
- */
-function template_profile_tfa()
-{
-	echo '
-							<dt>
-								<strong>', Lang::getTxt('tfa_profile_label', file: 'Profile'), '</strong><br>
-								<div class="smalltext">', Lang::getTxt('tfa_profile_desc', file: 'Profile'), '</div>
-							</dt>
-							<dd>';
-
-	if (!Utils::$context['tfa_enabled'] && Profile::$member->is_me) {
-		echo '
-								<a href="', !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', Lang::getTxt('tfa_profile_enable', file: 'Profile'), '</a>';
-	} elseif (!Utils::$context['tfa_enabled']) {
-		echo '
-								', Lang::getTxt('tfa_profile_disabled', file: 'Profile');
-	} else {
-	echo '
-								', Lang::getTxt('tfa_profile_enabled', ['url' => (!empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl) . '?action=profile;u=' . Utils::$context['id_member'] . ';area=tfadisable'], file: 'Profile');
-	}
-
-	echo '
-							</dd>';
-}
-
-/**
- * Template for initiating and retrieving profile data exports
- */
-function template_export_profile_data()
-{
-	$default_settings = ['included' => [], 'format' => ''];
-	$dltoken = '';
-
-	// The main containing header.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg profile_hd">
-				', Lang::getTxt('export_profile_data', file: 'Profile'), '
-			</h3>
-		</div>
-		<div class="information">', Utils::$context['export_profile_data_desc'], '</div>';
-
-	if (!empty(Utils::$context['completed_exports'])) {
-		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('completed_exports', file: 'Profile'), '</h3>
-		</div>
-		<div class="windowbg noup">';
-
-		foreach (Utils::$context['completed_exports'] as $basehash_ext => $parts) {
-			echo '
-			<form action="', Config::$scripturl, '?action=profile;area=getprofiledata;u=', Utils::$context['id_member'], '" method="post" accept-charset="UTF-8" class="', count(Utils::$context['completed_exports']) > 1 ? 'descbox' : 'padding', '">';
-
-			if (!empty(Utils::$context['outdated_exports'][$basehash_ext])) {
-				echo '
-				<div class="noticebox">
-					<p>', Lang::getTxt('export_outdated_warning', file: 'Profile'), '</p>
-					<ul class="bbc_list">';
-
-				foreach (Utils::$context['outdated_exports'][$basehash_ext] as $datatype) {
-					echo '
-						<li>', Lang::getTxt($datatype, file: 'General+Profile'), '</li>';
-				}
-
-				echo '
-					</ul>
-				</div>';
-			}
-
-			echo '
-				<p>', Lang::getTxt(
-				'export_file_desc',
-				[
-					'list' => $parts[1]['included_desc'],
-					'format' => Utils::$context['export_formats'][$parts[1]['format']]['description'],
-				],
-				file: 'Profile',
-			), '</p>';
-
-			if (count($parts) > 10) {
-				echo '
-				<details>
-					<summary>', Lang::getTxt('export_file_count', [count($parts)], file: 'Profile'), '</summary>';
-			}
-
-			echo '
-				<ul class="bbc_list" id="', $parts[1]['format'], '_export_files">';
-
-			foreach ($parts as $part => $file) {
-				$dltoken = $file['dltoken'];
-
-				if (empty($default_settings['included'])) {
-					$default_settings['included'] = $file['included'];
-				}
-
-				if (empty($default_settings['format'])) {
-					$default_settings['format'] = $file['format'];
-				}
-
-				echo '
-					<li>
-						<a href="', Config::$scripturl, '?action=profile;area=download;u=', Utils::$context['id_member'], ';format=', $file['format'], ';part=', $part, ';t=', $dltoken, '" class="bbc_link" download>', $file['dlbasename'], '</a> (', $file['size'], ', ', $file['mtime'], ')
-					</li>';
-			}
-
-			echo '
-				</ul>';
-
-			if (count($parts) > 10) {
-				echo '
-				</details>';
-			}
-
-			echo '
-				<div class="righttext">
-					<input type="submit" name="delete" value="', Lang::getTxt('delete', file: 'General'), '" class="button you_sure">
-					<input type="hidden" name="format" value="', $parts[1]['format'], '">
-					<input type="hidden" name="t" value="', $dltoken, '">
-					<button type="button" class="button export_download_all" style="display:none" onclick="export_download_all(\'', $parts[1]['format'], '\');">', Lang::getTxt('export_download_all', file: 'Profile'), '</button>
-				</div>
-			</form>';
-		}
-
-		echo '
-		</div>';
-	}
-
-	if (!empty(Utils::$context['active_exports'])) {
-		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('active_exports', file: 'Profile'), '</h3>
-		</div>
-		<div class="windowbg noup">';
-
-		foreach (Utils::$context['active_exports'] as $file) {
-			$dltoken = $file['dltoken'];
-
-			if (empty($default_settings['included'])) {
-				$default_settings['included'] = $file['included'];
-			}
-
-			if (empty($default_settings['format'])) {
-				$default_settings['format'] = $file['format'];
-			}
-
-			echo '
-			<form action="', Config::$scripturl, '?action=profile;area=getprofiledata;u=', Utils::$context['id_member'], '" method="post" accept-charset="UTF-8"', count(Utils::$context['active_exports']) > 1 ? ' class="descbox"' : '', '>
-				<p class="padding">', Lang::getTxt(
-				'export_file_desc',
-				[
-					'list' => $file['included_desc'],
-					'format' => Utils::$context['export_formats'][$file['format']]['description'],
-				],
-				file: 'Profile',
-			), '</p>
-				<div class="righttext">
-					<input type="submit" name="delete" value="', Lang::getTxt('export_cancel', file: 'Profile'), '" class="button you_sure">
-					<input type="hidden" name="format" value="', $file['format'], '">
-					<input type="hidden" name="t" value="', $dltoken, '">
-				</div>
-			</form>';
-		}
-
-		echo '
-		</div>';
-	}
-
-	echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', Lang::getTxt('export_settings', file: 'Profile'), '</h3>
-		</div>
-		<div class="windowbg noup">
-			<form action="', Config::$scripturl, '?action=profile;area=getprofiledata;u=', Utils::$context['id_member'], '" method="post" accept-charset="UTF-8">
-				<dl class="settings">';
-
-	foreach (Utils::$context['export_datatypes'] as $datatype => $datatype_settings) {
-		if (!empty($datatype_settings['label'])) {
-			echo '
-					<dt>
-						<strong><label for="', $datatype, '">', $datatype_settings['label'], '</label></strong>
-					</dt>
-					<dd>
-						<input type="checkbox" id="', $datatype, '" name="', $datatype, '"', in_array($datatype, $default_settings['included']) ? ' checked' : '', '>
-					</dd>';
-		}
-	}
-
-	echo '
-				</dl>
-				<dl class="settings">
-					<dt>
-						<strong>', Lang::getTxt('export_format', file: 'Profile'), '</strong>
-					</dt>
-					<dd>
-						<select id="export_format_select" name="format">';
-
-	foreach (Utils::$context['export_formats'] as $format => $format_settings) {
-		echo '
-							<option value="', $format, '"', $format == $default_settings['format'] ? ' selected' : '', '>', $format_settings['description'], '</option>';
-	}
-
-	echo '
-						</select>
-					</dd>
-				</dl>
-				<div class="righttext">';
-
-	// At least one active or completed export exists.
-	if (!empty($dltoken)) {
-		echo '
-					<div id="export_begin" style="display:none">
-						<input type="submit" name="export_begin" value="', Lang::getTxt('export_begin', file: 'Profile'), '" class="button">
-					</div>
-					<div id="export_restart">
-						<input type="submit" name="export_begin" value="', Lang::getTxt('export_restart', file: 'Profile'), '" class="button you_sure" data-confirm="', Lang::getTxt('export_restart_confirm', file: 'Profile'), '">
-						<input type="hidden" name="delete">
-						<input type="hidden" name="t" value="', $dltoken, '">
-					</div>';
-	}
-	// No existing exports.
-	else {
-		echo '
-					<input type="submit" name="export_begin" value="', Lang::getTxt('export_begin', file: 'Profile'), '" class="button">';
-	}
-
-	echo '
-					<input type="hidden" name="', Utils::$context[Utils::$context['token_check'] . '_token_var'], '" value="', Utils::$context[Utils::$context['token_check'] . '_token'], '">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				</div>
-			</form>
-		</div><!-- .windowbg -->';
-}
-
-/**
- * Template for allowing the member to choose their time zone.
- */
-function template_profile_timezone()
-{
-	// Just in case...
-	Theme::loadTemplate('TimeZoneSelect');
-
-	echo '
-							<dt>
-								<strong>
-									<label for="timezone">', Lang::getTxt('timezone', file: 'Profile'), '</label>
-								</strong>
-							</dt>
-							<dd>';
-
-
-	// This part is easy enough.
-	template_timezone_select('timezone', Profile::$member->timezone);
-
-	echo '
-							</dd>';
-}
diff --git a/Themes/default/Recent.template.php b/Themes/default/Recent.template.php
deleted file mode 100644
index 6283490e952..00000000000
--- a/Themes/default/Recent.template.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Board;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * Template for showing recent posts
- */
-function template_recent()
-{
-	echo '
-	<div id="recent" class="main_section">
-		<div id="display_head" class="information">
-			<h2 class="display_title">
-				<span id="top_subject">', Lang::getTxt('recent_posts', file: 'General'), '</span>
-			</h2>
-		</div>';
-
-	if (!empty(Utils::$context['page_index'])) {
-		echo '
-		<div class="pagesection">
-			<div class="pagelinks">' . Utils::$context['page_index'] . '</div>
-		</div>';
-	}
-
-	if (empty(Utils::$context['posts'])) {
-		echo '
-		<div class="windowbg">', Lang::getTxt('no_messages', file: 'General'), '</div>';
-	}
-
-	foreach (Utils::$context['posts'] as $post) {
-		echo '
-		<div class="', $post['css_class'], '">
-			<div class="page_number floatright"> #', $post['counter'], '</div>
-			<div class="topic_details">
-				<h5>', $post['board']['link'], ' / ', $post['link'], '</h5>
-				<span class="smalltext">', Lang::getTxt('last_post_member_date', ['member' => $post['poster']['link'], 'relative' => str_contains($post['time'], Lang::getTxt('today', file: 'General')) ? 'today' : (str_contains($post['time'], Lang::getTxt('yesterday', file: 'General')) ? 'yesterday' : 'other'), 'date' => $post['time']]), '</span>
-			</div>
-			<div class="list_posts">', $post['body'], '</div>';
-
-		// Post options
-		template_quickbuttons($post['quickbuttons'], 'recent');
-
-		echo '
-		</div><!-- $post[css_class] -->';
-	}
-
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>
-	</div><!-- #recent -->';
-}
-
-/**
- * Template for showing unread posts
- */
-function template_unread()
-{
-	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
-	if (!empty(Utils::$context['recent_buttons'])) {
-		echo '
-	<div id="mobile_action" class="popup_container">
-		<div class="popup_window description">
-			<div class="popup_heading">
-				', Lang::getTxt('mobile_action', file: 'General'), '
-				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-			</div>
-			', template_button_strip(Utils::$context['recent_buttons']), '
-		</div>
-	</div>';
-	}
-
-	echo '
-	<div id="recent" class="main_content">
-		<div id="display_head" class="information">
-			<h2 class="display_title">
-				<span>', (!empty(Board::$info->name) ? Board::$info->name . ' - ' : '') . Utils::$context['page_title'], '</span>
-			</h2>
-		</div>';
-
-	if (Utils::$context['showCheckboxes']) {
-		echo '
-		<form action="', Config::$scripturl, '?action=quickmod" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="qaction" value="markread">
-			<input type="hidden" name="redirect_url" value="action=unread', (!empty(Utils::$context['showing_all_topics']) ? ';all' : ''), Utils::$context['querystring_board_limits'], '">';
-	}
-
-	if (!empty(Utils::$context['topics'])) {
-		echo '
-			<div class="pagesection">
-				', Utils::$context['menu_separator'], '
-				<div class="pagelinks floatleft">
-					<a href="#bot" class="button">', Lang::getTxt('go_down', file: 'General'), '</a>
-					', Utils::$context['page_index'], '
-				</div>
-				', !empty(Utils::$context['recent_buttons']) ? template_button_strip(Utils::$context['recent_buttons'], 'right') : '';
-
-		// Mobile action (top)
-		if (!empty(Utils::$context['recent_buttons'])) {
-			echo '
-				<div class="mobile_buttons floatright">
-					<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-				</div>';
-		}
-
-		echo '
-			</div>';
-
-		echo '
-			<div id="unread">
-				<div id="topic_header" class="title_bar">
-					<div class="board_icon"></div>
-					<div class="info">', Utils::$context['topics_headers']['subject'], ' / ', Utils::$context['topics_headers']['starter'], '</div>
-					<div class="board_stats centertext">', Utils::$context['topics_headers']['replies'], ' / ', Utils::$context['topics_headers']['views'], '</div>
-					<div class="lastpost">', Utils::$context['topics_headers']['last_post'],'</div>';
-
-		// Show a "select all" box for quick moderation?
-		if (Utils::$context['showCheckboxes']) {
-			echo '
-					<div class="moderation">
-						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
-					</div>';
-		}
-
-		echo '
-				</div><!-- #topic_header -->
-				<div id="topic_container">';
-
-		foreach (Utils::$context['topics'] as $topic) {
-			echo '
-					<div class="', $topic['css_class'], '">
-						<div class="board_icon">
-							<img src="', $topic['first_post']['icon_url'], '" alt="">
-							', $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '', '
-						</div>
-						<div class="info">';
-
-			// Now we handle the icons
-			echo '
-							<div class="icons floatright">';
-
-			if ($topic['is_locked']) {
-				echo '
-								<span class="main_icons lock"></span>';
-			}
-
-			if ($topic['is_sticky']) {
-				echo '
-								<span class="main_icons sticky"></span>';
-			}
-
-			if ($topic['is_poll']) {
-				echo '
-								<span class="main_icons poll"></span>';
-			}
-
-			echo '
-							</div>';
-
-			echo '
-							<div class="recent_title">
-								<a href="', $topic['new_href'], '" id="newicon', $topic['first_post']['id'], '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a>
-								', $topic['is_sticky'] ? '<strong>' : '', '<span class="preview" title="', $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span></span>', $topic['is_sticky'] ? '</strong>' : '', '
-							</div>
-							<p class="floatleft">
-								', $topic['first_post']['started_by'], '
-							</p>
-							', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '', '
-						</div><!-- .info -->
-						<div class="board_stats centertext">
-							<p>
-								', Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General'), '
-								<br>
-								', Lang::getTxt('number_of_views', [$topic['views']], file: 'General'), '
-							</p>
-						</div>
-						<div class="lastpost">
-							', Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General'), '
-						</div>';
-
-			if (Utils::$context['showCheckboxes']) {
-				echo '
-						<div class="moderation">
-							<input type="checkbox" name="topics[]" value="', $topic['id'], '">
-						</div>';
-			}
-
-			echo '
-					</div><!-- $topic[css_class] -->';
-		}
-
-		if (empty(Utils::$context['topics'])) {
-			echo '
-					<div style="display: none;"></div>';
-		}
-
-		echo '
-				</div><!-- #topic_container -->
-			</div><!-- #unread -->';
-
-		echo '
-			<div class="pagesection">
-				', !empty(Utils::$context['recent_buttons']) ? template_button_strip(Utils::$context['recent_buttons'], 'right') : '', '
-				', Utils::$context['menu_separator'], '
-				<div class="pagelinks floatleft">
-					<a href="#recent" class="button" id="bot">', Lang::getTxt('go_up', file: 'General'), '</a>
-					', Utils::$context['page_index'], '
-				</div>';
-
-		// Mobile action (bottom)
-		if (!empty(Utils::$context['recent_buttons'])) {
-		echo '
-				<div class="mobile_buttons floatright">
-					<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-				</div>';
-		}
-
-		echo '
-			</div>';
-	} else {
-	echo '
-			<div class="infobox">
-				<p class="centertext">
-					', Lang::getTxt(Utils::$context['showing_all_topics'] ? 'topic_alert_none' : 'unread_topics_visit_none', ['scripturl' => Config::$scripturl], file: 'General'), '
-				</p>
-			</div>';
-	}
-
-	if (Utils::$context['showCheckboxes']) {
-		echo '
-		</form>';
-	}
-
-	echo '
-	</div><!-- #recent -->';
-
-	if (empty(Utils::$context['no_topic_listing'])) {
-		template_topic_legend();
-	}
-}
-
-/**
- * Template for showing unread replies (eg new replies to topics you've posted in)
- */
-function template_replies()
-{
-	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
-	if (!empty(Utils::$context['recent_buttons'])) {
-		echo '
-	<div id="mobile_action" class="popup_container">
-		<div class="popup_window description">
-			<div class="popup_heading">
-				', Lang::getTxt('mobile_action', file: 'General'), '
-				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-			</div>
-			', template_button_strip(Utils::$context['recent_buttons']), '
-		</div>
-	</div>';
-	}
-
-	echo '
-	<div id="recent">
-		<div id="display_head" class="information">
-			<h2 class="display_title">
-				<span>', (!empty(Board::$info->name) ? Board::$info->name . ' - ' : '') . Utils::$context['page_title'], '</span>
-			</h2>
-		</div>';
-
-	if (Utils::$context['showCheckboxes']) {
-		echo '
-		<form action="', Config::$scripturl, '?action=quickmod" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="qaction" value="markread">
-			<input type="hidden" name="redirect_url" value="action=unreadreplies', (!empty(Utils::$context['showing_all_topics']) ? ';all' : ''), Utils::$context['querystring_board_limits'], '">';
-	}
-
-	if (!empty(Utils::$context['topics'])) {
-		echo '
-			<div class="pagesection">
-				', Utils::$context['menu_separator'], '
-				<div class="pagelinks floatleft">
-					<a href="#bot" class="button">', Lang::getTxt('go_down', file: 'General'), '</a>
-					', Utils::$context['page_index'], '
-				</div>
-				', !empty(Utils::$context['recent_buttons']) ? template_button_strip(Utils::$context['recent_buttons'], 'right') : '';
-
-		// Mobile action (top)
-		if (!empty(Utils::$context['recent_buttons'])) {
-			echo '
-				<div class="mobile_buttons floatright">
-					<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-				</div>';
-		}
-
-		echo '
-			</div>';
-
-		echo '
-			<div id="unreadreplies">
-				<div id="topic_header" class="title_bar">
-					<div class="board_icon"></div>
-					<div class="info">', Utils::$context['topics_headers']['subject'], ' / ', Utils::$context['topics_headers']['starter'], '</div>
-					<div class="board_stats centertext">', Utils::$context['topics_headers']['replies'], ' / ', Utils::$context['topics_headers']['views'], '</div>
-					<div class="lastpost">', Utils::$context['topics_headers']['last_post'],'</div>';
-
-		// Show a "select all" box for quick moderation?
-		if (Utils::$context['showCheckboxes']) {
-			echo '
-					<div class="moderation">
-						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
-					</div>';
-		}
-
-		echo '
-				</div><!-- #topic_header -->
-				<div id="topic_container">';
-
-		foreach (Utils::$context['topics'] as $topic) {
-			echo '
-					<div class="', $topic['css_class'], '">
-						<div class="board_icon">
-							<img src="', $topic['first_post']['icon_url'], '" alt="">
-							', $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '', '
-						</div>
-						<div class="info">';
-
-			// Now we handle the icons
-			echo '
-							<div class="icons floatright">';
-
-			if ($topic['is_locked']) {
-				echo '
-								<span class="main_icons lock"></span>';
-			}
-
-			if ($topic['is_sticky']) {
-				echo '
-								<span class="main_icons sticky"></span>';
-			}
-
-			if ($topic['is_poll']) {
-				echo '
-								<span class="main_icons poll"></span>';
-			}
-
-			echo '
-							</div>';
-
-			echo '
-							<div class="recent_title">
-								<a href="', $topic['new_href'], '" id="newicon', $topic['first_post']['id'], '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a>
-								', $topic['is_sticky'] ? '<strong>' : '', '<span title="', $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span>', $topic['is_sticky'] ? '</strong>' : '', '
-							</div>
-							<p class="floatleft">
-								', $topic['first_post']['started_by'], '
-							</p>
-							', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '', '
-						</div><!-- .info -->
-						<div class="board_stats centertext">
-							<p>
-								', Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General'), '
-								<br>
-								', Lang::getTxt('number_of_views', [$topic['views']], file: 'General'), '
-							</p>
-						</div>
-						<div class="lastpost">
-							', Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General'), '
-						</div>';
-
-			if (Utils::$context['showCheckboxes']) {
-				echo '
-						<div class="moderation">
-							<input type="checkbox" name="topics[]" value="', $topic['id'], '">
-						</div>';
-			}
-
-			echo '
-					</div><!-- $topic[css_class] -->';
-		}
-
-		echo '
-				</div><!-- #topic_container -->
-			</div><!-- #unreadreplies -->
-			<div class="pagesection">
-				', !empty(Utils::$context['recent_buttons']) ? template_button_strip(Utils::$context['recent_buttons'], 'right') : '', '
-				', Utils::$context['menu_separator'], '
-				<div class="pagelinks floatleft">
-					<a href="#recent" class="button" id="bot">', Lang::getTxt('go_up', file: 'General'), '</a>
-					', Utils::$context['page_index'], '
-				</div>';
-
-		// Mobile action (bottom)
-		if (!empty(Utils::$context['recent_buttons'])) {
-			echo '
-				<div class="mobile_buttons floatright">
-					<a class="button mobile_act">', Lang::getTxt('mobile_action', file: 'General'), '</a>
-				</div>';
-		}
-
-		echo '
-			</div>';
-	} else {
-	echo '
-			<div class="infobox">
-				<p class="centertext">
-					', Lang::getTxt(Utils::$context['showing_all_topics'] ? 'topic_alert_none' : 'updated_topics_visit_none', file: 'General'), '
-				</p>
-			</div>';
-	}
-
-	if (Utils::$context['showCheckboxes']) {
-		echo '
-		</form>';
-	}
-
-	echo '
-	</div><!-- #recent -->';
-
-	if (empty(Utils::$context['no_topic_listing'])) {
-		template_topic_legend();
-	}
-}
diff --git a/Themes/default/Register.template.php b/Themes/default/Register.template.php
deleted file mode 100644
index e21fa7dc942..00000000000
--- a/Themes/default/Register.template.php
+++ /dev/null
@@ -1,831 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\BrowserDetector;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * Before showing users a registration form, show them the registration agreement.
- */
-function template_registration_agreement()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=signup" method="post" accept-charset="UTF-8" id="registration">';
-
-	if (!empty(Utils::$context['agreement'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('registration_agreement', file: 'General'), '</h3>
-			</div>
-			<div class="roundframe">
-				<div>', Utils::adjustHeadingLevels(Utils::$context['agreement'], 3), '</div>
-			</div>';
-	}
-
-	if (!empty(Utils::$context['privacy_policy'])) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('privacy_policy', file: 'General'), '</h3>
-			</div>
-			<div class="roundframe">
-				<div>', Utils::adjustHeadingLevels(Utils::$context['privacy_policy'], 3), '</div>
-			</div>';
-	}
-
-		echo '
-			<div id="confirm_buttons">';
-
-	// Age restriction in effect?
-	if (Utils::$context['show_coppa']) {
-		echo '
-				<input type="submit" name="accept_agreement" value="', Utils::$context['coppa_agree_above'], '" class="button"><br>
-				<br>
-				<input type="submit" name="accept_agreement_coppa" value="', Utils::$context['coppa_agree_below'], '" class="button">';
-	} else {
-	echo '
-				<input type="submit" name="accept_agreement" value="', Utils::$context['agree'], '" class="button" />';
-	}
-
-	echo '
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['register_token_var'], '" value="', Utils::$context['register_token'], '">
-				<input type="hidden" name="step" value="1">
-			</div>
-		</form>';
-}
-
-/**
- * Before registering - get their information.
- */
-function template_registration_form()
-{
-	echo '
-		<script>
-			function verifyAgree()
-			{
-				if (currentAuthMethod == \'passwd\' && document.forms.registration.passwrd1.value != document.forms.registration.passwrd2.value)
-				{
-					alert("', Lang::getTxt('register_passwords_differ_js', file: 'Login'), '");
-					return false;
-				}
-
-				return true;
-			}
-
-			var currentAuthMethod = \'passwd\';
-		</script>';
-
-	// Any errors?
-	if (!empty(Utils::$context['registration_errors'])) {
-		echo '
-		<div class="errorbox">
-			<span>', Lang::getTxt('registration_errors_occurred', file: 'Login'), '</span>
-			<ul>';
-
-		// Cycle through each error and display an error message.
-		foreach (Utils::$context['registration_errors'] as $error) {
-			echo '
-				<li>', $error, '</li>';
-		}
-
-		echo '
-			</ul>
-		</div>';
-	}
-
-	echo '
-		<form action="', !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl, '?action=signup2" method="post" accept-charset="UTF-8" name="registration" id="registration" onsubmit="return verifyAgree();">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('registration_form', file: 'Login'), '</h3>
-			</div>
-			<div class="title_bar">
-				<h3 class="titlebg">', Lang::getTxt('required_info', file: 'Login'), '</h3>
-			</div>
-			<div class="roundframe noup">
-				<fieldset>
-					<dl class="register_form">
-						<dt>
-							<strong><label for="reg_username">', Lang::getTxt('username', file: 'General'), '</label></strong>
-						</dt>
-						<dd>
-							<input type="text" name="user" id="reg_username" data-autov="username" size="50" maxlength="25" value="', Utils::$context['username'] ?? '', '">
-						</dd>
-						<dt><strong><label for="reg_email">', Lang::getTxt('user_email_address', file: 'General'), '</label></strong></dt>
-						<dd>
-							<input type="email" name="email" id="reg_email" data-autov="reserve1" size="50" value="', Utils::$context['email'] ?? '', '">
-						</dd>
-					</dl>
-					<dl class="register_form" id="password1_group">
-						<dt><strong><label for="reg_pwmain">', Lang::getTxt('choose_pass', file: 'General'), '</label></strong></dt>
-						<dd>
-							<input type="password" name="passwrd1" id="reg_pwmain" data-autov="pwmain" size="50">
-						</dd>
-					</dl>
-					<dl class="register_form" id="password2_group">
-						<dt>
-							<strong><label for="reg_pwverify">', Lang::getTxt('verify_pass', file: 'General'), '</label></strong>
-						</dt>
-						<dd>
-							<input type="password" name="passwrd2" id="reg_pwverify" data-autov="pwverify" size="50">
-						</dd>
-					</dl>
-					<dl class="register_form" id="notify_announcements">
-						<dt>
-							<strong><label for="notify_announcements">', Lang::getTxt('notify_announcements', file: 'General'), '</label></strong>
-						</dt>
-						<dd>
-							<input type="checkbox" name="notify_announcements" id="notify_announcements"', Utils::$context['notify_announcements'] ? ' checked="checked"' : '', '>
-						</dd>
-					</dl>';
-
-	// If there is any field marked as required, show it here!
-	if (!empty(Utils::$context['custom_fields_required']) && !empty(Utils::$context['custom_fields'])) {
-		echo '
-					<dl class="register_form">';
-
-		foreach (Utils::$context['custom_fields'] as $field) {
-			if ($field['show_reg'] > 1) {
-				echo '
-						<dt>
-							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
-							<span class="smalltext">', $field['desc'], '</span>
-						</dt>
-						<dd>', $field['input_html'], '</dd>';
-			}
-		}
-
-		echo '
-					</dl>';
-	}
-
-	echo '
-				</fieldset>
-			</div><!-- .roundframe -->';
-
-	// If we have either of these, show the extra group.
-	if (!empty(Utils::$context['profile_fields']) || !empty(Utils::$context['custom_fields'])) {
-		echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', Lang::getTxt('additional_information', file: 'Login'), '</h3>
-			</div>
-			<div class="roundframe noup">
-				<fieldset>
-					<dl class="register_form" id="custom_group">';
-	}
-
-	if (!empty(Utils::$context['profile_fields'])) {
-		// Any fields we particularly want?
-		foreach (Utils::$context['profile_fields'] as $key => $field) {
-			if ($field['type'] == 'callback') {
-				if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func'])) {
-					$callback_func = 'template_profile_' . $field['callback_func'];
-					$callback_func();
-				}
-			} else {
-				echo '
-						<dt>
-							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['label'], ':</strong>';
-
-				// Does it have any subtext to show?
-				if (!empty($field['subtext'])) {
-					echo '
-							<span class="smalltext">', $field['subtext'], '</span>';
-				}
-
-				echo '
-						</dt>
-						<dd>';
-
-				// Want to put something infront of the box?
-				if (!empty($field['preinput'])) {
-					echo '
-							', $field['preinput'];
-				}
-
-				// What type of data are we showing?
-				if ($field['type'] == 'label') {
-					echo '
-							', $field['value'];
-				}
-
-				// Maybe it's a text box - very likely!
-				elseif (in_array($field['type'], ['int', 'float', 'text', 'password', 'url'])) {
-					echo '
-							<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], '>';
-				}
-
-				// You "checking" me out? ;)
-				elseif ($field['type'] == 'check') {
-					echo '
-							<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>';
-				}
-
-				// Always fun - select boxes!
-				elseif ($field['type'] == 'select') {
-					echo '
-							<select name="', $key, '" id="', $key, '">';
-
-					if (isset($field['options'])) {
-						// Is this some code to generate the options?
-						if (!is_array($field['options'])) {
-							$field['options'] = eval($field['options']);
-						}
-
-						// Assuming we now have some!
-						if (is_array($field['options'])) {
-							foreach ($field['options'] as $value => $name) {
-								echo '
-								<option', (!empty($field['disabled_options']) && is_array($field['disabled_options']) && in_array($value, $field['disabled_options'], true) ? ' disabled' : ''), ' value="' . $value . '"', $value === $field['value'] ? ' selected' : '', '>', $name, '</option>';
-							}
-						}
-					}
-
-					echo '
-							</select>';
-				}
-
-				// Something to end with?
-				if (!empty($field['postinput'])) {
-					echo '
-							', $field['postinput'];
-				}
-
-				echo '
-						</dd>';
-			}
-		}
-	}
-
-	// Are there any custom fields?
-	if (!empty(Utils::$context['custom_fields'])) {
-		foreach (Utils::$context['custom_fields'] as $field) {
-			if ($field['show_reg'] < 2) {
-				echo '
-						<dt>
-							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
-							<span class="smalltext">', $field['desc'], '</span>
-						</dt>
-						<dd>', $field['input_html'], '</dd>';
-			}
-		}
-	}
-
-	// If we have either of these, close the list like a proper gent.
-	if (!empty(Utils::$context['profile_fields']) || !empty(Utils::$context['custom_fields'])) {
-		echo '
-					</dl>
-				</fieldset>
-			</div><!-- .roundframe -->';
-	}
-
-	if (Utils::$context['visual_verification']) {
-		echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', Lang::getTxt('verification', file: 'General'), '</h3>
-			</div>
-			<div class="roundframe noup">
-				<fieldset class="centertext">
-					', template_control_verification(Utils::$context['visual_verification_id'], 'all'), '
-				</fieldset>
-			</div>';
-	}
-
-	echo '
-			<div id="confirm_buttons" class="flow_auto">';
-
-	// Age restriction in effect?
-	if (empty(Utils::$context['agree']) && Utils::$context['show_coppa']) {
-		echo '
-				<input type="submit" name="accept_agreement" value="', Utils::$context['coppa_agree_above'], '" class="button"><br>
-				<br>
-				<input type="submit" name="accept_agreement_coppa" value="', Utils::$context['coppa_agree_below'], '" class="button">';
-	} else {
-	echo '
-				<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" class="button" onclick="this.disabled = true;form.submit();">';
-	}
-
-	echo '
-			</div>
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			<input type="hidden" name="', Utils::$context['register_token_var'], '" value="', Utils::$context['register_token'], '">
-			<input type="hidden" name="step" value="2">
-		</form>
-		<script>
-			var regTextStrings = {
-				"username_valid": "', Lang::getTxt('registration_username_available', file: 'Login'), '",
-				"username_invalid": "', Lang::getTxt('registration_username_unavailable', file: 'Login'), '",
-				"username_check": "', Lang::getTxt('registration_username_check', file: 'Login'), '",
-				"password_short": "', Lang::getTxt('registration_password_short', file: 'Login'), '",
-				"password_reserved": "', Lang::getTxt('registration_password_reserved', file: 'Login'), '",
-				"password_numbercase": "', Lang::getTxt('registration_password_numbercase', file: 'Login'), '",
-				"password_no_match": "', Lang::getTxt('registration_password_no_match', file: 'Login'), '",
-				"password_valid": "', Lang::getTxt('registration_password_valid', file: 'Login'), '"
-			};
-			var verificationHandle = new smfRegister("registration", ', empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'], ', regTextStrings);
-		</script>';
-}
-
-/**
- * After registration... all done ;).
- */
-function template_after()
-{
-	// Not much to see here, just a quick... "you're now registered!" or what have you.
-	echo '
-		<div id="registration_success">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['title'], '</h3>
-			</div>
-			<div class="windowbg">
-				<p>', Utils::$context['description'], '</p>
-			</div>
-		</div>';
-}
-
-/**
- * Template for giving instructions about COPPA activation.
- */
-function template_coppa()
-{
-	// Formulate a nice complicated message!
-	echo '
-			<div class="title_bar">
-				<h3 class="titlebg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div id="coppa" class="roundframe noup">
-				<p>', Utils::$context['coppa']['body'], '</p>
-				<p>
-					<span><a href="', Config::$scripturl, '?action=coppa;form;member=', Utils::$context['coppa']['id'], '" target="_blank" rel="noopener">', Lang::getTxt('coppa_form_link_popup', file: 'Login'), '</a> | <a href="', Config::$scripturl, '?action=coppa;form;dl;member=', Utils::$context['coppa']['id'], '">', Lang::getTxt('coppa_form_link_download', file: 'Login'), '</a></span>
-				</p>
-				<p>', Lang::getTxt(Utils::$context['coppa']['many_options'] ? 'coppa_send_to_two_options' : 'coppa_send_to_one_option', file: 'Login'), '</p>';
-
-	// Can they send by post?
-	if (!empty(Utils::$context['coppa']['post'])) {
-		echo '
-				<h4>1) ', Lang::getTxt('coppa_send_by_post', file: 'Login'), '</h4>
-				<div class="coppa_contact">
-					', Utils::$context['coppa']['post'], '
-				</div>';
-	}
-
-	// Can they send by fax??
-	if (!empty(Utils::$context['coppa']['fax'])) {
-		echo '
-				<h4>', !empty(Utils::$context['coppa']['post']) ? '2' : '1', ') ', Lang::getTxt('coppa_send_by_fax', file: 'Login'), '</h4>
-				<div class="coppa_contact">
-					', Utils::$context['coppa']['fax'], '
-				</div>';
-	}
-
-	// Offer an alternative Phone Number?
-	if (Utils::$context['coppa']['phone']) {
-		echo '
-				<p>', Utils::$context['coppa']['phone'], '</p>';
-	}
-
-	echo '
-			</div><!-- #coppa -->';
-}
-
-/**
- * An easily printable form for giving permission to access the forum for a minor.
- */
-function template_coppa_form()
-{
-	// Show the form (As best we can)
-	echo '
-		<table style="width: 100%; padding: 3px; border: 0" class="tborder">
-			<tr>
-				<td>', Utils::$context['forum_contacts'], '</td>
-			</tr>
-			<tr>
-				<td class="righttext">
-					<em>', Lang::getTxt('coppa_form_address', file: 'Login'), '</em>: ', Utils::$context['ul'], '<br>
-					', Utils::$context['ul'], '<br>
-					', Utils::$context['ul'], '<br>
-					', Utils::$context['ul'], '
-				</td>
-			</tr>
-			<tr>
-				<td class="righttext">
-					<em>', Lang::getTxt('coppa_form_date', file: 'Login'), '</em>: ', Utils::$context['ul'], '
-					<br><br>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					', Utils::$context['coppa_body'], '
-				</td>
-			</tr>
-		</table>
-		<br>';
-}
-
-/**
- * Show a window containing the spoken verification code.
- */
-function template_verification_sound()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Lang::getTxt('visual_verification_sound', file: 'General'), '</title>
-		<meta name="robots" content="noindex">
-		', Theme::template_css(), '
-		<style>';
-
-	// Just show the help text and a "close window" link.
-	echo '
-		</style>
-	</head>
-	<body style="margin: 1ex;">
-		<div class="windowbg description" style="text-align: center;">';
-
-	if (BrowserDetector::isBrowser('is_ie') || BrowserDetector::isBrowser('is_ie11')) {
-		echo '
-			<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav">
-				<param name="AutoStart" value="1">
-				<param name="FileName" value="', Utils::$context['verification_sound_href'], '">
-			</object>';
-	} else {
-	echo '
-			<audio src="', Utils::$context['verification_sound_href'], '" controls>
-				<object type="audio/x-wav" data="', Utils::$context['verification_sound_href'], '">
-					<a href="', Utils::$context['verification_sound_href'], '" rel="nofollow">', Utils::$context['verification_sound_href'], '</a>
-				</object>
-			</audio>';
-	}
-
-	echo '
-			<br>
-			<a href="', Utils::$context['verification_sound_href'], ';sound" rel="nofollow">', Lang::getTxt('visual_verification_sound_again', file: 'Login'), '</a><br>
-			<a href="', Utils::$context['verification_sound_href'], '" rel="nofollow">', Lang::getTxt('visual_verification_sound_direct', file: 'Login'), '</a><br><br>
-			<a href="javascript:self.close();">', Lang::getTxt('visual_verification_sound_close', file: 'Login'), '</a><br>
-		</div><!-- .description -->
-	</body>
-</html>';
-}
-
-/**
- * The template for the form allowing an admin to register a user from the admin center.
- */
-function template_admin_register()
-{
-	echo '
-		<div id="admin_form_wrapper">
-			<form id="postForm" action="', Config::$scripturl, '?action=admin;area=regcenter" method="post" accept-charset="UTF-8" name="postForm">
-				<div class="cat_bar">
-					<h3 class="catbg">', Lang::getTxt('admin_browse_register_new', file: 'Admin'), '</h3>
-				</div>
-				<div id="register_screen" class="windowbg">';
-
-	if (!empty(Utils::$context['registration_done'])) {
-		echo '
-					<div class="infobox">
-						', Utils::$context['registration_done'], '
-					</div>';
-	}
-
-	echo '
-					<dl class="register_form" id="admin_register_form">
-						<dt>
-							<strong><label for="user_input">', Lang::getTxt('admin_register_username', file: 'Login'), '</label></strong>
-							<span class="smalltext">', Lang::getTxt('admin_register_username_desc', file: 'Login'), '</span>
-						</dt>
-						<dd>
-							<input type="text" name="user" id="user_input" size="50" maxlength="25">
-						</dd>
-						<dt>
-							<strong><label for="email_input">', Lang::getTxt('admin_register_email', file: 'Login'), '</label></strong>
-							<span class="smalltext">', Lang::getTxt('admin_register_email_desc', file: 'Login'), '</span>
-						</dt>
-						<dd>
-							<input type="email" name="email" id="email_input" size="50">
-						</dd>
-						<dt>
-							<strong><label for="password_input">', Lang::getTxt('admin_register_password', file: 'Login'), '</label></strong>
-							<span class="smalltext">', Lang::getTxt('admin_register_password_desc', file: 'Login'), '</span>
-						</dt>
-						<dd>
-							<input type="password" name="password" id="password_input" size="50" onchange="onCheckChange();">
-						</dd>';
-
-	if (!empty(Utils::$context['member_groups'])) {
-		echo '
-						<dt>
-							<strong><label for="group_select">', Lang::getTxt('admin_register_group', file: 'Login'), '</label></strong>
-							<span class="smalltext">', Lang::getTxt('admin_register_group_desc', file: 'Login'), '</span>
-						</dt>
-						<dd>
-							<select name="group" id="group_select">';
-
-		foreach (Utils::$context['member_groups'] as $id => $name) {
-			echo '
-								<option value="', $id, '">', $name, '</option>';
-		}
-
-		echo '
-							</select>
-						</dd>';
-	}
-
-	// If there is any field marked as required, show it here!
-	if (!empty(Utils::$context['custom_fields_required']) && !empty(Utils::$context['custom_fields'])) {
-		foreach (Utils::$context['custom_fields'] as $field) {
-			if ($field['show_reg'] > 1) {
-				echo '
-						<dt>
-							<strong', !empty($field['is_error']) ? ' class="red"' : '', '>', $field['name'], ':</strong>
-							<span class="smalltext">', $field['desc'], '</span>
-						</dt>
-						<dd>
-							', $field['input_html'], '
-						</dd>';
-			}
-		}
-	}
-
-	echo '
-						<dt>
-							<strong><label for="emailPassword_check">', Lang::getTxt('admin_register_email_detail', file: 'Login'), '</label></strong>
-							<span class="smalltext">', Lang::getTxt('admin_register_email_detail_desc', file: 'Login'), '</span>
-						</dt>
-						<dd>
-							<input type="checkbox" name="emailPassword" id="emailPassword_check" checked disabled>
-						</dd>
-						<dt>
-							<strong><label for="emailActivate_check">', Lang::getTxt('admin_register_email_activate', file: 'Login'), '</label></strong>
-						</dt>
-						<dd>
-							<input type="checkbox" name="emailActivate" id="emailActivate_check"', !empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? ' checked' : '', ' onclick="onCheckChange();">
-						</dd>
-					</dl>
-					<div class="flow_auto">
-						<input type="submit" name="regSubmit" value="', Lang::getTxt('register', file: 'General'), '" class="button">
-						<input type="hidden" name="sa" value="register">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="', Utils::$context['admin-regc_token_var'], '" value="', Utils::$context['admin-regc_token'], '">
-					</div>
-				</div><!-- #register_screen -->
-			</form>
-		</div><!-- #admin_form_wrapper -->
-	<br class="clear">';
-}
-
-/**
- * Form for editing the agreement shown for people registering to the forum.
- */
-function template_edit_agreement()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-		<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	} elseif (!empty(Utils::$context['could_not_save'])) {
-		echo '
-		<div class="errorbox">', Lang::getTxt('admin_agreement_not_saved', file: 'Admin'), '</div>';
-	}
-
-	// Warning for if the file isn't writable.
-	if (!empty(Utils::$context['warning'])) {
-		echo '
-		<div class="errorbox">', Utils::$context['warning'], '</div>';
-	}
-
-	// Just a big box to edit the text file ;)
-	echo '
-		<div id="admin_form_wrapper">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('registration_agreement', file: 'General'), '</h3>
-			</div>';
-
-	// Is there more than one language to choose from?
-	if (count(Utils::$context['editable_agreements']) > 1) {
-		echo '
-				<div class="information">
-					<form action="', Config::$scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="UTF-8">
-						<strong>', Lang::getTxt('admin_agreement_select_language', file: 'Admin'), '</strong>
-						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();">';
-
-		foreach (Utils::$context['editable_agreements'] as $file => $name) {
-			echo '
-							<option value="', $file, '"', Utils::$context['current_agreement'] == $file ? ' selected' : '', '>', $name, '</option>';
-		}
-
-		echo '
-						</select>
-						<div class="righttext">
-							<input type="hidden" name="sa" value="agreement">
-							<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-							<input type="hidden" name="', Utils::$context['admin-rega_token_var'], '" value="', Utils::$context['admin-rega_token'], '">
-							<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language', file: 'Admin'), '" class="button">
-						</div>
-					</form>
-				</div><!-- .information -->';
-	}
-
-	// Show the actual agreement in an oversized text box.
-	echo '
-			<div class="windowbg" id="registration_agreement">
-				<form action="', Config::$scripturl, '?action=admin;area=regcenter" method="post" accept-charset="UTF-8">
-					<textarea cols="70" rows="20" name="agreement" id="agreement">', Utils::$context['agreement'], '</textarea>
-					<div class="information">';
-
-	if (empty(Utils::$context['agreement_history'])) {
-		echo '
-						<span>', Utils::$context['agreement_info'], '</span>';
-	} else {
-		echo '
-						<a href="" onclick="return false;" class="modified">', Utils::$context['agreement_info'], '</a>
-						<div id="edit_history_list_' . Utils::$context['current_agreement'] . '" class="edit_history_list">
-							<div class="edit_history_count">
-								' . Lang::getTxt('edit_history_count', [count(Utils::$context['agreement_history'])], file: 'General') . '
-							</div>
-							<ol>';
-
-		foreach (Utils::$context['agreement_history'] as $hash => $linktext) {
-			echo '
-								<li>
-									<a href="' . Config::$scripturl . '?action=agreement;sa=history;doc=0;lang=' . Utils::$context['current_agreement'] . ';hash=' . $hash . '" onclick="return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript($linktext) . ', \'history\');">' . $linktext . '</a>
-								</li>';
-		}
-
-		echo '
-							</ol>
-						</div>';
-	}
-
-	echo '
-					</div>
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button" onclick="return resetAgreementConfirm()" />
-					<input type="hidden" name="agree_lang" value="', Utils::$context['current_agreement'], '">
-					<input type="hidden" name="sa" value="agreement">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<script>
-						function resetAgreementConfirm()
-						{
-							return true;
-						}
-					</script>
-					<input type="hidden" name="', Utils::$context['admin-rega_token_var'], '" value="', Utils::$context['admin-rega_token'], '">
-				</form>
-			</div><!-- #registration_agreement -->
-		</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * Template for editing reserved words.
- */
-function template_edit_reserved_words()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-	<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	echo '
-	<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=regcenter" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('admin_reserved_set', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">
-			<h4>', Lang::getTxt('admin_reserved_line', file: 'Admin'), '</h4>
-			<textarea cols="30" rows="6" name="reserved" id="reserved">', implode("\n", Utils::$context['reserved_words']), '</textarea>
-			<dl class="settings">
-				<dt>
-					<label for="matchword">', Lang::getTxt('admin_match_whole', file: 'Admin'), '</label>
-				</dt>
-				<dd>
-					<input type="checkbox" name="matchword" id="matchword"', Utils::$context['reserved_word_options']['match_word'] ? ' checked' : '', '>
-				</dd>
-				<dt>
-					<label for="matchcase">', Lang::getTxt('admin_match_case', file: 'Admin'), '</label>
-				</dt>
-				<dd>
-					<input type="checkbox" name="matchcase" id="matchcase"', Utils::$context['reserved_word_options']['match_case'] ? ' checked' : '', '>
-				</dd>
-				<dt>
-					<label for="matchuser">', Lang::getTxt('admin_check_user', file: 'Admin'), '</label>
-				</dt>
-				<dd>
-					<input type="checkbox" name="matchuser" id="matchuser"', Utils::$context['reserved_word_options']['match_user'] ? ' checked' : '', '>
-				</dd>
-				<dt>
-					<label for="matchname">', Lang::getTxt('admin_check_display', file: 'Admin'), '</label>
-				</dt>
-				<dd>
-					<input type="checkbox" name="matchname" id="matchname"', Utils::$context['reserved_word_options']['match_name'] ? ' checked' : '', '>
-				</dd>
-			</dl>
-			<div class="flow_auto">
-				<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" name="save_reserved_names" class="button">
-				<input type="hidden" name="sa" value="reservednames">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-regr_token_var'], '" value="', Utils::$context['admin-regr_token'], '">
-			</div>
-		</div><!-- .windowbg -->
-	</form>';
-}
-
-// Form for editing the privacy policy shown to people registering to the forum.
-function template_edit_privacy_policy()
-{
-	if (!empty(Utils::$context['saved_successful'])) {
-		echo '
-		<div class="infobox">', Lang::getTxt('settings_saved', file: 'Admin'), '</div>';
-	}
-
-	// Just a big box to edit the text file ;).
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('privacy_policy', file: 'General'), '</h3>
-		</div>';
-
-	// Is there more than one language to choose from?
-	if (count(Utils::$context['editable_policies']) > 1) {
-		echo '
-			<div class="information">
-				<form action="', Config::$scripturl, '?action=admin;area=regcenter" id="change_policy" method="post" accept-charset="UTF-8">
-					<strong>', Lang::getTxt('admin_agreement_select_language', file: 'Admin'), '</strong>
-					<select name="policy_lang" onchange="document.getElementById(\'change_policy\').submit();">';
-
-		foreach (Utils::$context['editable_policies'] as $lang => $name) {
-			echo '
-						<option value="', $lang, '" ', Utils::$context['current_policy_lang'] == $lang ? 'selected="selected"' : '', '>', $name, '</option>';
-		}
-
-		echo '
-					</select>
-					<div class="righttext">
-						<input type="hidden" name="sa" value="policy">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="submit" name="change" value="', Lang::getTxt('admin_agreement_select_language_change', file: 'Admin'), '" class="button">
-					</div>
-				</form>
-			</div>';
-	}
-
-	echo '
-		<div class="windowbg" id="privacy_policy">
-			<form action="', Config::$scripturl, '?action=admin;area=regcenter" method="post" accept-charset="UTF-8">';
-
-	// Show the actual policy in an oversized text box.
-	echo '
-			<textarea cols="70" rows="20" name="policy" id="agreement">', Utils::$context['privacy_policy'], '</textarea>
-				<div class="information">';
-
-	if (empty(Utils::$context['privacy_policy_history'])) {
-		echo '
-					<span>', Utils::$context['privacy_policy_info'], '</span>';
-	} else {
-		echo '
-					<a href="" onclick="return false;" class="modified">', Utils::$context['privacy_policy_info'], '</a>
-					<div id="edit_history_list_' . Utils::$context['current_policy_lang'] . '" class="edit_history_list">
-						<div class="edit_history_count">
-							' . Lang::getTxt('edit_history_count', [count(Utils::$context['privacy_policy_history'])], file: 'General') . '
-						</div>
-						<ol>';
-
-		foreach (Utils::$context['privacy_policy_history'] as $hash => $linktext) {
-			echo '
-							<li>
-								<a href="' . Config::$scripturl . '?action=agreement;sa=history;doc=1;lang=' . Utils::$context['current_policy_lang'] . ';hash=' . $hash . '" onclick="return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript($linktext) . ', \'history\');">' . $linktext . '</a>
-							</li>';
-		}
-
-		echo '
-						</ol>
-					</div>';
-	}
-
-	echo '
-				</div>
-				<div class="righttext">
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button" onclick="return resetPolicyConfirm()" />
-					<input type="hidden" name="policy_lang" value="', Utils::$context['current_policy_lang'], '" />
-					<input type="hidden" name="sa" value="policy" />
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '" />
-					<input type="hidden" name="', Utils::$context['admin-regp_token_var'], '" value="', Utils::$context['admin-regp_token'], '" />
-					<script>
-						function resetPolicyConfirm()
-						{
-							return true;
-						}
-					</script>
-				</div>
-			</form>
-		</div>';
-}
diff --git a/Themes/default/Reminder.template.php b/Themes/default/Reminder.template.php
deleted file mode 100644
index 26a016c3c2b..00000000000
--- a/Themes/default/Reminder.template.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * The main "Here's how you can reset your password" page
- */
-function template_main()
-{
-	echo '
-	<br>
-	<form action="', Config::$scripturl, '?action=reminder;sa=picktype" method="post" accept-charset="UTF-8">
-		<div class="tborder login">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('authentication_reminder', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<p class="smalltext centertext">', Lang::getTxt('password_reminder_desc', file: 'Profile'), '</p>
-				<dl>
-					<dt><label for="user">', Lang::getTxt('user_email', file: 'Profile'), '</label></dt>
-					<dd><input type="text" name="user" id="user" size="30"></dd>
-				</dl>
-				<input type="submit" value="', Lang::getTxt('reminder_continue', file: 'Profile'), '" class="button">
-				<br class="clear">
-			</div>
-		</div>
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		<input type="hidden" name="', Utils::$context['remind_token_var'], '" value="', Utils::$context['remind_token'], '">
-	</form>';
-}
-
-/**
- * The page to pick an option - secret question/answer (if set) or email
- */
-function template_reminder_pick()
-{
-	echo '
-	<br>
-	<form action="', Config::$scripturl, '?action=reminder;sa=picktype" method="post" accept-charset="UTF-8">
-		<div class="tborder login">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('authentication_reminder', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<p><strong>', Lang::getTxt('authentication_options', file: 'Profile'), '</strong></p>
-				<p>
-					<input type="radio" name="reminder_type" id="reminder_type_email" value="email" checked></dt>
-					<label for="reminder_type_email">', Lang::getTxt('authentication_password_email', file: 'Profile'), '</label></dd>
-				</p>
-				<p>
-					<input type="radio" name="reminder_type" id="reminder_type_secret" value="secret">
-					<label for="reminder_type_secret">', Lang::getTxt('authentication_password_secret', file: 'Profile'), '</label>
-				</p>
-				<div class="flow_auto">
-					<input type="submit" value="', Lang::getTxt('reminder_continue', file: 'Profile'), '" class="button">
-					<input type="hidden" name="uid" value="', Utils::$context['current_member']['id'], '">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['remind_token_var'], '" value="', Utils::$context['remind_token'], '">
-				</div>
-			</div><!-- .roundframe -->
-		</div><!-- .login -->
-	</form>';
-}
-
-/**
- * Just a simple "We sent you an email. Click the link in it to continue." message
- */
-function template_sent()
-{
-	echo '
-		<br>
-		<div class="tborder login" id="reminder_sent">
-			<div class="cat_bar">
-				<h3 class="catbg">' . Utils::$context['page_title'] . '</h3>
-			</div>
-			<p class="information">' . Utils::$context['description'] . '</p>
-		</div>';
-}
-
-/**
- * Template for setting the new password
- */
-function template_set_password()
-{
-	echo '
-	<br>
-	<form action="', Config::$scripturl, '?action=reminder;sa=setpassword2" name="reminder_form" id="reminder_form" method="post" accept-charset="UTF-8">
-		<div class="tborder login">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="roundframe">
-				<dl>
-					<dt>', Lang::getTxt('choose_pass', file: 'General'), '</dt>
-					<dd>
-						<input type="password" name="passwrd1" data-autov="pwmain" size="22">
-					</dd>
-					<dt>', Lang::getTxt('verify_pass', file: 'General'), '</dt>
-					<dd>
-						<input type="password" name="passwrd2" data-autov="pwverify" size="22">
-					</dd>
-				</dl>
-				<p class="align_center">
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-				</p>
-			</div><!-- .roundframe -->
-		</div><!-- .login -->
-		<input type="hidden" name="code" value="', Utils::$context['code'], '">
-		<input type="hidden" name="u" value="', Utils::$context['memID'], '">
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		<input type="hidden" name="', Utils::$context['remind-sp_token_var'], '" value="', Utils::$context['remind-sp_token'], '">
-	</form>
-	<script>
-		var regTextStrings = {
-			"password_short": "', Lang::getTxt('registration_password_short', file: 'Login'), '",
-			"password_reserved": "', Lang::getTxt('registration_password_reserved', file: 'Login'), '",
-			"password_numbercase": "', Lang::getTxt('registration_password_numbercase', file: 'Login'), '",
-			"password_no_match": "', Lang::getTxt('registration_password_no_match', file: 'Login'), '",
-			"password_valid": "', Lang::getTxt('registration_password_valid', file: 'Login'), '"
-		};
-		var verificationHandle = new smfRegister("reminder_form", ', empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'], ', regTextStrings);
-	</script>';
-}
-
-/**
- * The page that asks a user to answer their secret question
- */
-function template_ask()
-{
-	echo '
-	<br>
-	<form action="', Config::$scripturl, '?action=reminder;sa=secret2" method="post" accept-charset="UTF-8" name="creator" id="creator">
-		<div class="tborder login">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('authentication_reminder', file: 'Profile'), '</h3>
-			</div>
-			<div class="roundframe">
-				<p class="smalltext">', Lang::getTxt('enter_new_password', file: 'Profile'), '</p>
-				<dl>
-					<dt>', Lang::getTxt('secret_question', file: 'Profile'), '</dt>
-					<dd>', Utils::$context['secret_question'], '</dd>
-					<dt>', Lang::getTxt('secret_answer', file: 'Profile'), '</dt>
-					<dd><input type="text" name="secret_answer" size="22"></dd>
-					<dt>', Lang::getTxt('choose_pass', file: 'General'), '</dt>
-					<dd>
-						<input type="password" name="passwrd1" data-autov="pwmain" size="22">
-					</dd>
-					<dt>', Lang::getTxt('verify_pass', file: 'General'), '</dt>
-					<dd>
-						<input type="password" name="passwrd2" data-autov="pwverify" size="22">
-					</dd>
-				</dl>
-				<div class="auto_flow">
-					<input type="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-					<input type="hidden" name="uid" value="', Utils::$context['remind_user'], '">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-					<input type="hidden" name="', Utils::$context['remind-sai_token_var'], '" value="', Utils::$context['remind-sai_token'], '">
-				</div>
-			</div><!-- .roundframe -->
-		</div><!-- .login -->
-	</form>
-	<script>
-		var regTextStrings = {
-			"password_short": "', Lang::getTxt('registration_password_short', file: 'Login'), '",
-			"password_reserved": "', Lang::getTxt('registration_password_reserved', file: 'Login'), '",
-			"password_numbercase": "', Lang::getTxt('registration_password_numbercase', file: 'Login'), '",
-			"password_no_match": "', Lang::getTxt('registration_password_no_match', file: 'Login'), '",
-			"password_valid": "', Lang::getTxt('registration_password_valid', file: 'Login'), '"
-		};
-		var verificationHandle = new smfRegister("creator", ', empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'], ', regTextStrings);
-	</script>';
-
-}
diff --git a/Themes/default/ReportToMod.template.php b/Themes/default/ReportToMod.template.php
deleted file mode 100644
index be81728ab74..00000000000
--- a/Themes/default/ReportToMod.template.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Lang;
-use SMF\Utils;
-
-//------------------------------------------------------------------------------
-/*	This template contains two humble sub templates - main. Its job is pretty
-	simple: it collects the information we need to actually send the topic.
-
-	The report sub template gets shown from:
-		'?action=reporttm;topic=##.##;msg=##'
-		'?action=reporttm;u=#'
-	It should submit to:
-		'?action=reporttm;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start']
-		'?action=reporttm;u=#'
-	It only needs to send the following fields:
-		comment: an additional comment to give the moderator.
-		sc: the session id, or Utils::$context['session_id'].
-*/
-
-/**
- * The main "report this to the moderator" page
- */
-function template_main()
-{
-	// Want to see your master piece?
-	echo '
-	<div id="preview_section"', isset(Utils::$context['preview_message']) ? '' : ' class="hidden"', '>
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span>', Lang::getTxt('preview', file: 'General'), '</span>
-			</h3>
-		</div>
-		<div class="windowbg">
-			<div class="post" id="preview_body">
-				', empty(Utils::$context['preview_message']) ? '<br>' : Utils::$context['preview_message'], '
-			</div>
-		</div>
-	</div>';
-
-	echo '
-	<div id="report_form">
-		<form action="', Utils::$context['submit_url'], '" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="', Utils::$context['report_type'], '" value="', Utils::$context['reported_item'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-			</div>
-			<div class="windowbg">';
-
-	if (!empty(Utils::$context['post_errors'])) {
-		echo '
-				<div id="error_box" class="errorbox">
-					<ul id="error_list">';
-
-		foreach (Utils::$context['post_errors'] as $key => $error) {
-			echo '
-						<li id="error_', $key, '" class="error">', $error, '</li>';
-		}
-
-		echo '
-					</ul>';
-	} else {
-	echo '
-				<div id="error_box" class="errorbox hidden">';
-	}
-
-	echo '
-				</div>';
-
-	echo '
-				<p class="noticebox">', Utils::$context['notice'], '</p>
-				<dl class="settings" id="report_post">
-					<dt>
-						<label for="report_comment">', Lang::getTxt('enter_comment', file: 'Post'), '</label>
-					</dt>
-					<dd>
-						<textarea type="text" id="report_comment" name="comment" maxlength="254">', Utils::$context['comment_body'], '</textarea>
-					</dd>
-				</dl>
-				<input type="submit" name="preview" value="', Lang::getTxt('preview', file: 'General'), '" class="button">
-				<input type="submit" name="save" value="', Lang::getTxt('report_submit', file: 'Post'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #report_form -->';
-}
diff --git a/Themes/default/ReportedContent.template.php b/Themes/default/ReportedContent.template.php
deleted file mode 100644
index 80697a547a3..00000000000
--- a/Themes/default/ReportedContent.template.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * Displays all reported posts.
- */
-function template_reported_posts()
-{
-	// Let them know the action was a success.
-	if (!empty(Utils::$context['report_post_action'])) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter'), '
-	</div>';
-	}
-
-	echo '
-	<form id="reported_posts" action="', Config::$scripturl, '?action=moderate;area=reportedposts;sa=show', Utils::$context['view_closed'] ? ';closed' : '', ';start=', Utils::$context['start'], '" method="post" accept-charset="UTF-8">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt(Utils::$context['view_closed'] ? 'mc_reportedp_closed' : 'mc_reportedp_active', file: 'ModerationCenter'), '
-			</h3>
-		</div>
-		<div class="pagesection">';
-
-	if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-		echo '
-			<ul class="buttonlist floatright">
-				<li class="inline_mod_check">
-					<input type="checkbox" onclick="invertAll(this, this.form, \'close[]\');">
-				</li>
-			</ul>';
-	}
-
-	echo '
-			<div class="pagelinks floatleft">' . Utils::$context['page_index'] . '</div>
-		</div>';
-
-	foreach (Utils::$context['reports'] as $report) {
-		echo '
-		<div class="windowbg">
-			<h5>
-				', !empty($report['topic']['board_name']) ? '<a href="' . Config::$scripturl . '?board=' . $report['topic']['id_board'] . '.0">' . $report['topic']['board_name'] . '</a>' : '??', ' / ', Lang::getTxt('mc_reportedp_subject_author', ['subject' => '<a href="' . $report['topic']['href'] . '">' . $report['subject'] . '</a>', 'author' => $report['author']['link']], file: 'ModerationCenter'), '
-			</h5>
-			<div class="smalltext">
-				', Lang::getTxt('mc_reportedp_last_reported', ['date' => $report['last_updated']], file: 'ModerationCenter'), '<br>';
-
-		// Prepare the comments...
-		$comments = [];
-
-		foreach ($report['comments'] as $comment) {
-			$comments[$comment['member']['id']] = $comment['member']['link'];
-		}
-
-		echo '
-				', Lang::getTxt('mc_reportedp_reported_by', ['list' => Lang::sentenceList($comments)], file: 'ModerationCenter'), '
-			</div>
-			<hr>
-			', Utils::adjustHeadingLevels($report['body'], 5), '
-			<br>';
-
-		// Reported post options
-		template_quickbuttons($report['quickbuttons'], 'reported_posts');
-
-		echo '
-		</div><!-- .windowbg -->';
-	}
-
-	// Were none found?
-	if (empty(Utils::$context['reports'])) {
-		echo '
-		<div class="windowbg">
-			<div class="centertext">', Lang::getTxt('mc_reportedp_none_found', file: 'ModerationCenter'), '</div>
-		</div>';
-	}
-
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks floatleft">' . Utils::$context['page_index'] . '</div>';
-
-	if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-		echo '
-			<div class="floatright">
-				<input type="hidden" name="' . Utils::$context['mod-report-close-all_token_var'] . '" value="' . Utils::$context['mod-report-close-all_token'] . '">
-				<input type="submit" name="close_selected" value="' . Lang::getTxt('mc_reportedp_close_selected', file: 'ModerationCenter') . '" class="button">
-			</div>';
-	}
-
-	echo '
-		</div>
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>';
-}
-
-/**
- * Handles viewing details of and managing a specific report
- */
-function template_viewmodreport()
-{
-	// Let them know the action was a success.
-	if (!empty(Utils::$context['report_post_action'])) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter'), '
-	</div>';
-	}
-
-	echo '
-	<div id="modcenter">
-		<form action="', Config::$scripturl, '?action=moderate;area=reportedposts;sa=handlecomment;rid=', Utils::$context['report']['id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('mc_viewmodreport', ['message_link' => Utils::$context['report']['message_link'], 'author_link' => Utils::$context['report']['author']['link']], file: 'ModerationCenter'), '
-				</h3>
-			</div>
-			<div class="title_bar">
-				<h3 class="titlebg">
-					<span class="floatleft">
-						', Lang::getTxt('mc_modreport_summary', [Utils::$context['report']['num_reports'], Utils::$context['report']['last_updated']], file: 'ModerationCenter'), '
-					</span>';
-
-	$report_buttons = [
-		'ignore' => [
-			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
-			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
-			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::getTxt('mc_reportedp_ignore_confirm', file: 'ModerationCenter') . '"' : '',
-			'icon' => 'ignore',
-		],
-		'close' => [
-			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
-			'icon' => 'close',
-		],
-	];
-
-	// Report buttons
-	template_button_strip($report_buttons, 'right');
-
-	echo '
-				</h3>
-			</div><!-- .title_bar -->
-			<div class="windowbg">
-				', Utils::adjustHeadingLevels(Utils::$context['report']['body'], 3), '
-			</div>
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_modreport_whoreported_title', file: 'ModerationCenter'), '</h3>
-			</div>';
-
-	foreach (Utils::$context['report']['comments'] as $comment) {
-		echo '
-			<div class="windowbg">
-				<div class="smalltext">
-					', Lang::getTxt(
-			'mc_modreport_whoreported_data',
-			[
-				'member_link' => $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''),
-				'datetime' => $comment['time'],
-			],
-			file: 'ModerationCenter',
-		), '
-				</div>
-				<div>', Utils::adjustHeadingLevels($comment['message'], null), '</div>
-			</div>';
-	}
-
-	echo '
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_modreport_mod_comments', file: 'ModerationCenter'), '</h3>
-			</div>
-			<div>';
-
-	if (empty(Utils::$context['report']['mod_comments'])) {
-		echo '
-				<div class="information">
-					<div class="centertext">', Lang::getTxt('mc_modreport_no_mod_comment', file: 'ModerationCenter'), '</div>
-				</div>';
-	}
-
-	foreach (Utils::$context['report']['mod_comments'] as $comment) {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg">
-						', $comment['member']['link'], ':  <em class="smalltext">(', $comment['time'], ')</em>', ($comment['can_edit'] ? '<span class="floatright"><a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=editcomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_edit', file: 'ModerationCenter') . '</a><a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=handlecomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';delete;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-reportC-delete_token_var'] . '=' . Utils::$context['mod-reportC-delete_token'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_delete', file: 'ModerationCenter') . '</a></span>' : ''), '
-					</h3>
-				</div>';
-
-		echo '
-				<div class="windowbg">
-					<div>', Utils::adjustHeadingLevels($comment['message'], null), '</div>
-				</div>';
-	}
-
-	echo '
-				<div class="cat_bar">
-					<h3 class="catbg">
-						<span class="floatleft">
-							', Lang::getTxt('mc_reportedp_new_comment', file: 'ModerationCenter'), '
-						</span>
-					</h3>
-				</div>
-				<textarea rows="2" cols="60" style="width: 60%;" name="mod_comment"></textarea>
-				<div class="padding">
-					<input type="submit" name="add_comment" value="', Lang::getTxt('mc_modreport_add_mod_comment', file: 'ModerationCenter'), '" class="button">
-					<input type="hidden" name="', Utils::$context['mod-reportC-add_token_var'], '" value="', Utils::$context['mod-reportC-add_token'], '">
-				</div>
-			</div>
-			<br>';
-
-	template_show_list('moderation_actions_list');
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>
-	</div><!-- #modcenter -->';
-}
-
-/**
- * Template for editing a mod comment.
- */
-function template_edit_comment()
-{
-	echo '
-	<div id="modcenter">
-		<form action="', Config::$scripturl, '?action=moderate;area=reported', Utils::$context['report_type'], ';sa=editcomment;mid=', Utils::$context['comment_id'], ';rid=', Utils::$context['report_id'], ';save" method="post" accept-charset="UTF-8">
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_modreport_edit_mod_comment', file: 'ModerationCenter'), '</h3>
-			</div>
-			<div class="windowbg">
-				<textarea rows="6" cols="60" style="width: 60%;" name="mod_comment">', Utils::$context['comment']['body'], '</textarea>
-				<div>
-					<input type="submit" name="edit_comment" value="', Lang::getTxt('mc_modreport_edit_mod_comment', file: 'ModerationCenter'), '" class="button">
-				</div>
-			</div>
-			<br>
-			<input type="hidden" name="', Utils::$context['mod-reportC-edit_token_var'], '" value="', Utils::$context['mod-reportC-edit_token'], '">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>
-	</div><!-- #modcenter -->';
-}
-
-/**
- * Lists all reported members
- */
-function template_reported_members()
-{
-	// Let them know the action was a success.
-	if (!empty(Utils::$context['report_post_action']) && Lang::txtExists('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter')) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter'), '
-	</div>';
-	}
-
-	echo '
-	<form id="reported_members" action="', Config::$scripturl, '?action=moderate;area=reportedmembers;sa=show', Utils::$context['view_closed'] ? ';closed' : '', ';start=', Utils::$context['start'], '" method="post" accept-charset="UTF-8">
-		<div class="cat_bar cat_bar_round">
-			<h3 class="catbg">
-				', Lang::getTxt(Utils::$context['view_closed'] ? 'mc_reportedp_closed' : 'mc_reportedp_active', file: 'ModerationCenter'), '
-			</h3>
-		</div>
-		<div class="pagesection">';
-
-	if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
-		echo '
-			<ul class="buttonlist floatright">
-				<li class="inline_mod_check">
-					<input type="checkbox" onclick="invertAll(this, this.form, \'close[]\');">
-				</li>
-			</ul>';
-	}
-
-		echo '
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-
-	foreach (Utils::$context['reports'] as $report) {
-		echo '
-		<div class="generic_list_wrapper windowbg">
-			<h5>
-				<strong><a href="', $report['user']['href'], '">', $report['user']['name'], '</a></strong>
-			</h5>
-			<div class="smalltext">
-				', Lang::getTxt('mc_reportedp_last_reported', ['date' => $report['last_updated']], file: 'ModerationCenter'), '<br>';
-
-		// Prepare the comments...
-		$comments = [];
-
-		foreach ($report['comments'] as $comment) {
-			$comments[$comment['member']['id']] = $comment['member']['link'];
-		}
-
-		echo '
-				', Lang::getTxt('mc_reportedp_reported_by', ['list' => Lang::sentenceList($comments)], file: 'ModerationCenter'), '
-			</div>
-			<hr>
-			', template_quickbuttons($report['quickbuttons'], 'reported_members'), '
-		</div><!-- .generic_list_wrapper -->';
-	}
-
-	// Were none found?
-	if (empty(Utils::$context['reports'])) {
-		echo '
-		<div class="windowbg">
-			<div class="centertext">', Lang::getTxt('mc_reportedp_none_found', file: 'ModerationCenter'), '</div>
-		</div>';
-	}
-
-	echo '
-		<div class="pagesection">
-			<div class="pagelinks floatleft">', Utils::$context['page_index'], '</div>
-			<div class="floatright">
-				', (!Utils::$context['view_closed'] && !empty(Utils::$context['reports'])) ? '<input type="submit" name="close_selected" value="' . Lang::getTxt('mc_reportedp_close_selected', file: 'ModerationCenter') . '" class="button">' : '', '
-			</div>
-		</div>
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-	</form>';
-}
-
-/**
- * Template for viewing and managing a specific report about a user's profile
- */
-function template_viewmemberreport()
-{
-	// Let them know the action was a success.
-	if (!empty(Utils::$context['report_post_action'])) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter'), '
-	</div>';
-	}
-
-	echo '
-	<div id="modcenter">
-		<form action="', Config::$scripturl, '?action=moderate;area=reportedmembers;sa=handlecomment;rid=', Utils::$context['report']['id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('mc_viewmemberreport', ['member' => Utils::$context['report']['user']['link']], file: 'ModerationCenter'), '
-				</h3>
-			</div>
-			<div class="title_bar">
-				<h3 class="titlebg">
-					<span class="floatleft">
-						', Lang::getTxt('mc_memberreport_summary', [Utils::$context['report']['num_reports'], Utils::$context['report']['last_updated']], file: 'ModerationCenter'), '
-					</span>';
-
-	$report_buttons = [
-		'ignore' => [
-			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
-			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
-			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::getTxt('mc_reportedp_ignore_confirm', file: 'ModerationCenter') . '"' : '',
-			'icon' => 'ignore',
-		],
-		'close' => [
-			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
-			'icon' => 'close',
-		],
-	];
-
-	// Report buttons
-	template_button_strip($report_buttons, 'right');
-
-	echo '
-				</h3>
-			</div>
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_memberreport_whoreported_title', file: 'ModerationCenter'), '</h3>
-			</div>';
-
-	foreach (Utils::$context['report']['comments'] as $comment) {
-		echo '
-			<div class="windowbg">
-				<div class="smalltext">
-					', Lang::getTxt(
-			'mc_modreport_whoreported_data',
-			[
-				'member_link' => $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''),
-				'datetime' => $comment['time'],
-			],
-			file: 'ModerationCenter',
-		), '
-				</div>
-				<div>', Utils::adjustHeadingLevels($comment['message'], null), '</div>
-			</div>';
-	}
-
-	echo '
-			<br>
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('mc_modreport_mod_comments', file: 'ModerationCenter'), '</h3>
-			</div>
-			<div>';
-
-	if (empty(Utils::$context['report']['mod_comments'])) {
-		echo '
-				<div class="information">
-					<div class="centertext">', Lang::getTxt('mc_modreport_no_mod_comment', file: 'ModerationCenter'), '</div>
-				</div>';
-	}
-
-	foreach (Utils::$context['report']['mod_comments'] as $comment) {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg">', $comment['member']['link'], ':  <em class="smalltext">(', $comment['time'], ')</em>', ($comment['can_edit'] ? '<span class="floatright"><a href="' . Config::$scripturl . '?action=moderate;area=reportedmembers;sa=editcomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_edit', file: 'ModerationCenter') . '</a> <a href="' . Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handlecomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';delete;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-reportC-delete_token_var'] . '=' . Utils::$context['mod-reportC-delete_token'] . '"  class="button you_sure" data-confirm="' . Lang::getTxt('mc_reportedp_delete_confirm', file: 'ModerationCenter') . '">' . Lang::getTxt('mc_reportedp_comment_delete', file: 'ModerationCenter') . '</a></span>' : ''), '</h3>
-				</div>';
-
-		echo '
-				<div class="windowbg">
-					<div>', Utils::adjustHeadingLevels($comment['message'], null), '</div>
-				</div>';
-	}
-
-	echo '
-				<div class="cat_bar">
-					<h3 class="catbg">
-						<span class="floatleft">
-							', Lang::getTxt('mc_reportedp_new_comment', file: 'ModerationCenter'), '
-						</span>
-					</h3>
-				</div>
-				<textarea rows="2" cols="60" style="width: 60%;" name="mod_comment"></textarea>
-				<div class="padding">
-					<input type="submit" name="add_comment" value="', Lang::getTxt('mc_modreport_add_mod_comment', file: 'ModerationCenter'), '" class="button">
-					<input type="hidden" name="', Utils::$context['mod-reportC-add_token_var'], '" value="', Utils::$context['mod-reportC-add_token'], '">
-				</div>
-			</div>
-			<br>';
-
-	template_show_list('moderation_actions_list');
-
-	echo '
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>
-	</div><!-- #modcenter -->';
-}
diff --git a/Themes/default/Reports.template.php b/Themes/default/Reports.template.php
deleted file mode 100644
index 467df0884a0..00000000000
--- a/Themes/default/Reports.template.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * Choose which type of report to run?
- */
-function template_report_type()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('generate_reports_type', file: 'Reports'), '</h3>
-		</div>
-		<form action="', Config::$scripturl, '?action=admin;area=reports" method="post" accept-charset="UTF-8" class="windowbg option_form">';
-
-	// Go through each type of report they can run.
-	foreach (Utils::$context['report_types'] as $type) {
-		echo '
-			<label>
-				<input type="radio" name="rt" value="', $type['id'], '"', $type['is_first'] ? ' checked' : '', '>
-				<strong>', $type['title'], '</strong>';
-
-		if (isset($type['description'])) {
-			echo '
-				<p>', $type['description'], '</p>';
-		}
-
-		echo '
-			</label>';
-	}
-
-	echo '
-			<input type="submit" name="continue" value="', Lang::getTxt('generate_reports_continue', file: 'Reports'), '" class="button">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		</form>';
-}
-
-/**
- * This is the standard template for showing reports.
- */
-function template_main()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('results', file: 'Reports'), '</h3>
-		</div>
-		<div id="report_buttons">';
-
-	if (!empty(Utils::$context['report_buttons'])) {
-		template_button_strip(Utils::$context['report_buttons'], 'right');
-	}
-
-	echo '
-		</div>';
-
-	if (count(Utils::$context['tables']) > 1) {
-		echo '
-		<style>';
-
-		foreach (Utils::$context['tables'] as $i => $table) {
-			echo '
-			body:has(#report_check_', $i + 1, ':not(:checked)) [data-id=report_', $i + 1, '] {
-				display: none;
-			}';
-		}
-
-	echo '
-		</style>
-		<form class="windowbg clear" id="report_filter">
-			<fieldset>';
-
-		foreach (Utils::$context['tables'] as $i => $table) {
-			if (!empty($table['title'])) {
-				echo '
-			<label>
-				<input type="checkbox" id="report_check_', $i + 1, '" checked>
-				', $table['title'], '
-			</label>';
-			}
-		}
-
-		echo '
-			</fieldset>
-		</form>';
-	}
-
-	foreach (Utils::$context['tables'] as $i => $table) {
-		echo '
-		<table class="table_grid report_result" data-id="report_', $i + 1, '">';
-
-		if (!empty($table['title'])) {
-			echo '
-			<thead>
-				<tr class="title_bar">
-					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
-				</tr>
-			</thead>
-			<tbody>';
-		}
-
-		// Now do each row!
-		$row_number = 0;
-
-		foreach ($table['data'] as $row) {
-			if ($row_number == 0 && !empty($table['shading']['top']) && empty(current($row)['header'])) {
-				echo '
-				<tr class="windowbg table_caption">';
-			} else {
-			echo '
-				<tr class="', !empty(current($row)['separator']) || !empty(current($row)['header']) ? 'title_bar' : 'windowbg', '">';
-			}
-
-			// Now do each column.
-			$column_number = 0;
-			$th = false;
-
-			foreach ($row as $data) {
-				// If this is a special separator, skip over!
-				if (!empty($data['separator']) && $column_number == 0) {
-					echo '
-					<th colspan="', $table['column_count'], '" class="smalltext">
-						', $data['v'], ':
-					</th>';
-					break;
-				}
-
-				// These table cells shall be a heading if the first row says so.
-				if ($th || !empty($data['header'])) {
-					echo '
-					<th>
-						', $data['v'], '
-					</th>';
-
-					$th = true;
-				}
-				// Shaded?
-				elseif ($column_number == 0 && !empty($table['shading']['left'])) {
-					echo '
-					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
-						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
-					</td>';
-				} else {
-				echo '
-					<td class="smalltext ', $table['align']['normal'], 'text" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
-						', $data['v'], '
-					</td>';
-				}
-
-				$column_number++;
-			}
-
-			echo '
-				</tr>';
-
-			$row_number++;
-		}
-		echo '
-			</tbody>
-		</table>';
-	}
-}
-
-/**
- * Header of the print page!
- */
-function template_print_above()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
-	<head>
-		<meta charset="UTF-8">
-		<title>', Utils::$context['page_title'], '</title>
-		<link rel="stylesheet" href="', Theme::$current->settings['default_theme_url'], '/css/report.css', Utils::$context['browser_cache'], '">
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/reports.js', Utils::$context['browser_cache'], '"></script>
-	</head>
-	<body>';
-}
-
-/**
- * The main print page
- */
-function template_print()
-{
-	// Go through each table!
-	foreach (Utils::$context['tables'] as $table) {
-		echo '
-		<div style="overflow: visible;', $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '', '">
-			<table class="bordercolor">';
-
-		if (!empty($table['title'])) {
-			echo '
-				<tr class="title_bar">
-					<td colspan="', $table['column_count'], '">
-						', $table['title'], '
-					</td>
-				</tr>';
-		}
-
-		// Now do each row!
-		$row_number = 0;
-
-		foreach ($table['data'] as $row) {
-			if ($row_number == 0 && !empty($table['shading']['top'])) {
-				echo '
-				<tr class="titlebg">';
-			} else {
-			echo '
-				<tr class="windowbg">';
-			}
-
-			// Now do each column!!
-			$column_number = 0;
-
-			foreach ($row as $data) {
-				// If this is a special separator, skip over!
-				if (!empty($data['separator']) && $column_number == 0) {
-					echo '
-					<td colspan="', $table['column_count'], '" class="smalltext">
-						<strong>', $data['v'], ':</strong>
-					</td>';
-					break;
-				}
-
-				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left'])) {
-					echo '
-					<td class="titlebg ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
-						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
-					</td>';
-				} else {
-				echo '
-					<td class="centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
-						', $data['v'], '
-					</td>';
-				}
-
-				$column_number++;
-			}
-
-			echo '
-				</tr>';
-
-			$row_number++;
-		}
-		echo '
-			</table>
-		</div>
-		<br>';
-	}
-}
-
-/**
- * Footer of the print page.
- */
-function template_print_below()
-{
-	echo '
-		<div class="copyright">', Theme::copyright(), '</div>
-	</body>
-</html>';
-}
diff --git a/Themes/default/Search.template.php b/Themes/default/Search.template.php
deleted file mode 100644
index c3b0a72341b..00000000000
--- a/Themes/default/Search.template.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * The main search form
- */
-function template_main()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=search2" method="post" accept-charset="UTF-8" name="searchform" id="searchform">';
-
-	if (!empty(Utils::$context['search_errors'])) {
-		echo '
-		<div class="errorbox">
-			', implode('<br>', Utils::$context['search_errors']['messages']), '
-		</div>';
-	}
-
-	if (!empty(Utils::$context['search_ignored'])) {
-		echo '
-		<div class="noticebox">
-			', Lang::getTxt(
-			'search_warning_ignored',
-			[
-				'number_of_terms' => count(Utils::$context['search_ignored']),
-				'list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['search_ignored']),
-			],
-			file: 'Search',
-		), '
-		</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons filter"></span>', Lang::getTxt('set_parameters', file: 'Search'), '
-			</h3>
-		</div>
-		<div id="advanced_search" class="roundframe">
-			<dl class="settings" id="search_options">
-				<dt>
-					<strong><label for="searchfor">', Lang::getTxt('search_for', file: 'General'), '</label></strong>
-				</dt>
-				<dd>
-					<input type="search" name="search" id="searchfor" ', !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '', ' maxlength="', Utils::$context['search_string_limit'], '" size="40">';
-
-	if (empty(Config::$modSettings['search_simple_fulltext'])) {
-		echo '
-					<br><em class="smalltext">', Lang::getTxt('search_example', file: 'Search'), '</em>';
-	}
-
-	echo '
-				</dd>
-
-				<dt>
-					<label for="searchtype">', Lang::getTxt('search_match', file: 'General'), '</label>
-				</dt>
-				<dd>
-					<select name="searchtype" id="searchtype">
-						<option value="1"', empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '', '>', Lang::getTxt('all_words', file: 'Search'), '</option>
-						<option value="2"', !empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '', '>', Lang::getTxt('any_words', file: 'Search'), '</option>
-					</select>
-				</dd>
-				<dt>
-					<label for="userspec">', Lang::getTxt('by_user', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<input id="userspec" type="text" name="userspec" value="', empty(Utils::$context['search_params']['userspec']) ? '*' : Utils::$context['search_params']['userspec'], '" size="40">
-				</dd>
-				<dt>
-					<label for="sort">', Lang::getTxt('search_order', file: 'Search'), '</label>
-				</dt>
-				<dd>
-					<select id="sort" name="sort">
-						<option value="relevance|desc">', Lang::getTxt('search_orderby_relevant_first', file: 'Search'), '</option>
-						<option value="num_replies|desc">', Lang::getTxt('search_orderby_large_first', file: 'Search'), '</option>
-						<option value="num_replies|asc">', Lang::getTxt('search_orderby_small_first', file: 'Search'), '</option>
-						<option value="id_msg|desc">', Lang::getTxt('search_orderby_recent_first', file: 'Search'), '</option>
-						<option value="id_msg|asc">', Lang::getTxt('search_orderby_old_first', file: 'Search'), '</option>
-					</select>
-				</dd>
-				<dt class="righttext options">',
-					Lang::getTxt('search_options', file: 'Search'), '
-				</dt>
-				<dd class="options">
-					<ul>';
-
-	foreach (Utils::$context['search_options'] as $option) {
-		echo '
-						<li>
-							<label>
-								', $option['html'], '
-								<span>', Lang::getTxt($option['label'], file: 'Search'), '</span>
-							</label>
-						</li>';
-	}
-
-	echo '
-					</ul>
-				</dd>
-				<dt class="between">',
-					Lang::getTxt('search_post_age', file: 'Search'), '
-				</dt>
-				<dd>
-					', Lang::getTxt(
-						'search_age_range',
-						[
-							'min' => '<input type="number" name="minage" id="minage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['minage']) ? '0' : Utils::$context['search_params']['minage']) . '">',
-							'max' => '<input type="number" name="maxage" id="maxage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['maxage']) ? '9999' : Utils::$context['search_params']['maxage']) . '">',
-						],
-						file: 'Search',
-					), '
-				</dd>
-			</dl>
-			<script>
-				window.addEventListener("load", initSearch, false);
-			</script>
-			<input type="hidden" name="advanced" value="1">';
-
-	// Require an image to be typed to save spamming?
-	if (Utils::$context['require_verification']) {
-		echo '
-			<p>
-				<strong>', Lang::getTxt('verification', file: 'General'), '</strong>
-				', template_control_verification(Utils::$context['visual_verification_id'], 'all'), '
-			</p>';
-	}
-
-	// If Utils::$context['search_params']['topic'] is set, that means we're searching just one topic.
-	if (!empty(Utils::$context['search_params']['topic'])) {
-		echo '
-			<p>
-				', Lang::getTxt('search_specific_topic', ['topic' => Utils::$context['search_topic']['link']], file: 'Search'), '
-			</p>
-			<input type="hidden" name="topic" value="', Utils::$context['search_topic']['id'], '">
-			<input type="submit" name="b_search" value="', Lang::getTxt('search', file: 'General'), '" class="button">';
-	}
-
-	echo '
-		</div>';
-
-	if (empty(Utils::$context['search_params']['topic'])) {
-		echo '
-		<fieldset class="flow_hidden">
-			<div class="roundframe alt">
-				<details id="advanced_panel"', !empty(Utils::$context['boards_check_all']) ? '' : ' open', '>
-					<summary class="title_bar titlebg">', Lang::getTxt('choose_board', file: 'Search'), '</summary>
-					<div class="flow_auto boardslist">
-						<ul>';
-
-		foreach (Utils::$context['categories'] as $category) {
-			echo '
-						<li>
-							<a href="javascript:void(0);" onclick="selectBoards([', !empty($category['child_ids']) ? implode(', ', $category['child_ids']) : '', '], \'searchform\'); return false;">', $category['name'], '</a>
-							<ul>';
-
-			$cat_boards = array_values($category['children']);
-
-			foreach ($cat_boards as $key => $board) {
-				echo '
-								<li>
-									<label for="brd', $board['id'], '">
-										<input type="checkbox" id="brd', $board['id'], '" name="brd[', $board['id'], ']" value="', $board['id'], '"', $board['selected'] ? ' checked' : '', '>
-										', $board['name'], '
-									</label>';
-
-				// Nest child boards inside another list.
-				$curr_child_level = $board['child_level'];
-				$next_child_level = $cat_boards[$key + 1]['child_level'] ?? 0;
-
-				if ($next_child_level > $curr_child_level) {
-					echo '
-									<ul style="margin-inline-start: 2.5ch;">';
-				} else {
-					// Close child board lists until we reach a common level
-					// with the next board.
-					while ($next_child_level < $curr_child_level--) {
-						echo '
-										</li>
-									</ul>';
-					}
-
-					echo '
-								</li>';
-				}
-			}
-
-			echo '
-							</ul>
-						</li>';
-		}
-
-		echo '
-						</ul>
-					</div>
-				</details>
-				<br class="clear">
-				<div class="padding">
-					<input type="checkbox" name="all" id="check_all" value=""', !empty(Utils::$context['boards_check_all']) ? ' checked' : '', ' onclick="invertAll(this, this.form, \'brd\');">
-					<label for="check_all"><em>', Lang::getTxt('check_all', file: 'General'), '</em></label>
-					<input type="submit" name="b_search" value="', Lang::getTxt('search', file: 'General'), '" class="button floatright">
-				</div>
-			</div><!-- .roundframe -->
-		</fieldset>';
-	}
-
-	echo '
-	</form>
-	<script>
-		var oAddMemberSuggest = new smc_AutoSuggest({
-			sSessionId: smf_session_id,
-			sSessionVar: smf_session_var,
-			sControlId: \'userspec\',
-			sSearchType: \'member\'
-		});
-	</script>';
-}
-
-/**
- * The search results page.
- */
-function template_results()
-{
-	if (isset(Utils::$context['did_you_mean']) || empty(Utils::$context['topics']) || !empty(Utils::$context['search_ignored'])) {
-		echo '
-	<div id="search_results">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('search_adjust_query', file: 'Search'), '
-			</h3>
-		</div>
-		<div class="roundframe">';
-
-		// Did they make any typos or mistakes, perhaps?
-		if (isset(Utils::$context['did_you_mean'])) {
-			echo '
-			<p>
-				', Lang::getTxt('search_did_you_mean', ['suggested_query' => '<a href="' . Config::$scripturl . '?action=search2;params=' . Utils::$context['did_you_mean_params'] . '">' . Utils::$context['did_you_mean'] . '</a>'], file: 'Search'), '
-			</p>';
-		}
-
-		if (!empty(Utils::$context['search_ignored'])) {
-			echo '
-			<p>
-				', Lang::getTxt(
-				'search_warning_ignored',
-				[
-					'number_of_terms' => count(Utils::$context['search_ignored']),
-					'list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['search_ignored']),
-				],
-				file: 'Search',
-			), '
-			</p>';
-		}
-
-		echo '
-			<form action="', Config::$scripturl, '?action=search2" method="post" accept-charset="UTF-8">
-				<strong>', Lang::getTxt('search_for', file: 'General'), '</strong>
-				<input type="text" name="search"', !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '', ' maxlength="', Utils::$context['search_string_limit'], '" size="40">
-				<input type="submit" name="edit_search" value="', Lang::getTxt('search_adjust_submit', file: 'Search'), '" class="button">';
-
-		foreach (Utils::$context['hidden_inputs'] as $input) {
-			echo "\n\t\t\t\t" . $input;
-		}
-
-		echo '
-			</form>
-		</div><!-- .roundframe -->
-	</div><!-- #search_results -->';
-	}
-
-	if (Utils::$context['compact']) {
-		echo '
-	<form id="new_search" name="new_search" action="', Config::$scripturl, '?action=search2" method="post" accept-charset="UTF-8">
-		<input type="hidden" name="search"', !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '', ' maxlength="', Utils::$context['search_string_limit'], '" size="40">';
-
-		foreach (Utils::$context['hidden_inputs'] as $input) {
-			echo "\n\t\t" . $input;
-		}
-
-		echo '
-	</form>';
-
-		echo '
-		<div id="display_head" class="information">
-			<h2 class="display_title">
-				<span>', Lang::getTxt('search_results', ['params' => Utils::$context['search_params']['search']], file: 'General'), '</span>
-			</h2>
-			<div class="floatleft">
-				<a class="button" href="', Config::$scripturl, '?action=search;params=' . Utils::$context['params'], '">', Lang::getTxt('search_adjust_query', file: 'Search'), '</a>
-			</div>';
-
-		// Was anything even found?
-		if (!empty(Utils::$context['topics'])) {
-			echo '
-			<div class="floatright">
-				<span class="padding">', Lang::getTxt('search_order', file: 'Search'), '</span>
-				<select name="sort" class="floatright" form="new_search" onchange="document.forms.new_search.submit()">';
-
-			foreach (Utils::$context['sort_options'] as $option) {
-				echo '
-					<option value="' . $option['value'] . '"' . ($option['selected'] ? ' selected' : '') . '>' . Lang::getTxt($option['label'], file: 'Search') . '</option>';
-			}
-
-			echo'
-				</select>
-			</div>
-		</div>
-		<div class="pagesection">
-			<div class="pagelinks">', Utils::$context['page_index'], '</div>
-		</div>';
-		} else {
-			echo '
-		</div>
-		<div class="roundframe noup">', Lang::getTxt('search_no_results', file: 'General'), '</div>';
-		}
-
-		// While we have results to show ...
-		while ($topic = Utils::$context['get_topics']()) {
-			echo '
-		<div class="', $topic['css_class'], '">';
-
-			foreach ($topic['matches'] as $message) {
-				echo '
-			<div class="block">
-				<div class="page_number floatright"> #', $message['counter'], '</div>
-				<div class="half_content">
-					<div class="topic_details">
-						<h5>', $topic['board']['link'], ' / <a href="', Config::$scripturl, '?topic=', $topic['id'], '.msg', $message['id'], '#msg', $message['id'], '">', $message['subject_highlighted'], '</a></h5>
-						<span class="smalltext">', str_replace('<br>', ' ', Lang::getTxt('last_post_updated', ['time' => $message['time'], 'member_link' => '<strong>' . $message['member']['link'] . '</strong>'], file: 'General')), '</span>
-					</div>
-				</div>
-			</div><!-- .block -->';
-
-				if ($message['body_highlighted'] != '') {
-					echo '
-			<div class="list_posts word_break">', $message['body_highlighted'], '</div>';
-				}
-			}
-
-			echo '
-		</div><!-- $topic[css_class] -->';
-		}
-	} else {
-		echo '
-	<div id="display_head" class="information">
-		<h2 class="display_title">
-			<span>', Lang::getTxt('search_results', ['params' => Utils::$context['search_params']['search']], file: 'General'), '</span>
-		</h2>
-		<div class="floatleft">
-			<a class="button" href="', Config::$scripturl, '?action=search;params=' . Utils::$context['params'], '">', Lang::getTxt('search_adjust_query', file: 'Search'), '</a>
-		</div>';
-
-		// Was anything even found?
-		if (!empty(Utils::$context['topics'])) {
-			echo '
-		<div class="floatright">
-			<span class="padding">', Lang::getTxt('search_order', file: 'Search'), '</span>
-			<select name="sort" class="floatright" form="new_search" onchange="document.forms.new_search.submit()">';
-
-			foreach (Utils::$context['sort_options'] as $option) {
-				echo '
-				<option value="' . $option['value'] . '"' . ($option['selected'] ? ' selected' : '') . '>' . Lang::getTxt($option['label'], file: 'Search') . '</option>';
-			}
-
-			echo'
-			</select>
-		</div>
-	</div>
-	<div class="pagesection">
-		<div class="pagelinks">', Utils::$context['page_index'], '</div>
-	</div>';
-		} else {
-			echo '
-	</div>
-	<div class="roundframe noup">', Lang::getTxt('search_no_results', file: 'General'), '</div>';
-		}
-
-		while ($topic = Utils::$context['get_topics']()) {
-			foreach ($topic['matches'] as $message) {
-				echo '
-	<div class="', $topic['css_class'], '">
-		<div class="page_number floatright"> #', $message['counter'], '</div>
-		<div class="topic_details">
-			<h5>
-				', $topic['board']['link'], ' / <a href="', Config::$scripturl, '?topic=', $topic['id'], '.', $message['start'], ';topicseen#msg', $message['id'], '">', $message['subject_highlighted'], '</a>
-			</h5>
-			<span class="smalltext">', str_replace('<br>', ' ', Lang::getTxt('last_post_topic', ['post_link' => $message['time'], 'member_link' => '<strong>' . $message['member']['link'] . '</strong>'], file: 'General')), '</span>
-		</div>
-		<div class="list_posts">', $message['body_highlighted'], '</div>';
-
-				echo '
-		<br class="clear">
-	</div><!-- $topic[css_class] -->';
-			}
-		}
-	}
-
-	echo '
-	<div class="pagesection">';
-
-	if (!empty(Utils::$context['topics'])) {
-		echo '
-		<div class="pagelinks">', Utils::$context['page_index'], '</div>';
-	}
-
-	// Show a jump to box for easy navigation.
-	echo '
-		<div class="smalltext pagelinks floatright" id="search_jump_to"></div>
-		<script>
-			window.addEventListener("DOMContentLoaded", function() {
-				new JumpTo({
-					sContainerId: "search_jump_to",
-					sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">', Utils::$context['jump_to']['label'], '<" + "/label> %dropdown_list%",
-					iCurBoardId: 0,
-					iCurBoardChildLevel: 0,
-					sCurBoardName: "', Utils::$context['jump_to']['board_name'], '",
-					sBoardChildLevelIndicator: "==",
-					sBoardPrefix: "=> ",
-					sCatSeparator: "-----------------------------",
-					sCatPrefix: "",
-					sGoButtonLabel: "', Lang::getTxt('quick_mod_go', file: 'General'), '"
-				});
-			});
-		</script>
-	</div>';
-}
diff --git a/Themes/default/Settings.template.php b/Themes/default/Settings.template.php
deleted file mode 100644
index 22f05f4a7a0..00000000000
--- a/Themes/default/Settings.template.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * This pseudo-template defines all the theme options
- */
-function template_options()
-{
-	Utils::$context['theme_options'] = [
-		Lang::getTxt('theme_opt_display', file: 'Profile'),
-		[
-			'id' => 'show_children',
-			'label' => Lang::getTxt('show_children', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'topics_per_page',
-			'label' => Lang::getTxt('topics_per_page', file: 'Profile'),
-			'options' => [
-				0 => Lang::getTxt('per_page_default', file: 'Profile'),
-				5 => 5,
-				10 => 10,
-				25 => 25,
-				50 => 50,
-			],
-			'default' => true,
-			'enabled' => empty(Config::$modSettings['disableCustomPerPage']),
-		],
-		[
-			'id' => 'messages_per_page',
-			'label' => Lang::getTxt('messages_per_page', file: 'Profile'),
-			'options' => [
-				0 => Lang::getTxt('per_page_default', file: 'Profile'),
-				5 => 5,
-				10 => 10,
-				25 => 25,
-				50 => 50,
-			],
-			'default' => true,
-			'enabled' => empty(Config::$modSettings['disableCustomPerPage']),
-		],
-		[
-			'id' => 'view_newest_first',
-			'label' => Lang::getTxt('recent_posts_at_top', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'show_no_avatars',
-			'label' => Lang::getTxt('show_no_avatars', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'show_no_signatures',
-			'label' => Lang::getTxt('show_no_signatures', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'show_no_censored',
-			'label' => Lang::getTxt('show_no_censored'),
-			'default' => false,
-			'enabled' => !empty(Config::$modSettings['allow_no_censored']),
-		],
-		[
-			'id' => 'posts_apply_ignore_list',
-			'label' => Lang::getTxt('posts_apply_ignore_list', file: 'Profile'),
-			'default' => false,
-			'enabled' => !empty(Config::$modSettings['enable_buddylist']),
-		],
-		Lang::getTxt('theme_opt_posting', file: 'Profile'),
-		[
-			'id' => 'return_to_post',
-			'label' => Lang::getTxt('return_to_post', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'no_new_reply_warning',
-			'label' => Lang::getTxt('no_new_reply_warning', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'wysiwyg_default',
-			'label' => Lang::getTxt('wysiwyg_default', file: 'Profile'),
-			'default' => false,
-			'enabled' => empty(Config::$modSettings['disable_wysiwyg']),
-		],
-		[
-			'id' => 'drafts_autosave_enabled',
-			'label' => Lang::getTxt('drafts_autosave_enabled', file: 'Drafts'),
-			'default' => true,
-			'enabled' => !empty(Config::$modSettings['drafts_autosave_enabled']) && (!empty(Config::$modSettings['drafts_post_enabled']) || !empty(Config::$modSettings['drafts_pm_enabled'])),
-		],
-		[
-			'id' => 'drafts_show_saved_enabled',
-			'label' => Lang::getTxt('drafts_show_saved_enabled', file: 'Drafts'),
-			'default' => true,
-			'enabled' => !empty(Config::$modSettings['drafts_show_saved_enabled']) && (!empty(Config::$modSettings['drafts_post_enabled']) || !empty(Config::$modSettings['drafts_pm_enabled'])),
-		],
-		Lang::getTxt('theme_opt_moderation', file: 'Profile'),
-		[
-			'id' => 'display_quick_mod',
-			'label' => Lang::getTxt('display_quick_mod', file: 'Profile'),
-			'options' => [
-				0 => Lang::getTxt('display_quick_mod_none', file: 'Profile'),
-				1 => Lang::getTxt('display_quick_mod_check', file: 'Profile'),
-				2 => Lang::getTxt('display_quick_mod_image', file: 'Profile'),
-			],
-			'default' => true,
-		],
-		Lang::getTxt('theme_opt_personal_messages', file: 'Profile'),
-		[
-			'id' => 'popup_messages',
-			'label' => Lang::getTxt('popup_messages', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'view_newest_pm_first',
-			'label' => Lang::getTxt('recent_pms_at_top', file: 'Profile'),
-			'default' => true,
-		],
-		[
-			'id' => 'pm_remove_inbox_label',
-			'label' => Lang::getTxt('pm_remove_inbox_label', file: 'Profile'),
-			'default' => true,
-		],
-		!empty(Config::$modSettings['cal_enabled']) ? Lang::getTxt('theme_opt_calendar', file: 'Profile') : '',
-		[
-			'id' => 'calendar_default_view',
-			'label' => Lang::getTxt('calendar_default_view', file: 'Profile'),
-			'options' => [
-				'viewlist' => Lang::getTxt('calendar_viewlist', file: 'Profile'),
-				'viewmonth' => Lang::getTxt('calendar_viewmonth', file: 'Profile'),
-				'viewweek' => Lang::getTxt('calendar_viewweek', file: 'Profile'),
-			],
-			'default' => true,
-			'enabled' => !empty(Config::$modSettings['cal_enabled']),
-		],
-		[
-			'id' => 'calendar_start_day',
-			'label' => Lang::getTxt('calendar_start_day', file: 'Profile'),
-			'options' => array_filter(
-				Lang::getTxt('days', file: 'General'),
-				fn($key) => in_array($key, [0, 1, 5, 6]),
-				ARRAY_FILTER_USE_KEY,
-			),
-			'default' => true,
-			'enabled' => !empty(Config::$modSettings['cal_enabled']),
-		],
-	];
-}
-
-/**
- * This pseudo-template defines all the available theme settings (but not their actual values)
- */
-function template_settings()
-{
-	Utils::$context['theme_settings'] = [
-		[
-			'id' => 'header_logo_url',
-			'label' => Lang::getTxt('header_logo_url', file: 'Themes'),
-			'description' => Lang::getTxt('header_logo_url_desc', file: 'Themes'),
-			'type' => 'text',
-		],
-		[
-			'id' => 'site_slogan',
-			'label' => Lang::getTxt('site_slogan', file: 'Themes'),
-			'description' => Lang::getTxt('site_slogan_desc', file: 'Themes'),
-			'type' => 'text',
-		],
-		[
-			'id' => 'og_image',
-			'label' => Lang::getTxt('og_image', file: 'Themes'),
-			'description' => Lang::getTxt('og_image_desc', file: 'Themes'),
-			'type' => 'url',
-		],
-		'',
-		[
-			'id' => 'smiley_sets_default',
-			'label' => Lang::getTxt('smileys_default_set_for_theme', file: 'Admin'),
-			'options' => Utils::$context['smiley_sets'],
-			'type' => 'text',
-		],
-		'',
-		[
-			'id' => 'enable_news',
-			'label' => Lang::getTxt('enable_random_news', file: 'Themes'),
-		],
-		[
-			'id' => 'show_newsfader',
-			'label' => Lang::getTxt('news_fader', file: 'Themes'),
-		],
-		[
-			'id' => 'newsfader_time',
-			'label' => Lang::getTxt('admin_fader_delay', file: 'Admin'),
-			'type' => 'number',
-		],
-		'',
-		[
-			'id' => 'number_recent_posts',
-			'label' => Lang::getTxt('number_recent_posts', file: 'Themes'),
-			'description' => Lang::getTxt('zero_to_disable', file: 'Admin'),
-			'type' => 'number',
-		],
-		[
-			'id' => 'show_stats_index',
-			'label' => Lang::getTxt('show_stats_index', file: 'Themes'),
-		],
-		[
-			'id' => 'show_latest_member',
-			'label' => Lang::getTxt('latest_members', file: 'Themes'),
-		],
-		[
-			'id' => 'show_group_key',
-			'label' => Lang::getTxt('show_group_key', file: 'Themes'),
-		],
-		[
-			'id' => 'display_who_viewing',
-			'label' => Lang::getTxt('who_display_viewing', file: 'Themes'),
-			'options' => [
-				0 => Lang::getTxt('who_display_viewing_off', file: 'Themes'),
-				1 => Lang::getTxt('who_display_viewing_numbers', file: 'Themes'),
-				2 => Lang::getTxt('who_display_viewing_names', file: 'Themes'),
-			],
-			'type' => 'list',
-		],
-	];
-}
diff --git a/Themes/default/SplitTopics.template.php b/Themes/default/SplitTopics.template.php
deleted file mode 100644
index b58838f2045..00000000000
--- a/Themes/default/SplitTopics.template.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * The form that asks how you want to split things
- */
-function template_ask()
-{
-	echo '
-	<div id="split_topics">
-		<form action="', Config::$scripturl, '?action=splittopics;sa=split;topic=', Utils::$context['current_topic'], '.0" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="at" value="', Utils::$context['message']['id'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('split', file: 'General'), '</h3>
-			</div>
-			<div class="windowbg">
-				<p class="split_topics">
-					<strong><label for="subname">', Lang::getTxt('subject_new_topic', file: 'General'), '</label></strong>
-					<input type="text" name="subname" id="subname" value="', Utils::$context['message']['subject'], '" size="25">
-				</p>
-				<ul class="split_topics">
-					<li>
-						<input type="radio" id="onlythis" name="step2" value="onlythis" checked> <label for="onlythis">', Lang::getTxt('split_this_post', file: 'General'), '</label>
-					</li>
-					<li>
-						<input type="radio" id="afterthis" name="step2" value="afterthis"> <label for="afterthis">', Lang::getTxt('split_after_and_this_post', file: 'General'), '</label>
-					</li>
-					<li>
-						<input type="radio" id="selective" name="step2" value="selective"> <label for="selective">', Lang::getTxt('select_split_posts', file: 'General'), '</label>
-					</li>
-				</ul>
-				<hr>
-				<div class="auto_flow">
-					<input type="submit" value="', Lang::getTxt('split', file: 'General'), '" class="button">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				</div>
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #split_topics -->';
-}
-
-/**
- * A simple confirmation that things were split as expected, with links to the current board and the old and new topics.
- */
-function template_main()
-{
-	echo '
-	<div id="split_topics">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('split', file: 'General'), '</h3>
-		</div>
-		<div class="windowbg">
-			<p>', Lang::getTxt('split_successful', file: 'General'), '</p>
-			<ul>
-				<li>
-					<a href="', Config::$scripturl, '?board=', Utils::$context['current_board'], '.0">', Lang::getTxt('message_index', file: 'General'), '</a>
-				</li>
-				<li>
-					<a href="', Config::$scripturl, '?topic=', Utils::$context['old_topic'], '.0">', Lang::getTxt('origin_topic', file: 'General'), '</a>
-				</li>
-				<li>
-					<a href="', Config::$scripturl, '?topic=', Utils::$context['new_topic'], '.0">', Lang::getTxt('new_topic', file: 'General'), '</a>
-				</li>
-			</ul>
-		</div><!-- .windowbg -->
-	</div><!-- #split_topics -->';
-}
-
-/**
- * The form for selecting which posts to split.
- */
-function template_select()
-{
-	echo '
-	<div id="split_topics">
-		<form action="', Config::$scripturl, '?action=splittopics;sa=splitSelection;board=', Utils::$context['current_board'], '.0" method="post" accept-charset="UTF-8">
-			<div id="not_selected" class="floatleft">
-				<div class="cat_bar">
-					<h3 class="catbg">', Lang::getTxt('select_split_posts', file: 'General'), '</h3>
-				</div>
-				<div class="information">
-					', Lang::getTxt('please_select_split', file: 'General'), '
-				</div>
-				<div class="pagesection">
-					<div id="pageindex_not_selected" class="pagelinks">', Utils::$context['not_selected']['page_index'], '</div>
-				</div>
-				<ul id="messages_not_selected" class="split_messages smalltext">';
-
-	foreach (Utils::$context['not_selected']['messages'] as $message) {
-		echo '
-					<li class="windowbg" id="not_selected_', $message['id'], '">
-						<div class="message_header">
-							<a class="split_icon floatright" href="', Config::$scripturl, '?action=splittopics;sa=selectTopics;subname=', Utils::$context['topic']['subject'], ';topic=', Utils::$context['topic']['id'], '.', Utils::$context['not_selected']['start'], ';start2=', Utils::$context['selected']['start'], ';move=down;msg=', $message['id'], '" onclick="return select(\'down\', ', $message['id'], ');"><span class="main_icons split_sel" title="-&gt;"></span></a>
-							', Lang::getTxt('post_by_member', $message, file: 'General'), '
-							<em>', $message['time'], '</em>
-						</div>
-						<div class="post">', Utils::adjustHeadingLevels($message['body'], 3), '</div>
-					</li>';
-	}
-
-	echo '
-				</ul>
-			</div><!-- #not_selected -->
-			<div id="selected" class="floatright">
-				<div class="cat_bar">
-					<h3 class="catbg">
-						', Lang::getTxt('split_selected_posts', ['reset_link' => '<a href="' . Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . Utils::$context['topic']['subject'] . ';topic=' . Utils::$context['topic']['id'] . '.' . Utils::$context['not_selected']['start'] . ';start2=' . Utils::$context['selected']['start'] . ';move=reset;msg=0" onclick="return select(\'reset\', 0);">' . Lang::getTxt('split_reset_selection', file: 'General') . '</a>']), '
-					</h3>
-				</div>
-				<div class="information">
-					', Lang::getTxt('split_selected_posts_desc', file: 'General'), '
-				</div>
-				<div class="pagesection">
-					<div id="pageindex_selected" class="pagelinks">', Utils::$context['selected']['page_index'], '</div>
-				</div>
-				<ul id="messages_selected" class="split_messages smalltext">';
-
-	if (!empty(Utils::$context['selected']['messages'])) {
-		foreach (Utils::$context['selected']['messages'] as $message) {
-			echo '
-					<li class="windowbg" id="selected_', $message['id'], '">
-						<div class="message_header">
-							<a class="split_icon floatleft" href="', Config::$scripturl, '?action=splittopics;sa=selectTopics;subname=', Utils::$context['topic']['subject'], ';topic=', Utils::$context['topic']['id'], '.', Utils::$context['not_selected']['start'], ';start2=', Utils::$context['selected']['start'], ';move=up;msg=', $message['id'], '" onclick="return select(\'up\', ', $message['id'], ');"><span class="main_icons split_desel" title="&lt;-"></span></a>
-							', Lang::getTxt('post_by_member', $message, file: 'General'), '
-							<em>', $message['time'], '</em>
-						</div>
-						<div class="post">', Utils::adjustHeadingLevels($message['body'], 3), '</div>
-					</li>';
-		}
-	}
-
-	echo '
-				</ul>
-			</div><!-- #selected -->
-			<br class="clear">
-			<div class="flow_auto">
-				<input type="hidden" name="topic" value="', Utils::$context['current_topic'], '">
-				<input type="hidden" name="subname" value="', Utils::$context['new_subject'], '">
-				<input type="submit" value="', Lang::getTxt('split', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-			</div>
-		</form>
-	</div><!-- #split_topics -->
-	<script>
-		var start = new Array();
-		start[0] = ', Utils::$context['not_selected']['start'], ';
-		start[1] = ', Utils::$context['selected']['start'], ';
-
-		function select(direction, msg_id)
-		{
-			getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', Utils::$context['topic']['subject'], ';topic=', Utils::$context['topic']['id'], '." + start[0] + ";start2=" + start[1] + ";move=" + direction + ";msg=" + msg_id + ";xml;splitjs", onDocReceived);
-			return false;
-		}
-		function onDocReceived(XMLDoc)
-		{
-			var i, j, pageIndex;
-			for (i = 0; i < 2; i++)
-			{
-				pageIndex = XMLDoc.getElementsByTagName("pageIndex")[i];
-				setInnerHTML(document.getElementById("pageindex_" + pageIndex.getAttribute("section")), pageIndex.firstChild.nodeValue);
-				start[i] = pageIndex.getAttribute("startFrom");
-			}
-			var numChanges = XMLDoc.getElementsByTagName("change").length;
-			var curChange, curSection, curAction, curId, curList, curData, newItem, sInsertBeforeId;
-			for (i = 0; i < numChanges; i++)
-			{
-				curChange = XMLDoc.getElementsByTagName("change")[i];
-				curSection = curChange.getAttribute("section");
-				curAction = curChange.getAttribute("curAction");
-				curId = curChange.getAttribute("id");
-				curList = document.getElementById("messages_" + curSection);
-				if (curAction == "remove")
-					curList.removeChild(document.getElementById(curSection + "_" + curId));
-				// Insert a message.
-				else
-				{
-					// By default, insert the element at the end of the list.
-					sInsertBeforeId = null;
-					// Loop through the list to try to find an item to insert after.
-					oListItems = curList.getElementsByTagName("LI");
-					for (j = 0; j < oListItems.length; j++)
-					{
-						if (parseInt(oListItems[j].id.substr(curSection.length + 1)) ' . (empty(Theme::$current->options['view_newest_first']) ? '>' : '<') . ' curId)
-						{
-							// This would be a nice place to insert the row.
-							sInsertBeforeId = oListItems[j].id;
-							// We\'re done for now. Escape the loop.
-							j = oListItems.length + 1;
-						}
-					}
-
-					// Let\'s create a nice container for the message.
-					newItem = document.createElement("LI");
-					newItem.className = "windowbg";
-					newItem.id = curSection + "_" + curId;
-					newItem.innerHTML = "<div class=\\"message_header\\"><a class=\\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\\" href=\\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', Utils::$context['topic']['subject'], ';topic=', Utils::$context['topic']['id'], '.', Utils::$context['not_selected']['start'], ';start2=', Utils::$context['selected']['start'], ';move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\\" onclick=\\"return select(\'" + (curSection == "selected" ? "up" : "down") + "\', " + curId + ");\\"><span class=\\"main_icons split_" + (curSection == "selected" ? "de" : "") + "sel\\" title=\\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\\"></span></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> ', Lang::getTxt('by', file: 'General'), ' <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\\"post\\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div>";
-
-					// So, where do we insert it?
-					if (typeof sInsertBeforeId == "string")
-						curList.insertBefore(newItem, document.getElementById(sInsertBeforeId));
-					else
-						curList.appendChild(newItem);
-				}
-			}
-		}
-	</script>';
-}
diff --git a/Themes/default/Stats.template.php b/Themes/default/Stats.template.php
deleted file mode 100644
index bfcef6e31fa..00000000000
--- a/Themes/default/Stats.template.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * The stats page.
- */
-function template_main()
-{
-	echo '
-	<div id="statistics" class="main_section">
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="roundframe">
-			<div class="title_bar">
-				<h4 class="titlebg">
-					<span class="main_icons general"></span> ', Lang::getTxt('general_stats', file: 'Stats'), '
-				</h4>
-			</div>
-			<dl class="stats half_content">
-				<dt>', Lang::getTxt('total_members', file: 'General'), '</dt>
-				<dd>', Utils::$context['show_member_list'] ? '<a href="' . Config::$scripturl . '?action=mlist">' . Utils::$context['num_members'] . '</a>' : Utils::$context['num_members'], '</dd>
-				<dt>', Lang::getTxt('total_posts', file: 'General'), '</dt>
-				<dd>', Utils::$context['num_posts'], '</dd>
-				<dt>', Lang::getTxt('total_topics', file: 'General'), '</dt>
-				<dd>', Utils::$context['num_topics'], '</dd>
-				<dt>', Lang::getTxt('total_cats', file: 'General'), '</dt>
-				<dd>', Utils::$context['num_categories'], '</dd>
-				<dt>', Lang::getTxt('users_online', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['users_online'], '</dd>
-				<dt>', Lang::getTxt('most_online', file: 'Stats'), '</dt>
-				<dd>', Lang::getTxt('most_online_number_date', Utils::$context['most_members_online'], file: 'Stats'), '</dd>
-				<dt>', Lang::getTxt('users_online_today', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['online_today'], '</dd>';
-
-	if (!empty(Config::$modSettings['hitStats'])) {
-		echo '
-				<dt>', Lang::getTxt('num_hits', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['num_hits'], '</dd>';
-	}
-
-	echo '
-			</dl>
-			<dl class="stats half_content">
-				<dt>', Lang::getTxt('average_members', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['average_members'], '</dd>
-				<dt>', Lang::getTxt('average_posts', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['average_posts'], '</dd>
-				<dt>', Lang::getTxt('average_topics', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['average_topics'], '</dd>
-				<dt>', Lang::getTxt('total_boards', file: 'General'), '</dt>
-				<dd>', Utils::$context['num_boards'], '</dd>
-				<dt>', Lang::getTxt('latest_member', file: 'General'), '</dt>
-				<dd>', Utils::$context['common_stats']['latest_member']['link'], '</dd>
-				<dt>', Lang::getTxt('average_online', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['average_online'], '</dd>';
-
-	if (!empty(Utils::$context['gender'])) {
-		echo '
-				<dt>', Lang::getTxt('gender_stats', file: 'Stats'), '</dt>
-				<dd>';
-
-		foreach (Utils::$context['gender'] as $g => $n) {
-			echo Lang::getTxt('gender_stats_number', ['gender' => Lang::tokenTxtReplace($g), 'number' => $n], file: 'Stats'), '<br>';
-		}
-
-		echo '
-				</dd>';
-	}
-
-	if (!empty(Config::$modSettings['hitStats'])) {
-		echo '
-				<dt>', Lang::getTxt('average_hits', file: 'Stats'), '</dt>
-				<dd>', Utils::$context['average_hits'], '</dd>';
-	}
-
-	echo '
-			</dl>';
-
-	foreach (Utils::$context['stats_blocks'] as $name => $block) {
-		echo '
-			<div class="half_content">
-				<div class="title_bar">
-					<h4 class="titlebg">
-						<span class="main_icons ', $name, '"></span> ', Lang::getTxt('top_' . $name, file: 'Stats'), '
-					</h4>
-				</div>
-				<dl class="stats">';
-
-		foreach ($block as $item) {
-			echo '
-					<dt>
-						', $item['link'], '
-					</dt>
-					<dd class="statsbar generic_bar righttext">';
-
-			if (!empty($item['percent'])) {
-				echo '
-						<div class="bar" style="width: ', $item['percent'], '%;"></div>';
-			} else {
-			echo '
-						<div class="bar empty"></div>';
-			}
-
-			echo '
-						<span>', $item['num'], '</span>
-					</dd>';
-		}
-
-		echo '
-				</dl>
-			</div><!-- .half_content -->';
-	}
-
-	echo '
-		</div><!-- .roundframe -->
-		<br class="clear">
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<span class="main_icons history"></span>', Lang::getTxt('forum_history', file: 'Stats'), '
-			</h3>
-		</div>';
-
-	if (!empty(Utils::$context['yearly'])) {
-		echo '
-		<table id="stats" class="table_grid">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext">', Lang::getTxt('yearly_summary', file: 'Stats'), '</th>
-					<th>', Lang::getTxt('stats_new_topics', file: 'Stats'), '</th>
-					<th>', Lang::getTxt('stats_new_posts', file: 'Stats'), '</th>
-					<th>', Lang::getTxt('stats_new_members', file: 'Stats'), '</th>
-					<th>', Lang::getTxt('most_online', file: 'Stats'), '</th>';
-
-		if (!empty(Config::$modSettings['hitStats'])) {
-			echo '
-					<th>', Lang::getTxt('page_views', file: 'Stats'), '</th>';
-		}
-
-		echo '
-				</tr>
-			</thead>
-			<tbody>';
-
-		foreach (Utils::$context['yearly'] as $id => $year) {
-			echo '
-				<tr class="windowbg" id="year_', $id, '">
-					<th class="lefttext">
-						<img id="year_img_', $id, '" src="', Theme::$current->settings['images_url'], '/selected_open.png" alt="*"> <a href="#year_', $id, '" id="year_link_', $id, '">', $year['year'], '</a>
-					</th>
-					<th>', $year['new_topics'], '</th>
-					<th>', $year['new_posts'], '</th>
-					<th>', $year['new_members'], '</th>
-					<th>', $year['most_members_online'], '</th>';
-
-			if (!empty(Config::$modSettings['hitStats'])) {
-				echo '
-					<th>', $year['hits'], '</th>';
-			}
-
-			echo '
-				</tr>';
-
-			foreach ($year['months'] as $month) {
-				echo '
-				<tr class="windowbg" id="tr_month_', $month['id'], '">
-					<th class="stats_month">
-						<img src="', Theme::$current->settings['images_url'], '/', $month['expanded'] ? 'selected_open.png' : 'selected.png', '" alt="" id="img_', $month['id'], '"> <a id="m', $month['id'], '" href="', $month['href'], '" onclick="return doingExpandCollapse;">', $month['month'], ' ', $month['year'], '</a>
-					</th>
-					<th>', $month['new_topics'], '</th>
-					<th>', $month['new_posts'], '</th>
-					<th>', $month['new_members'], '</th>
-					<th>', $month['most_members_online'], '</th>';
-
-				if (!empty(Config::$modSettings['hitStats'])) {
-					echo '
-					<th>', $month['hits'], '</th>';
-				}
-
-				echo '
-				</tr>';
-
-				if ($month['expanded']) {
-					foreach ($month['days'] as $day) {
-						echo '
-				<tr class="windowbg" id="tr_day_', $day['year'], '-', $day['month'], '-', $day['day'], '">
-					<td class="stats_day">', $day['year'], '-', $day['month'], '-', $day['day'], '</td>
-					<td>', $day['new_topics'], '</td>
-					<td>', $day['new_posts'], '</td>
-					<td>', $day['new_members'], '</td>
-					<td>', $day['most_members_online'], '</td>';
-
-						if (!empty(Config::$modSettings['hitStats'])) {
-							echo '
-					<td>', $day['hits'], '</td>';
-						}
-
-						echo '
-				</tr>';
-					}
-				}
-			}
-		}
-
-		echo '
-			</tbody>
-		</table>
-	</div><!-- #statistics -->
-	<script>
-		var oStatsCenter = new smf_StatsCenter({
-			sTableId: \'stats\',
-
-			reYearPattern: /year_(\d+)/,
-			sYearImageCollapsed: \'selected.png\',
-			sYearImageExpanded: \'selected_open.png\',
-			sYearImageIdPrefix: \'year_img_\',
-			sYearLinkIdPrefix: \'year_link_\',
-
-			reMonthPattern: /tr_month_(\d+)/,
-			sMonthImageCollapsed: \'selected.png\',
-			sMonthImageExpanded: \'selected_open.png\',
-			sMonthImageIdPrefix: \'img_\',
-			sMonthLinkIdPrefix: \'m\',
-
-			reDayPattern: /tr_day_(\d+-\d+-\d+)/,
-			sDayRowClassname: \'windowbg\',
-			sDayRowIdPrefix: \'tr_day_\',
-
-			aCollapsedYears: [';
-
-		foreach (Utils::$context['collapsed_years'] as $id => $year) {
-			echo '
-				\'', $year, '\'', $id != count(Utils::$context['collapsed_years']) - 1 ? ',' : '';
-		}
-
-		echo '
-			],
-
-			aDataCells: [
-				\'date\',
-				\'new_topics\',
-				\'new_posts\',
-				\'new_members\',
-				\'most_members_online\'', empty(Config::$modSettings['hitStats']) ? '' : ',
-				\'hits\'', '
-			]
-		});
-	</script>';
-	}
-}
diff --git a/Themes/default/Themes.template.php b/Themes/default/Themes.template.php
deleted file mode 100644
index b4ab1d2b279..00000000000
--- a/Themes/default/Themes.template.php
+++ /dev/null
@@ -1,1202 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\BrowserDetector;
-use SMF\Config;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Utils;
-
-/**
- * The main sub template - for theme administration.
- */
-function template_main()
-{
-	// Theme install info.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', Config::$scripturl, '?action=helpadmin;help=themes_manage" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a>
-				', Lang::getTxt('themeadmin_install_title', file: 'Themes'), '
-			</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('themeadmin_explain', file: 'Themes'), '
-		</div>';
-
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=theme;sa=admin" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">',
-					Lang::getTxt('settings', file: 'General'), '
-				</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="options-theme_allow"> ', Lang::getTxt('theme_allow', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" value="0" name="options[theme_allow]">
-						<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"', !empty(Config::$modSettings['theme_allow']) ? ' checked' : '', '>
-					</dd>
-					<dt>
-						<label for="known_themes_list">', Lang::getTxt('themeadmin_selectable', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<div id="known_themes_list">';
-
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-							<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked' : '', '> ', $theme['name'], '</label><br>';
-	}
-
-	echo '
-						</div>
-						<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').classList.remove(\'hidden\'); document.getElementById(\'known_themes_link\').classList.add(\'hidden\'); return false; " id="known_themes_link" class="hidden button floatnone">', Lang::getTxt('themeadmin_themelist_link', file: 'Themes'), '</a>
-						<script>
-							document.getElementById("known_themes_list").classList.add(\'hidden\');
-							document.getElementById("known_themes_link").classList.remove(\'hidden\');
-						</script>
-					</dd>
-					<dt>
-						<label for="theme_guests">', Lang::getTxt('theme_guests', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<select name="options[theme_guests]" id="theme_guests">';
-
-	// Put an option for each theme in the select box.
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-							<option value="', $theme['id'], '"', Config::$modSettings['theme_guests'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
-	}
-
-	echo '
-						</select>
-						<span class="smalltext pick_theme"><a href="', Config::$scripturl, '?action=themechooser;u=-1;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="button floatnone">', Lang::getTxt('theme_select', file: 'Themes'), '</a></span>
-					</dd>
-					<dt>
-						<label for="theme_reset">', Lang::getTxt('theme_reset', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<select name="theme_reset" id="theme_reset">
-							<option value="-1" selected>', Lang::getTxt('theme_nochange', file: 'Themes'), '</option>
-							<option value="0">', Lang::getTxt('theme_forum_default', file: 'Themes'), '</option>';
-
-	// Same thing, this time for changing the theme of everyone.
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-							<option value="', $theme['id'], '">', $theme['name'], '</option>';
-	}
-
-	echo '
-						</select>
-						<span class="smalltext pick_theme"><a href="', Config::$scripturl, '?action=themechooser;u=0;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="button floatnone">', Lang::getTxt('theme_select', file: 'Themes'), '</a></span>
-					</dd>
-				</dl>
-				<input type="submit" name="save" value="' . Lang::getTxt('save', file: 'General') . '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-tm_token_var'], '" value="', Utils::$context['admin-tm_token'], '">
-			</div><!-- .windowbg -->
-		</form>';
-
-	// Link to simplemachines.org for latest themes and info!
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', Lang::getTxt('theme_adding_title', file: 'Themes'), '
-			</h3>
-		</div>
-		<div class="windowbg">
-			', Lang::getTxt('theme_adding', file: 'Themes'), '
-		</div>';
-
-	// All the install options.
-	echo '
-		<div id="admin_form_wrapper">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt('theme_install', file: 'Themes'), '
-				</h3>
-			</div>
-			<div class="windowbg">';
-
-	if (Utils::$context['can_create_new']) {
-		// From a file.
-		echo '
-				<fieldset>
-					<legend>', Lang::getTxt('theme_install_file', file: 'Themes'), '</legend>
-					<form action="', Config::$scripturl, '?action=admin;area=theme;sa=install;do=file" method="post" accept-charset="UTF-8" enctype="multipart/form-data" class="padding">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="', Utils::$context['admin-t-file_token_var'], '" value="', Utils::$context['admin-t-file_token'], '">
-						<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != \'\'; this.form.theme_dir.disabled = this.value != \'\';">
-						<input type="submit" name="save_file" value="' . Lang::getTxt('upload', file: 'General') . '" class="button">
-					</form>
-				</fieldset>';
-
-		// Copied from the default.
-		echo '
-				<fieldset>
-					<legend>', Lang::getTxt('theme_install_new', file: 'Themes'), '</legend>
-					<form action="', Config::$scripturl, '?action=admin;area=theme;sa=install;do=copy" method="post" accept-charset="UTF-8" class="padding">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="', Utils::$context['admin-t-copy_token_var'], '" value="', Utils::$context['admin-t-copy_token'], '">
-						<input type="text" name="copy" id="copy" value="', Utils::$context['new_theme_name'], '" size="40">
-						<input type="submit" name="save_copy" value="' . Lang::getTxt('save', file: 'General') . '" class="button">
-					</form>
-				</fieldset>';
-	}
-
-	// From a dir.
-	echo '
-				<fieldset>
-					<legend>', Lang::getTxt('theme_install_dir', file: 'Themes'), '</legend>
-					<form action="', Config::$scripturl, '?action=admin;area=theme;sa=install;do=dir" method="post" accept-charset="UTF-8" class="padding">
-						<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-						<input type="hidden" name="', Utils::$context['admin-t-dir_token_var'], '" value="', Utils::$context['admin-t-dir_token'], '">
-						<input type="text" name="theme_dir" id="theme_dir" value="', Utils::$context['new_theme_dir'], '" size="40">
-						<input type="submit" name="save_dir" value="' . Lang::getTxt('save', file: 'General') . '" class="button">
-					</form>
-				</fieldset>';
-
-	echo '
-			</div><!-- .windowbg -->
-		</div><!-- #admin_form_wrapper -->';
-
-	echo '
-	<script>
-		window.smfForum_scripturl = smf_scripturl;
-		window.smfForum_sessionid = smf_session_id;
-		window.smfForum_sessionvar = smf_session_var;
-		window.smfThemes_writable = ', Utils::$context['can_create_new'] ? 'true' : 'false', ';
-	</script>';
-}
-
-/**
- * This lists all themes
- */
-function template_list_themes()
-{
-	// Show a nice confirmation message.
-	if (isset($_GET['done'])) {
-		echo '
-	<div class="infobox">
-		', Lang::getTxt('theme_confirmed_' . $_GET['done'], file: 'Themes'), '
-	</div>';
-	}
-
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('themeadmin_list_heading', file: 'Themes'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('themeadmin_list_tip', file: 'Themes'), '
-		</div>
-		<form id="admin_form_wrapper" action="', Config::$scripturl, '?action=admin;area=theme;', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=list" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('theme_settings', file: 'Admin'), '</h3>
-			</div>
-			<br>';
-
-	// Show each theme.... with X for delete, an enable/disable link and a link to their own settings page.
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<span class="floatleft">
-						', $theme['name'] . (!empty($theme['version']) ? ' <em>(' . $theme['version'] . ')</em>' : ''), '
-					</span>
-					<span class="floatright">
-						', (!empty($theme['enable']) || $theme['id'] == 1 ? '<a href="' . Config::$scripturl . '?action=admin;area=theme;th=' . $theme['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=list"><span class="main_icons settings"></span></a>' : ''), '';
-
-		// You *cannot* disable/enable/delete the default theme. It's important!
-		if ($theme['id'] != 1) {
-			// Enable/Disable.
-			echo '
-						<a href="', Config::$scripturl, '?action=admin;area=theme;sa=enable;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';', Utils::$context['admin-tre_token_var'], '=', Utils::$context['admin-tre_token'], '', (!empty($theme['enable']) ? ';disabled' : ''), '" data-confirm="', Lang::getTxt('theme_' . (!empty($theme['enable']) ? 'disable' : 'enable') . '_confirm', file: 'Themes'), '" class="you_sure"><span class="main_icons ', !empty($theme['enable']) ? 'disable' : 'enable', '" title="', Lang::getTxt('theme_' . (!empty($theme['enable']) ? 'disable' : 'enable'), file: 'Themes'), '"></span></a>';
-
-			// Deleting.
-			echo '
-						<a href="', Config::$scripturl, '?action=admin;area=theme;sa=remove;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';', Utils::$context['admin-tr_token_var'], '=', Utils::$context['admin-tr_token'], '" data-confirm="', Lang::getTxt('theme_remove_confirm', file: 'Themes'), '" class="you_sure"><span class="main_icons delete" title="', Lang::getTxt('theme_remove', file: 'Themes'), '"></span></a>';
-		}
-
-		echo '
-					</span>
-				</h3>
-			</div><!-- .cat_bar -->
-			<div class="windowbg">
-				<dl class="settings themes_list">
-					<dt>', Lang::getTxt('themeadmin_list_theme_dir', file: 'Themes'), '</dt>
-					<dd', $theme['valid_path'] ? '' : ' class="error"', '>', $theme['theme_dir'], $theme['valid_path'] ? '' : ' ' . Lang::getTxt('themeadmin_list_invalid', file: 'Themes'), '</dd>
-					<dt>', Lang::getTxt('themeadmin_list_theme_url', file: 'Themes'), '</dt>
-					<dd>', $theme['theme_url'], '</dd>
-					<dt>', Lang::getTxt('themeadmin_list_images_url', file: 'Themes'), '</dt>
-					<dd>', $theme['images_url'], '</dd>
-				</dl>
-			</div>';
-	}
-
-	echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('themeadmin_list_reset', file: 'Themes'), '</h3>
-			</div>
-			<div class="windowbg">
-				<dl class="settings">
-					<dt>
-						<label for="reset_dir">', Lang::getTxt('themeadmin_list_reset_dir', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" name="reset_dir" id="reset_dir" value="', Utils::$context['reset_dir'], '" size="40">
-					</dd>
-					<dt>
-						<label for="reset_url">', Lang::getTxt('themeadmin_list_reset_url', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" name="reset_url" id="reset_url" value="', Utils::$context['reset_url'], '" size="40">
-					</dd>
-				</dl>
-				<input type="submit" name="save" value="', Lang::getTxt('themeadmin_list_reset_go', file: 'Themes'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-tl_token_var'], '" value="', Utils::$context['admin-tl_token'], '">
-			</div>
-		</form>';
-}
-
-/**
- * This lets you reset themes
- */
-function template_reset_list()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('themeadmin_reset_title', file: 'Admin'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('themeadmin_reset_tip', file: 'Themes'), '
-		</div>
-		<div id="admin_form_wrapper">';
-
-	// Show each theme.... with X for delete and a link to settings.
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-			<div class="cat_bar">
-				<h3 class="catbg">', $theme['name'], '</h3>
-			</div>
-			<div class="windowbg">
-				<ul>
-					<li>
-						<a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=reset">', Lang::getTxt('themeadmin_reset_defaults', file: 'Themes'), '</a> <em class="smalltext">', Lang::getTxt('themeadmin_reset_defaults_current', [$theme['num_default_options']], file: 'Themes'), '</em>
-					</li>
-					<li>
-						<a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=reset;who=1">', Lang::getTxt('themeadmin_reset_members', file: 'Themes'), '</a>
-					</li>
-					<li>
-						<a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=reset;who=2;', Utils::$context['admin-stor_token_var'], '=', Utils::$context['admin-stor_token'], '" data-confirm="', Lang::getTxt('themeadmin_reset_remove_confirm', file: 'Themes'), '" class="you_sure">', Lang::getTxt('themeadmin_reset_remove', file: 'Themes'), '</a> <em class="smalltext">', Lang::getTxt('themeadmin_reset_remove_current', [$theme['num_members']], file: 'Themes'), '</em>
-					</li>
-				</ul>
-			</div>';
-	}
-
-	echo '
-		</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * This displays the form for setting theme options
- */
-function template_set_options()
-{
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_settings']['theme_id'], ';sa=reset" method="post" accept-charset="UTF-8">
-			<input type="hidden" name="who" value="', Utils::$context['theme_options_reset'] ? 1 : 0, '">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					', Lang::getTxt(Utils::$context['theme_options_reset'] ? 'themeadmin_reset_options_title' : 'theme_options_title', ['theme' => Utils::$context['theme_settings']['name']], file: 'Themes'), '
-				</h3>
-			</div>
-			<div class="information noup">
-				', Lang::getTxt(Utils::$context['theme_options_reset'] ? 'themeadmin_reset_options_info' : 'theme_options_defaults', file: 'Themes'), '
-			</div>
-			<div class="windowbg noup">
-				<dl class="settings">';
-
-	$skeys = array_keys(Utils::$context['options']);
-	$first_option_key = array_shift($skeys);
-	$titled_section = false;
-
-	foreach (Utils::$context['options'] as $i => $setting) {
-		// Just spit out separators and move on
-		if (empty($setting) || !is_array($setting)) {
-			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key) {
-				echo '
-				</dl>
-				<hr>
-				<dl class="settings">';
-			}
-
-			// Should we give a name to this section?
-			if (is_string($setting) && !empty($setting)) {
-				$titled_section = true;
-				echo '
-					<dt><strong>' . $setting . '</strong></dt>
-					<dd></dd>';
-			} else {
-			$titled_section = false;
-			}
-
-			continue;
-		}
-
-		echo '
-					<dt>';
-
-		// Show the change option box?
-		if (Utils::$context['theme_options_reset']) {
-			echo '
-						<select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
-							<option value="0" selected>', Lang::getTxt('themeadmin_reset_options_none', file: 'Themes'), '</option>
-							<option value="1">', Lang::getTxt('themeadmin_reset_options_change', file: 'Themes'), '</option>
-							<option value="2">', Lang::getTxt('themeadmin_reset_options_default', file: 'Themes'), '</option>
-						</select>';
-		}
-
-		echo '
-						<label for="options_', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
-
-		if (isset($setting['description'])) {
-			echo '
-						<br>
-						<span class="smalltext">', $setting['description'], '</span>';
-		}
-		echo '
-					</dt>';
-
-		// Display checkbox options
-		if ($setting['type'] == 'checkbox') {
-			echo '
-					<dd>
-						<input type="hidden" name="' . (!empty($setting['default']) ? 'default_' : '') . 'options[' . $setting['id'] . ']" value="0">
-						<input type="checkbox" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '"', !empty($setting['value']) ? ' checked' : '', Utils::$context['theme_options_reset'] ? ' disabled' : '', ' value="1" class="floatleft">';
-		}
-
-		// How about selection lists, we all love them
-		elseif ($setting['type'] == 'list') {
-			echo '
-					<dd>
-						<select class="floatleft" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '"', Utils::$context['theme_options_reset'] ? ' disabled' : '', '>';
-
-			foreach ($setting['options'] as $value => $label) {
-				echo '
-							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
-			}
-
-			echo '
-						</select>';
-		}
-		// A textbox it is then
-		else {
-			echo '
-					<dd>';
-
-			if (isset($setting['type']) && $setting['type'] == 'number') {
-				$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
-				$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
-				$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
-
-				echo '
-						<input type="number"', $min . $max . $step;
-			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
-				echo '
-						<input type="url"';
-			} else {
-			echo '
-						<input type="text"';
-			}
-
-			echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', Utils::$context['theme_options_reset'] ? ' disabled' : '', '>';
-		}
-
-		// End of this definition, close open dds
-		echo '
-					</dd>';
-	}
-
-	// Close the option page up
-	echo '
-				</dl>
-				<input type="submit" name="submit" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-sto_token_var'], '" value="', Utils::$context['admin-sto_token'], '">
-			</div>
-		</form>';
-}
-
-/**
- * The page for setting and managing theme settings.
- */
-function template_set_settings()
-{
-	echo '
-	<div id="admin_form_wrapper">
-		<form action="', Config::$scripturl, '?action=admin;area=theme;sa=list;th=', Utils::$context['theme_settings']['theme_id'], '" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="', Config::$scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="', Lang::getTxt('help', file: 'General'), '"></span></a> ', Lang::getTxt('theme_settings_for', ['theme' => Utils::$context['theme_settings']['name']], file: 'Themes'), '
-				</h3>
-			</div>
-			<div class="windowbg">';
-
-	// @todo Why can't I edit the default theme popup.
-	if (Utils::$context['theme_settings']['theme_id'] != 1) {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg config_hd">
-						', Lang::getTxt('theme_edit', file: 'Themes'), '
-					</h3>
-				</div>
-				<div class="windowbg">
-					<ul>
-						<li>
-							<a href="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_settings']['theme_id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=edit;filename=index.template.php">', Lang::getTxt('theme_edit_index', file: 'Themes'), '</a>
-						</li>
-						<li>
-							<a href="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_settings']['theme_id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=edit;directory=css">', Lang::getTxt('theme_edit_style', file: 'Themes'), '</a>
-						</li>
-					</ul>
-				</div>';
-	}
-
-	echo '
-				<div class="title_bar">
-					<h3 class="titlebg config_hd">
-						', Lang::getTxt('theme_url_config', file: 'Themes'), '
-					</h3>
-				</div>
-				<dl class="settings">
-					<dt>
-						<label for="theme_name">', Lang::getTxt('actual_theme_name', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" id="theme_name" name="options[name]" value="', Utils::$context['theme_settings']['name'], '" size="32">
-					</dd>
-					<dt>
-						<label for="theme_url">', Lang::getTxt('actual_theme_url', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" id="theme_url" name="options[theme_url]" value="', Utils::$context['theme_settings']['actual_theme_url'], '" size="50">
-					</dd>
-					<dt>
-						<label for="images_url">', Lang::getTxt('actual_images_url', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" id="images_url" name="options[images_url]" value="', Utils::$context['theme_settings']['actual_images_url'], '" size="50">
-					</dd>
-					<dt>
-						<label for="theme_dir">', Lang::getTxt('actual_theme_dir', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="text" id="theme_dir" name="options[theme_dir]" value="', Utils::$context['theme_settings']['actual_theme_dir'], '" size="50">
-					</dd>
-				</dl>';
-
-	// Do we allow theme variants?
-	if (!empty(Utils::$context['theme_variants'])) {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg config_hd">
-						', Lang::getTxt('theme_variants', file: 'Themes'), '
-					</h3>
-				</div>
-				<dl class="settings">
-					<dt>
-						<label for="variant">', Lang::getTxt('theme_variants_default', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)">';
-
-		foreach (Utils::$context['theme_variants'] as $key => $variant) {
-			echo '
-							<option value="', $key, '"', Utils::$context['default_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
-		}
-
-		echo '
-						</select>
-					</dd>
-					<dt>
-						<label for="disable_user_variant">', Lang::getTxt('theme_variants_user_disable', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" name="options[disable_user_variant]" value="0">
-						<input type="checkbox" name="options[disable_user_variant]" id="disable_user_variant"', !empty(Utils::$context['theme_settings']['disable_user_variant']) ? ' checked' : '', ' value="1">
-					</dd>
-				</dl>
-				<img src="', Utils::$context['theme_variants'][Utils::$context['default_variant']]['thumbnail'], '" id="variant_preview" alt="">';
-	}
-
-	// Color modes for the theme?
-	if (!empty(Theme::$current->settings['has_dark_mode'])) {
-		echo '
-				<div class="title_bar">
-					<h3 class="titlebg config_hd">
-						', Lang::getTxt('theme_colormodes', file: 'Themes'), '
-					</h3>
-				</div>
-				<dl class="settings">
-					<dt>
-						<label for="colormode">', Lang::getTxt('theme_colormode_default', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<select id="colormode" name="options[default_colormode]">';
-
-		foreach (Theme::$current->settings['theme_colormodes'] as $mode) {
-			echo '
-							<option value="', $mode, '"', Theme::$current->settings['default_colormode'] == $mode ? ' selected' : '', '>', Lang::getTxt('colormode_' . $mode, file: 'Themes'), '</option>';
-		}
-
-		echo '
-						</select>
-					</dd>
-					<dt>
-						<label for="disable_user_mode">', Lang::getTxt('theme_colormode_user_disable', file: 'Themes'), '</label>
-					</dt>
-					<dd>
-						<input type="hidden" name="options[disable_user_mode]" value="0">
-						<input type="checkbox" name="options[disable_user_mode]" id="disable_user_mode"', !empty(Utils::$context['theme_settings']['disable_user_mode']) ? ' checked' : '', ' value="1">
-					</dd>
-				</dl>';
-	}
-
-	echo '
-				<div class="title_bar">
-					<h3 class="titlebg config_hd">
-						', Lang::getTxt('theme_options', file: 'Themes'), '
-					</h3>
-				</div>
-				<dl class="settings">';
-
-	$skeys = array_keys(Utils::$context['settings']);
-	$first_setting_key = array_shift($skeys);
-	$titled_section = false;
-
-	foreach (Utils::$context['settings'] as $i => $setting) {
-		// Is this a separator?
-		if (empty($setting) || !is_array($setting)) {
-			// We don't need a separator before the first list element
-			if ($i !== $first_setting_key) {
-				echo '
-				</dl>
-				<hr>
-				<dl class="settings">';
-			}
-
-			// Add a fake heading?
-			if (is_string($setting) && !empty($setting)) {
-				$titled_section = true;
-				echo '
-					<dt><strong>' . $setting . '</strong></dt>
-					<dd></dd>';
-			} else {
-			$titled_section = false;
-			}
-
-			continue;
-		}
-
-		echo '
-					<dt>
-						<label for="options_', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>:';
-
-		if (isset($setting['description'])) {
-			echo '<br>
-						<span class="smalltext">', $setting['description'], '</span>';
-		}
-
-		echo '
-					</dt>';
-
-		// A checkbox?
-		if ($setting['type'] == 'checkbox') {
-			echo '
-					<dd>
-						<input type="hidden" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" value="0">
-						<input type="checkbox" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '"', !empty($setting['value']) ? ' checked' : '', ' value="1">
-					</dd>';
-		}
-
-		// A list with options?
-		elseif ($setting['type'] == 'list') {
-			echo '
-					<dd>
-						<select name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '">';
-
-			foreach ($setting['options'] as $value => $label) {
-				echo '
-							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
-			}
-
-			echo '
-						</select>
-					</dd>';
-		}
-		// A Textarea?
-		elseif ($setting['type'] == 'textarea') {
-			echo '
-					<dd>
-						<textarea rows="4" style="width: 95%;" cols="40" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '">', $setting['value'], '</textarea>
-					</dd>';
-		}
-		// A regular input box, then?
-		else {
-			echo '
-					<dd>';
-
-			if (isset($setting['type']) && $setting['type'] == 'number') {
-				$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
-				$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
-				$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
-
-				echo '
-						<input type="number"', $min . $max . $step;
-			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
-				echo '
-						<input type="url"';
-			} elseif (isset($setting['type']) && $setting['type'] == 'color') {
-				echo '
-						<input type="color"';
-			} else {
-			echo '
-						<input type="text"';
-			}
-
-			echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? '' : (empty($setting['size']) ? ' size="40"' : ' size="' . $setting['size'] . '"'), '>
-					</dd>';
-		}
-	}
-
-	echo '
-				</dl>
-				<input type="submit" name="save" value="', Lang::getTxt('save', file: 'General'), '" class="button">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-				<input type="hidden" name="', Utils::$context['admin-sts_token_var'], '" value="', Utils::$context['admin-sts_token'], '">
-			</div><!-- .windowbg -->
-		</form>
-	</div><!-- #admin_form_wrapper -->';
-
-	if (!empty(Utils::$context['theme_variants'])) {
-		echo '
-		<script>
-		var oThumbnails = {';
-
-		// All the variant thumbnails.
-		$count = 1;
-
-		foreach (Utils::$context['theme_variants'] as $key => $variant) {
-			echo '
-			\'', $key, '\': \'', $variant['thumbnail'], '\'', (count(Utils::$context['theme_variants']) == $count ? '' : ',');
-			$count++;
-		}
-
-		echo '
-		}
-		</script>';
-	}
-}
-
-/**
- * This template allows for the selection of different themes ;)
- */
-function template_pick()
-{
-	echo '
-	<form action="', Config::$scripturl, '?action=themechooser" method="post" accept-charset="UTF-8">';
-
-	// Just go through each theme and show its information - thumbnail, etc.
-	for ($i = 0; $i < 2; $i++) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt($i == 0 ? 'current_theme' : 'theme_pick', file: 'Themes'), '</h3>
-		</div>
-		<div class="windowbg">';
-
-		// Just go through each theme and show its information - thumbnail, etc.
-		foreach (Utils::$context['available_themes'] as $theme) {
-			if (($theme['selected'] && $i == 0) || (!$theme['selected'] && $i == 1)) {
-				echo '
-			<div class="title_bar">
-				<h3 class="titlebg">
-					', $theme['name'], '
-				</h3>
-			</div>
-			<div>
-				<small><i>', $theme['description'], '</i></small>';
-
-				if (!empty($theme['variants'])) {
-					echo '
-				<label><strong>', $theme['pick_label'], '</strong>
-					<select data-theme-id="', $theme['id'], '" name="vrt[', $theme['id'], ']">';
-
-					foreach ($theme['variants'] as $key => $variant) {
-						echo '
-						<option value="', $key, '"', $theme['selected_variant'] == $key ? ' selected' : '', ' data-url="', $variant['thumbnail'], '">', $variant['label'], '</option>';
-					}
-
-					echo '
-					</select>
-				</label>';
-				}
-
-				echo '
-				<div>
-					<input type="submit" name="save[', $theme['id'], ']" value="', Lang::getTxt('theme_set', file: 'Themes'), '" class="button">
-					<a class="button" href="', Config::$scripturl, '?action=theme;sa=pick;theme=', $theme['id'], '" id="theme_preview_', $theme['id'], '">', Lang::getTxt('theme_preview', file: 'Themes'), '</a>
-				</div>
-			</div>
-			<div>
-				<a href="', Config::$scripturl, '?action=theme;sa=pick;u=', Utils::$context['current_member'], ';theme=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" id="theme_thumb_preview_', $theme['id'], '" title="', Lang::getTxt('theme_preview', file: 'Themes'), '">
-					<img src="', $theme['thumbnail_href'], '" id="theme_thumb_', $theme['id'], '" alt="" class="padding theme_thumbnail">
-				</a>
-			</div>';
-			}
-		}
-
-		echo '
-		</div>';
-	}
-
-	// One set of these for the form, not one per pass of the loop above.
-	echo '
-		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
-		<input type="hidden" name="', Utils::$context['pick-th_token_var'], '" value="', Utils::$context['pick-th_token'], '">
-		<input type="hidden" name="u" value="', Utils::$context['current_member'], '">
-	</form>';
-}
-
-/**
- * Okay, that theme was installed/updated successfully!
- */
-function template_installed()
-{
-	// The aftermath.
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['page_title'], '</h3>
-		</div>
-		<div class="windowbg">';
-
-	// Oops! there was an error :(
-	if (!empty(Utils::$context['error_message'])) {
-		echo '
-			<p>
-				', Utils::$context['error_message'], '
-			</p>';
-	}
-
-	// Not much to show except a link back...
-	else {
-	echo '
-			<p>
-				<a href="', Config::$scripturl, '?action=admin;area=theme;sa=list;th=', Utils::$context['installed_theme']['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Utils::$context['installed_theme']['name'], '</a> ', Lang::getTxt('theme_' . (isset(Utils::$context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message', file: 'Themes'), '
-			</p>
-			<p>
-				<a href="', Config::$scripturl, '?action=admin;area=theme;sa=admin;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('back', file: 'General'), '</a>
-			</p>';
-	}
-
-	echo '
-		</div><!-- .windowbg -->';
-}
-
-/**
- * The page for editing themes.
- */
-function template_edit_list()
-{
-	echo '
-	<div id="admin_form_wrapper">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('themeadmin_edit_title', file: 'Admin'), '</h3>
-		</div>
-		<div class="windowbg">';
-
-	foreach (Utils::$context['themes'] as $theme) {
-		echo '
-			<fieldset>
-				<legend>
-					<a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=edit">', $theme['name'], '</a>', !empty($theme['version']) ? '
-					<em>(' . $theme['version'] . ')</em>' : '', '
-				</legend>
-				<ul>
-					<li><a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=edit">', Lang::getTxt('themeadmin_edit_browse', file: 'Themes'), '</a></li>', $theme['can_edit_style'] ? '
-					<li><a href="' . Config::$scripturl . '?action=admin;area=theme;th=' . $theme['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=edit;directory=css">' . Lang::getTxt('themeadmin_edit_style', file: 'Themes') . '</a></li>' : '', '
-					<li><a href="', Config::$scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=copy">', Lang::getTxt('themeadmin_edit_copy_template', file: 'Themes'), '</a></li>
-				</ul>
-			</fieldset>';
-	}
-
-	echo '
-		</div><!-- .windowbg -->
-	</div><!-- #admin_form_wrapper -->';
-}
-
-/**
- * The page allowing you to copy a template from one theme to another.
- */
-function template_copy_template()
-{
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('themeadmin_edit_filename', file: 'Themes'), '</h3>
-		</div>
-		<div class="information">
-			', Lang::getTxt('themeadmin_edit_copy_warning', file: 'Themes'), '
-		</div>
-		<div class="windowbg">
-			<ul class="theme_options">';
-
-	foreach (Utils::$context['available_templates'] as $template) {
-		echo '
-				<li class="flow_hidden windowbg">
-					<span class="floatleft">', $template['filename'], $template['already_exists'] ? ' <span class="error">(' . Lang::getTxt('themeadmin_edit_exists', file: 'Themes') . ')</span>' : '', '</span>
-					<span class="floatright">';
-
-		if ($template['can_copy']) {
-			echo '
-						<a href="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', Lang::getTxt($template['already_exists'] ? 'themeadmin_edit_overwrite_confirm' : 'themeadmin_edit_copy_confirm', file: 'Themes'), '" class="you_sure">', Lang::getTxt('themeadmin_edit_do_copy', file: 'Themes'), '</a>';
-		} else {
-		echo Lang::getTxt('themeadmin_edit_no_copy', file: 'Themes');
-		}
-
-		echo '
-					</span>
-				</li>';
-	}
-
-	echo '
-			</ul>
-		</div><!-- .windowbg -->';
-}
-
-/**
- * This lets you browse a list of files in a theme so you can choose which one to edit.
- */
-function template_edit_browse()
-{
-	if (!empty(Utils::$context['browse_title'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Utils::$context['browse_title'], '</h3>
-		</div>';
-	}
-
-	echo '
-		<table class="table_grid tborder">
-			<thead>
-				<tr class="title_bar">
-					<th class="lefttext half_table" scope="col">', Lang::getTxt('themeadmin_edit_filename', file: 'Themes'), '</th>
-					<th class="quarter_table" scope="col">', Lang::getTxt('themeadmin_edit_modified', file: 'Themes'), '</th>
-					<th class="quarter_table" scope="col">', Lang::getTxt('themeadmin_edit_size', file: 'Themes'), '</th>
-				</tr>
-			</thead>
-			<tbody>';
-
-	foreach (Utils::$context['theme_files'] as $file) {
-		echo '
-				<tr class="windowbg">
-					<td>';
-
-		if ($file['is_editable']) {
-			echo '
-						<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
-		} elseif ($file['is_directory']) {
-			echo '
-						<a href="', $file['href'], '" class="is_directory"><span class="main_icons folder"></span>', $file['filename'], '</a>';
-		} else {
-		echo $file['filename'];
-		}
-
-		echo '
-					</td>
-					<td class="righttext">', !empty($file['last_modified']) ? $file['last_modified'] : '', '</td>
-					<td class="righttext">', $file['size'], '</td>
-				</tr>';
-	}
-
-	echo '
-			</tbody>
-		</table>';
-}
-
-/**
- * Wanna edit the stylesheet?
- */
-function template_edit_style()
-{
-	if (Utils::$context['session_error']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('error_session_timeout', file: 'Errors'), '
-	</div>';
-	}
-
-	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
-	echo '
-		<script>
-			var previewData = "";
-			var previewTimeout;
-			var editFilename = ', Utils::escapeJavaScript(Utils::$context['edit_filename']), ';
-
-			// Load up a page, but apply our stylesheet.
-			function navigatePreview(url)
-			{
-				var myDoc = new XMLHttpRequest();
-				myDoc.onreadystatechange = function ()
-				{
-					if (myDoc.readyState != 4)
-						return;
-
-					if (myDoc.responseText != null && myDoc.status == 200)
-					{
-						previewData = myDoc.responseText;
-						document.getElementById("css_preview_box").style.display = "";
-
-						// Revert to the theme they actually use ;).
-						var tempImage = new Image();
-						tempImage.src = smf_prepareScriptUrl(smf_scripturl) + "action=admin;area=theme;sa=edit;theme=', Theme::$current->settings['theme_id'], ';preview;" + (new Date().getTime());
-
-						refreshPreviewCache = null;
-						refreshPreview(false);
-					}
-				};
-
-				var anchor = "";
-				if (url.indexOf("#") != -1)
-				{
-					anchor = url.substr(url.indexOf("#"));
-					url = url.substr(0, url.indexOf("#"));
-				}
-
-				myDoc.open("GET", url + (url.indexOf("?") == -1 ? "?" : ";") + "theme=', Utils::$context['theme_id'], ';normalcss" + anchor, true);
-				myDoc.send(null);
-			}
-			navigatePreview(smf_scripturl);
-
-			var refreshPreviewCache;
-			function refreshPreview(check)
-			{
-				var identical = document.forms.stylesheetForm.entire_file.value == refreshPreviewCache;
-
-				// Don\'t reflow the whole thing if nothing changed!!
-				if (check && identical)
-					return;
-				refreshPreviewCache = document.forms.stylesheetForm.entire_file.value;
-				// Replace the paths for images.
-				refreshPreviewCache = refreshPreviewCache.replace(/url\(\.\.\/images/gi, "url(" + smf_images_url);
-
-				// Try to do it without a complete reparse.
-				if (identical)
-				{
-					try
-					{
-					';
-
-	if (BrowserDetector::isBrowser('is_ie')) {
-		echo '
-						var sheets = frames["css_preview_box"].document.styleSheets;
-						for (var j = 0; j < sheets.length; j++)
-						{
-							if (sheets[j].id == "css_preview_box")
-								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
-						}';
-	} else {
-	echo '
-						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);';
-	}
-	echo '
-					}
-					catch (e)
-					{
-						identical = false;
-					}
-				}
-
-				// This will work most of the time... could be done with an after-apply, maybe.
-				if (!identical)
-				{
-					var data = previewData + "";
-					var preview_sheet = document.forms.stylesheetForm.entire_file.value;
-					var stylesheetMatch = new RegExp(\'<link rel="stylesheet"[^>]+href="[^"]+\' + editFilename + \'[^>]*>\');
-
-					// Replace the paths for images.
-					preview_sheet = preview_sheet.replace(/url\(\.\.\/images/gi, "url(" + smf_images_url);
-					data = data.replace(stylesheetMatch, "<style type=\"text/css\" id=\"css_preview_sheet\">" + preview_sheet + "<" + "/style>");
-
-					frames["css_preview_box"].document.open();
-					frames["css_preview_box"].document.write(data);
-					frames["css_preview_box"].document.close();
-
-					// Next, fix all its links so we can handle them and reapply the new css!
-					frames["css_preview_box"].onload = function ()
-					{
-						var fixLinks = frames["css_preview_box"].document.getElementsByTagName("a");
-						for (var i = 0; i < fixLinks.length; i++)
-						{
-							if (fixLinks[i].onclick)
-								continue;
-							fixLinks[i].onclick = function ()
-							{
-								window.parent.navigatePreview(this.href);
-								return false;
-							};
-						}
-					};
-				}
-			}
-		</script>
-		<iframe id="css_preview_box" name="css_preview_box" src="about:blank" frameborder="0" style="display: none;"></iframe>';
-
-	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_id'], ';sa=edit" method="post" accept-charset="UTF-8" name="stylesheetForm" id="stylesheetForm">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes'), '</h3>
-			</div>
-			<div class="windowbg">';
-
-	if (!Utils::$context['allow_save']) {
-		echo '
-				', Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes'), '<br>';
-	}
-
-	echo '
-				<textarea class="edit_file" name="entire_file" cols="80" rows="20" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);">', Utils::$context['entire_file'], '</textarea>
-				<br>
-				<div class="padding righttext">
-					<input type="submit" name="save" value="', Lang::getTxt('theme_edit_save', file: 'Themes'), '"', Utils::$context['allow_save'] ? '' : ' disabled', ' class="button">
-					<input type="button" value="', Lang::getTxt('themeadmin_edit_preview', file: 'Themes'), '" onclick="refreshPreview(false);" class="button">
-				</div>
-			</div>
-			<input type="hidden" name="filename" value="', Utils::$context['edit_filename'], '">
-			<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">';
-
-	// Hopefully it exists.
-	if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])) {
-		echo '
-			<input type="hidden" name="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'], '" value="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'], '">';
-	}
-
-	echo '
-		</form>';
-}
-
-/**
- * This edits the template...
- */
-function template_edit_template()
-{
-	if (Utils::$context['session_error']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('error_session_timeout', file: 'Errors'), '
-	</div>';
-	}
-
-	if (isset(Utils::$context['parse_error'])) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('themeadmin_edit_error', file: 'Themes'), '
-		<div><pre>', Utils::$context['parse_error'], '</pre></div>
-	</div>';
-	}
-
-	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_id'], ';sa=edit" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes'), '</h3>
-			</div>
-			<div class="windowbg">';
-
-	if (!Utils::$context['allow_save']) {
-		echo '
-				', Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes'), '<br>';
-	}
-
-	foreach (Utils::$context['file_parts'] as $part) {
-		echo '
-				<label for="on_line', $part['line'], '">', Lang::getTxt('themeadmin_edit_on_line', $part, file: 'Themes'), '</label><br>
-				<div class="centertext">
-					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
-				</div>';
-	}
-
-	echo '
-				<div class="padding righttext">
-					<input type="submit" name="save" value="', Lang::getTxt('theme_edit_save', file: 'Themes'), '"', Utils::$context['allow_save'] ? '' : ' disabled', ' class="button">
-					<input type="hidden" name="filename" value="', Utils::$context['edit_filename'], '">
-					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">';
-
-	// Hopefully it exists.
-	if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])) {
-		echo '
-					<input type="hidden" name="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'], '" value="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'], '">';
-	}
-
-	echo '
-				</div><!-- .righttext -->
-			</div><!-- .windowbg -->
-		</form>';
-}
-
-/**
- * This allows you to edit a file
- */
-function template_edit_file()
-{
-	if (Utils::$context['session_error']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('error_session_timeout', file: 'Errors'), '
-	</div>';
-	}
-
-	// Is this file writeable?
-	if (!Utils::$context['allow_save']) {
-		echo '
-	<div class="errorbox">
-		', Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes'), '
-	</div>';
-	}
-
-	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
-	echo '
-		<form action="', Config::$scripturl, '?action=admin;area=theme;th=', Utils::$context['theme_id'], ';sa=edit" method="post" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes'), '</h3>
-			</div>
-			<div class="windowbg">
-				<textarea name="entire_file" id="entire_file" cols="80" rows="20" class="edit_file">', Utils::$context['entire_file'], '</textarea><br>
-				<input type="submit" name="save" value="', Lang::getTxt('theme_edit_save', file: 'Themes'), '"', Utils::$context['allow_save'] ? '' : ' disabled', ' class="button">
-				<input type="hidden" name="filename" value="', Utils::$context['edit_filename'], '">
-				<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">';
-
-	// Hopefully it exists.
-	if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])) {
-		echo '
-				<input type="hidden" name="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'], '" value="', Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'], '">';
-	}
-
-	echo '
-			</div><!-- .windowbg -->
-		</form>';
-}
diff --git a/Themes/default/TimeZoneSelect.template.php b/Themes/default/TimeZoneSelect.template.php
deleted file mode 100644
index 3ea92b80deb..00000000000
--- a/Themes/default/TimeZoneSelect.template.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\TimeZone;
-use SMF\Utils;
-
-/**
- * Template for a select menu to choose a time zone.
- *
- * @param string $name The name of the select menu.
- * @param string $selection The currently selected time zone identifier.
- * @param int $disabled If 0, the select is enabled. If 1, it is disabled.
- *    If 2, it is disabled and cannot be re-enabled by JavaScript.
- *    Default: 0.
- * @param array $extra Key-value pairs for any extra attributes to set on the
- *    select menu, where keys are attributes names. For boolean attributes, set
- *    the value to true.
- *    Default: ''.
- */
-function template_timezone_select(string $name, string $selection, int $disabled = 0, array $extra = [])
-{
-	$timezone_list = Utils::$context['all_timezones'] ?? TimeZone::list();
-
-	$attributes = [
-		'name="' . $name . '"',
-		'id="' . $name . '"',
-	];
-
-	if ($disabled) {
-		$attributes[] = 'disabled';
-	}
-
-	if ($disabled > 1) {
-		$attributes[] = 'data-force-disabled';
-	}
-
-	foreach ($extra as $key => $value) {
-		if (empty($value)) {
-			continue;
-		}
-
-		if ($value === true) {
-			$attributes[] = $key;
-		} else {
-			$attributes[] = $key . '="' . $value . '"';
-		}
-	}
-
-	// Setting width on selects inside floating elements can be flaky,
-	// so we need to calculate the width value manually.
-	$width = 0;
-
-	foreach ($timezone_list as $list) {
-		$width = max($width, max(array_map(fn($label) => Utils::entityStrlen($label), $list)));
-	}
-
-	$attributes[] = 'style="width:min(' . ($width * 0.9) . 'ch, 100%)';
-
-	echo '
-								<select ', implode(' ', $attributes), '">';
-
-	foreach ($timezone_list as $country => $list) {
-		echo '
-									<optgroup label="', $country, '">';
-
-		foreach ($list as $tzid => $label) {
-			echo '
-										<option', is_numeric($tzid) ? ' value="" disabled' : ' value="' . $tzid . '"', $tzid === $selection ? ' selected' : '', '>', $label, '</option>';
-		}
-
-		echo '
-									</optgroup>';
-	}
-
-	echo '
-								</select>';
-}
diff --git a/Themes/default/Who.template.php b/Themes/default/Who.template.php
deleted file mode 100644
index a185a3dac92..00000000000
--- a/Themes/default/Who.template.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * This handles the Who's Online page
- */
-function template_main()
-{
-	// Display the table header and linktree.
-	echo '
-	<div class="main_section" id="whos_online">
-		<form action="', Config::$scripturl, '?action=who" method="post" id="whoFilter" accept-charset="UTF-8">
-			<div class="cat_bar">
-				<h3 class="catbg">', Lang::getTxt('who_title', file: 'General'), '</h3>
-			</div>
-			<div id="mlist">
-				<div class="pagesection">
-					<div class="pagelinks floatleft">', Utils::$context['page_index'], '</div>
-					<div class="selectbox floatright" id="upper_show">
-						', Lang::getTxt('who_show', file: 'Who'), '
-						<select name="show_top" onchange="document.forms.whoFilter.show.value = this.value; document.forms.whoFilter.submit();">';
-
-	foreach (Utils::$context['show_methods'] as $value => $label) {
-		echo '
-							<option value="', $value, '" ', $value == Utils::$context['show_by'] ? ' selected' : '', '>', $label, '</option>';
-	}
-	echo '
-						</select>
-						<noscript>
-							<input type="submit" name="submit_top" value="', Lang::getTxt('go', file: 'General'), '" class="button">
-						</noscript>
-					</div>
-				</div>
-				<table class="table_grid">
-					<thead>
-						<tr class="title_bar">
-							<th scope="col" class="lefttext" style="width: 40%;"><a href="', Config::$scripturl, '?action=who;start=', Utils::$context['start'], ';show=', Utils::$context['show_by'], ';sort=user', Utils::$context['sort_direction'] != 'down' && Utils::$context['sort_by'] == 'user' ? '' : ';asc', '" rel="nofollow">', Lang::getTxt('who_user', file: 'Who'), Utils::$context['sort_by'] == 'user' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>
-							<th scope="col" class="lefttext time" style="width: 10%;"><a href="', Config::$scripturl, '?action=who;start=', Utils::$context['start'], ';show=', Utils::$context['show_by'], ';sort=time', Utils::$context['sort_direction'] == 'down' && Utils::$context['sort_by'] == 'time' ? ';asc' : '', '" rel="nofollow">', Lang::getTxt('who_time', file: 'Who'), Utils::$context['sort_by'] == 'time' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '', '</a></th>
-							<th scope="col" class="lefttext half_table">', Lang::getTxt('who_action', file: 'Who'), '</th>
-						</tr>
-					</thead>
-					<tbody>';
-
-	foreach (Utils::$context['members'] as $member) {
-		echo '
-						<tr class="windowbg">
-							<td>';
-
-		// Guests can't be messaged.
-		if (!$member['is_guest']) {
-			echo '
-								<span class="contact_info floatright">
-									', Utils::$context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . Lang::getTxt('pm_online', file: 'General') . '">' : '', '<span class="main_icons im_' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . Lang::getTxt('pm_online', file: 'General') . '"></span>', Utils::$context['can_send_pm'] ? '</a>' : '', '
-								</span>';
-		}
-
-		echo '
-								<span class="member', $member['is_hidden'] ? ' hidden' : '', '">
-									', $member['is_guest'] ? $member['name'] : '<a href="' . $member['href'] . '" title="' . Lang::getTxt('view_profile_of_username', ['name' => $member['name']], file: 'General') . '"' . (empty($member['color']) ? '' : ' style="color: ' . $member['color'] . ';"') . '>' . $member['name'] . '</a>', '
-								</span>';
-
-		if (!empty($member['ip'])) {
-			echo '
-								(<a href="' . Config::$scripturl . '?action=', ($member['is_guest'] ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $member['id']), ';searchip=' . $member['ip'] . '">' . str_replace(':', ':&ZeroWidthSpace;', $member['ip']) . '</a>)';
-		}
-
-		echo '
-							</td>
-							<td class="time">', $member['time'], '</td>
-							<td>';
-
-		if (is_array($member['action'])) {
-			$tag = !empty($member['action']['tag']) ? $member['action']['tag'] : 'span';
-
-			echo '
-								<', $tag, !empty($member['action']['class']) ? ' class="' . $member['action']['class'] . '"' : '', '>
-									', Lang::getTxt($member['action']['label'], file: 'Who'), (!empty($member['action']['error_message']) ? $member['action']['error_message'] : ''), '
-								</', $tag, '>';
-		} else {
-		echo $member['action'];
-		}
-
-		echo '
-							</td>
-						</tr>';
-	}
-
-	// No members?
-	if (empty(Utils::$context['members'])) {
-		echo '
-						<tr class="windowbg">
-							<td colspan="3">
-							', Lang::getTxt('who_no_online_' . (Utils::$context['show_by'] == 'guests' || Utils::$context['show_by'] == 'spiders' ? Utils::$context['show_by'] : 'members'), file: 'Who'), '
-							</td>
-						</tr>';
-	}
-
-	echo '
-					</tbody>
-				</table>
-				<div class="pagesection" id="lower_pagesection">
-					<div class="pagelinks floatleft" id="lower_pagelinks">', Utils::$context['page_index'], '</div>
-					<div class="selectbox floatright">
-						', Lang::getTxt('who_show', file: 'Who'), '
-						<select name="show" onchange="document.forms.whoFilter.submit();">';
-
-	foreach (Utils::$context['show_methods'] as $value => $label) {
-		echo '
-							<option value="', $value, '" ', $value == Utils::$context['show_by'] ? ' selected' : '', '>', $label, '</option>';
-	}
-	echo '
-						</select>
-						<noscript>
-							<input type="submit" value="', Lang::getTxt('go', file: 'General'), '" class="button">
-						</noscript>
-					</div>
-				</div><!-- #lower_pagesection -->
-			</div><!-- #mlist -->
-		</form>
-	</div><!-- #whos_online -->';
-}
-
-/**
- * This displays a nice credits page
- */
-function template_credits()
-{
-	// The most important part - the credits :P.
-	echo '
-	<div class="main_section" id="credits">
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('credits', file: 'Who'), '</h3>
-		</div>';
-
-	foreach (Utils::$context['credits'] as $section) {
-		if (isset($section['pretext'])) {
-			echo '
-		<div class="windowbg">
-			<p>', $section['pretext'], '</p>
-		</div>';
-		}
-
-		if (isset($section['title'])) {
-			echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', $section['title'], '</h3>
-		</div>';
-		}
-
-		echo '
-		<div class="windowbg">
-			<dl>';
-
-		foreach ($section['groups'] as $group) {
-			echo '
-				<dt>
-					', isset($group['title']) ? '<strong>' . $group['title'] . '</strong>' : '', '
-				</dt>
-				<dd>';
-
-			echo Lang::getTxt('credits_list', ['names' => Lang::sentenceList($group['members'])], file: 'Who');
-
-			echo '
-				</dd>';
-		}
-
-		echo '
-			</dl>';
-
-		if (isset($section['posttext'])) {
-			echo '
-				<p class="posttext">', $section['posttext'], '</p>';
-		}
-
-		echo '
-		</div>';
-	}
-
-	// Other software and graphics
-	if (!empty(Utils::$context['credits_software_graphics'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('credits_software_graphics', file: 'Who'), '</h3>
-		</div>
-		<div class="windowbg">';
-
-		if (!empty(Utils::$context['credits_software_graphics']['graphics'])) {
-			echo '
-			<dl>
-				<dt><strong>', Lang::getTxt('credits_graphics', file: 'Who'), '</strong></dt>
-				<dd>', implode('</dd><dd>', Utils::$context['credits_software_graphics']['graphics']), '</dd>
-			</dl>';
-		}
-
-		if (!empty(Utils::$context['credits_software_graphics']['software'])) {
-			echo '
-			<dl>
-				<dt><strong>', Lang::getTxt('credits_software', file: 'Who'), '</strong></dt>
-				<dd>', implode('</dd><dd>', Utils::$context['credits_software_graphics']['software']), '</dd>
-			</dl>';
-		}
-
-		if (!empty(Utils::$context['credits_software_graphics']['fonts'])) {
-			echo '
-			<dl>
-				<dt><strong>', Lang::getTxt('credits_fonts', file: 'Who'), '</strong></dt>
-				<dd>', implode('</dd><dd>', Utils::$context['credits_software_graphics']['fonts']), '</dd>
-			</dl>';
-		}
-		echo '
-		</div>';
-	}
-
-	// How about Modifications, we all love em
-	if (!empty(Utils::$context['credits_modifications']) || !empty(Utils::$context['copyrights']['mods'])) {
-		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('credits_modifications', file: 'Who'), '</h3>
-		</div>
-		<div class="windowbg">
-			<ul>';
-
-		// Display the credits.
-		if (!empty(Utils::$context['credits_modifications'])) {
-			echo '
-				<li>', implode('</li><li>', Utils::$context['credits_modifications']), '</li>';
-		}
-
-		// Legacy.
-		if (!empty(Utils::$context['copyrights']['mods'])) {
-			echo '
-				<li>', implode('</li><li>', Utils::$context['copyrights']['mods']), '</li>';
-		}
-
-		echo '
-			</ul>
-		</div>';
-	}
-
-	// SMF itself
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', Lang::getTxt('credits_forum', file: 'Who'), '</h3>
-		</div>
-		<div class="windowbg">
-			', Utils::$context['copyrights']['smf'], '
-		</div>
-	</div><!-- #credits -->';
-}
diff --git a/Themes/default/Xml.template.php b/Themes/default/Xml.template.php
deleted file mode 100644
index 80e8b8f016c..00000000000
--- a/Themes/default/Xml.template.php
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\Lang;
-use SMF\Utils;
-
-/**
- * This defines the XML for sending the body of a message
- */
-function template_sendbody()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<message view="', Utils::$context['view'], '">', Utils::cleanXml(Utils::$context['message']), '</message>
-</smf>';
-}
-
-/**
- * This defines the XML for the AJAX quote feature
- */
-function template_quotefast()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<quote>', Utils::cleanXml(Utils::$context['quote']['xml']), '</quote>
-</smf>';
-}
-
-/**
- * This defines the XML for the inline edit feature
- */
-function template_modifyfast()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<subject><![CDATA[', Utils::cleanXml(Utils::$context['message']['subject']), ']]></subject>
-	<message id="msg_', Utils::$context['message']['id'], '"><![CDATA[', Utils::cleanXml(Utils::$context['message']['body']), ']]></message>
-	<reason time="', Utils::$context['message']['reason']['time'], '" name="', Utils::$context['message']['reason']['name'], '"><![CDATA[', Utils::cleanXml(Utils::$context['message']['reason']['text']), ']]></reason>
-</smf>';
-
-}
-
-/**
- * The XML for handling things when you're done editing a post inline
- */
-function template_modifydone()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<message id="msg_', Utils::$context['message']['id'], '">';
-
-	if (empty(Utils::$context['message']['errors'])) {
-		// Build our string of info about when and why it was modified
-		$modified = empty(Utils::$context['message']['modified']['time']) ? '' : Lang::getTxt('last_edit_by', ['time' => Utils::$context['message']['modified']['time'], 'member' => Utils::$context['message']['modified']['name']], file: 'General');
-		$modified .= empty(Utils::$context['message']['modified']['reason']) ? '' : ' ' . Lang::getTxt('last_edit_reason', ['reason' => Utils::$context['message']['modified']['reason']], file: 'General');
-
-		echo '
-		<modified><![CDATA[', empty($modified) ? '' : Utils::cleanXml($modified), ']]></modified>
-		<subject is_first="', Utils::$context['message']['first_in_topic'] ? '1' : '0', '"><![CDATA[', Utils::cleanXml(Utils::$context['message']['subject']), ']]></subject>
-		<body><![CDATA[', Utils::$context['message']['body'], ']]></body>
-		<success><![CDATA[', Lang::getTxt('quick_modify_message', file: 'General'), ']]></success>';
-	} else {
-	echo '
-		<error in_subject="', Utils::$context['message']['error_in_subject'] ? '1' : '0', '" in_body="', Utils::cleanXml(Utils::$context['message']['error_in_body']) ? '1' : '0', '"><![CDATA[', implode('<br />', Utils::$context['message']['errors']), ']]></error>';
-	}
-	echo '
-	</message>
-</smf>';
-}
-
-/**
- * This handles things when editing a topic's subject from the messageindex.
- */
-function template_modifytopicdone()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<message id="msg_', Utils::$context['message']['id'], '">';
-
-	if (empty(Utils::$context['message']['errors'])) {
-		// Build our string of info about when and why it was modified
-		$modified = empty(Utils::$context['message']['modified']['time']) ? '' : Lang::getTxt('last_edit_by', ['time' => Utils::$context['message']['modified']['time'], 'member' => Utils::$context['message']['modified']['name']], file: 'General');
-		$modified .= empty(Utils::$context['message']['modified']['reason']) ? '' : Lang::getTxt('last_edit_reason', ['reason' => Utils::$context['message']['modified']['reason']], file: 'General');
-
-		echo '
-		<modified><![CDATA[', empty($modified) ? '' : Utils::cleanXml('<em>' . $modified . '</em>'), ']]></modified>';
-
-		if (!empty(Utils::$context['message']['subject'])) {
-			echo '
-		<subject><![CDATA[', Utils::cleanXml(Utils::$context['message']['subject']), ']]></subject>';
-		}
-	} else {
-	echo '
-		<error in_subject="', Utils::$context['message']['error_in_subject'] ? '1' : '0', '"><![CDATA[', Utils::cleanXml(implode('<br />', Utils::$context['message']['errors'])), ']]></error>';
-	}
-	echo '
-	</message>
-</smf>';
-}
-
-/**
- * The massive XML for previewing posts.
- */
-function template_post()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<preview>
-		<subject><![CDATA[', Utils::$context['preview_subject'], ']]></subject>
-		<body><![CDATA[', Utils::$context['preview_message'], ']]></body>
-	</preview>
-	<errors serious="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1', '" topic_locked="', Utils::$context['locked'] ? '1' : '0', '">';
-
-	if (!empty(Utils::$context['post_error'])) {
-		foreach (Utils::$context['post_error'] as $message) {
-			echo '
-		<error><![CDATA[', Utils::cleanXml($message), ']]></error>';
-		}
-	}
-
-	echo '
-		<caption name="guestname" class="', isset(Utils::$context['post_error']['long_name']) || isset(Utils::$context['post_error']['no_name']) || isset(Utils::$context['post_error']['bad_name']) ? 'error' : '', '" />
-		<caption name="email" class="', isset(Utils::$context['post_error']['no_email']) || isset(Utils::$context['post_error']['bad_email']) ? 'error' : '', '" />
-		<caption name="evtitle" class="', isset(Utils::$context['post_error']['no_event']) ? 'error' : '', '" />
-		<caption name="subject" class="', isset(Utils::$context['post_error']['no_subject']) ? 'error' : '', '" />
-		<caption name="question" class="', isset(Utils::$context['post_error']['no_question']) ? 'error' : '', '" />', isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? '
-		<post_error />' : '', '
-	</errors>
-	<last_msg>', Utils::$context['topic_last_message'] ?? '0', '</last_msg>';
-
-	if (!empty(Utils::$context['previous_posts'])) {
-		echo '
-	<new_posts>';
-
-		foreach (Utils::$context['previous_posts'] as $post) {
-			echo '
-		<post id="', $post['id'], '">
-			<time><![CDATA[', $post['time'], ']]></time>
-			<poster><![CDATA[', Utils::cleanXml($post['poster']), ']]></poster>
-			<message><![CDATA[', Utils::cleanXml($post['message']), ']]></message>
-			<is_ignored>', $post['is_ignored'] ? '1' : '0', '</is_ignored>
-		</post>';
-		}
-
-		echo '
-	</new_posts>';
-	}
-
-	echo '
-</smf>';
-}
-
-/**
- * All the XML for previewing a PM
- */
-function template_pm()
-{
-	// @todo something could be removed...otherwise it can be merged again with template_post
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<preview>
-		<subject><![CDATA[', Lang::getTxt('preview_subject', ['subject' => !empty(Utils::$context['preview_subject']) ? Utils::$context['preview_subject'] : Lang::getTxt('no_subject', file: 'General')]), ']]></subject>
-		<body><![CDATA[', Utils::$context['preview_message'], ']]></body>
-	</preview>
-	<errors serious="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1', '">';
-
-	if (!empty(Utils::$context['post_error']['messages'])) {
-		foreach (Utils::$context['post_error']['messages'] as $message) {
-			echo '
-		<error><![CDATA[', Utils::cleanXml($message), ']]></error>';
-		}
-	}
-
-	echo '
-		<caption name="to" class="', isset(Utils::$context['post_error']['no_to']) ? 'error' : '', '" />
-		<caption name="bbc" class="', isset(Utils::$context['post_error']['no_bbc']) ? 'error' : '', '" />
-		<caption name="subject" class="', isset(Utils::$context['post_error']['no_subject']) ? 'error' : '', '" />
-		<caption name="question" class="', isset(Utils::$context['post_error']['no_question']) ? 'error' : '', '" />', isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? '
-		<post_error />' : '', '
-	</errors>';
-
-	echo '
-</smf>';
-}
-
-/**
- * The XML for previewing a warning
- */
-function template_warning()
-{
-	// @todo something could be removed...otherwise it can be merged again with template_post
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<preview>
-		<subject><![CDATA[', Utils::$context['preview_subject'], ']]></subject>
-		<body><![CDATA[', Utils::$context['preview_message'], ']]></body>
-	</preview>
-	<errors serious="', empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1', '">';
-
-	if (!empty(Utils::$context['post_error']['messages'])) {
-		foreach (Utils::$context['post_error']['messages'] as $message) {
-			echo '
-		<error><![CDATA[', Utils::cleanXml($message), ']]></error>';
-		}
-	}
-
-	echo '
-	</errors>';
-
-	echo '
-</smf>';
-}
-
-/**
- * The XML for hiding/showing stats sections via AJAX
- */
-function template_stats()
-{
-	if (empty(Utils::$context['yearly'])) {
-		return;
-	}
-
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>';
-
-	foreach (Utils::$context['yearly'] as $year) {
-		foreach ($year['months'] as $month) {
-			echo '
-	<month id="', $month['date']['year'], $month['date']['month'], '">';
-
-			foreach ($month['days'] as $day) {
-				echo '
-		<day date="', $day['year'], '-', $day['month'], '-', $day['day'], '" new_topics="', $day['new_topics'], '" new_posts="', $day['new_posts'], '" new_members="', $day['new_members'], '" most_members_online="', $day['most_members_online'], '"', empty(Config::$modSettings['hitStats']) ? '' : ' hits="' . $day['hits'] . '"', ' />';
-			}
-
-			echo '
-	</month>';
-		}
-	}
-
-	echo '
-</smf>';
-}
-
-/**
- * The XML for selecting items to split
- */
-function template_split()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<pageIndex section="not_selected" startFrom="', Utils::$context['not_selected']['start'], '"><![CDATA[', Utils::$context['not_selected']['page_index'], ']]></pageIndex>
-	<pageIndex section="selected" startFrom="', Utils::$context['selected']['start'], '"><![CDATA[', Utils::$context['selected']['page_index'], ']]></pageIndex>';
-
-	foreach (Utils::$context['changes'] as $change) {
-		if ($change['type'] == 'remove') {
-			echo '
-	<change id="', $change['id'], '" curAction="remove" section="', $change['section'], '" />';
-		} else {
-		echo '
-	<change id="', $change['id'], '" curAction="insert" section="', $change['section'], '">
-		<subject><![CDATA[', Utils::cleanXml($change['insert_value']['subject']), ']]></subject>
-		<time><![CDATA[', Utils::cleanXml($change['insert_value']['time']), ']]></time>
-		<body><![CDATA[', Utils::cleanXml($change['insert_value']['body']), ']]></body>
-		<poster><![CDATA[', Utils::cleanXml($change['insert_value']['poster']), ']]></poster>
-	</change>';
-		}
-	}
-	echo '
-</smf>';
-}
-
-/*
- * This is just to hold off some errors if people are stupid.
- */
-if (!function_exists('template_button_strip')) {
-	function template_button_strip($button_strip, $direction = 'top', $strip_options = []) {}
-
-	function template_menu() {}
-
-	function theme_linktree() {}
-}
-
-/**
- * XML for search results
- */
-function template_results()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>';
-
-	if (empty(Utils::$context['topics'])) {
-		echo '
-		<noresults>', Lang::getTxt('search_no_results', file: 'General'), '</noresults>';
-	} else {
-		echo '
-		<results>';
-
-		while ($topic = Utils::$context['get_topics']()) {
-			echo '
-			<result>
-				<id>', $topic['id'], '</id>
-				<relevance>', $topic['relevance'], '</relevance>
-				<board>
-					<id>', $topic['board']['id'], '</id>
-					<name>', Utils::cleanXml($topic['board']['name']), '</name>
-					<href>', $topic['board']['href'], '</href>
-				</board>
-				<category>
-					<id>', $topic['category']['id'], '</id>
-					<name>', Utils::cleanXml($topic['category']['name']), '</name>
-					<href>', $topic['category']['href'], '</href>
-				</category>
-				<messages>';
-
-			foreach ($topic['matches'] as $message) {
-				echo '
-					<message>
-						<id>', $message['id'], '</id>
-						<subject><![CDATA[', Utils::cleanXml($message['subject_highlighted'] != '' ? $message['subject_highlighted'] : $message['subject']), ']]></subject>
-						<body><![CDATA[', Utils::cleanXml($message['body_highlighted'] != '' ? $message['body_highlighted'] : $message['body']), ']]></body>
-						<time>', $message['time'], '</time>
-						<timestamp>', $message['timestamp'], '</timestamp>
-						<start>', $message['start'], '</start>
-
-						<author>
-							<id>', $message['member']['id'], '</id>
-							<name>', Utils::cleanXml($message['member']['name']), '</name>
-							<href>', $message['member']['href'], '</href>
-						</author>
-					</message>';
-			}
-			echo '
-				</messages>
-			</result>';
-		}
-
-		echo '
-		</results>';
-	}
-
-	echo '
-</smf>';
-}
-
-/**
- * The XML for the Jump To box
- */
-function template_jump_to()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>';
-
-	foreach (Utils::$context['jump_to'] as $category) {
-		echo '
-	<item type="category" id="', $category['id'], '"><![CDATA[', Utils::cleanXml($category['name']), ']]></item>';
-
-		foreach ($category['boards'] as $board) {
-			echo '
-	<item type="board" id="', $board['id'], '" childlevel="', $board['child_level'], '" is_redirect="', (int) !empty($board['redirect']), '"><![CDATA[', Utils::cleanXml($board['name']), ']]></item>';
-		}
-	}
-	echo '
-</smf>';
-}
-
-/**
- * The XML for displaying a column of message icons and selecting one via AJAX
- */
-function template_message_icons()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>';
-
-	foreach (Utils::$context['icons'] as $icon) {
-		echo '
-	<icon value="', $icon['value'], '" url="', $icon['url'], '"><![CDATA[', Utils::cleanXml($icon['name']), ']]></icon>';
-	}
-
-	echo '
-</smf>';
-}
-
-/**
- * The XML for instantly showing whether a username is valid on the registration page
- */
-function template_check_username()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
-<smf>
-	<username valid="', Utils::$context['valid_username'] ? 1 : 0, '">', Utils::cleanXml(Utils::$context['checked_username']), '</username>
-</smf>';
-}
-
-/**
- * This prints XML in its most generic form.
- */
-function template_generic_xml()
-{
-	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>';
-
-	// Show the data.
-	template_generic_xml_recursive(Utils::$context['xml_data'], 'smf');
-}
-
-/**
- * Recursive function for displaying well-formed XML data.
- *
- * @param array $xml_data An array of XML data
- * @param string $parent_tag The parent tag
- * @param string $child_tag The child tag
- * @param int $level How many levels to indent the code
- * @param array $parent_attributes Attributes for the parent node
- */
-function template_generic_xml_recursive(array $xml_data, string $parent_tag, string $child_tag = '', int $level = 0, array $parent_attributes = [])
-{
-	$level = max(0, $level);
-	$indent = str_repeat("\t", $level);
-
-	echo "\n" . $indent . '<' . $parent_tag;
-
-	foreach ($parent_attributes as $attr_key => $attr_value) {
-		echo ' ' . htmlspecialchars(Utils::cleanXml($attr_key), ENT_XML1, 'UTF-8') . '="' . htmlspecialchars(Utils::cleanXml($attr_value), ENT_XML1, 'UTF-8') . '"';
-	}
-
-	echo '>';
-
-	foreach ($xml_data as $key => $data) {
-		// Handle nested groups
-		if (is_array($data) && isset($data['identifier'], $data['children'])) {
-			$node_attributes = $data['attributes'] ?? [];
-			template_generic_xml_recursive(
-				$data['children'],
-				$key,
-				$data['identifier'] ?? null,
-				$level + 1,
-				$node_attributes,
-			);
-		} // Handle individual elements
-		elseif (is_array($data) && isset($data['value'])) {
-			echo "\n" . $indent . "\t<" . ($data['identifier'] ?? $child_tag ?? $key);
-
-			if (isset($data['attributes'])) {
-				foreach ($data['attributes'] as $attr_key => $attr_value) {
-					echo ' ' . htmlspecialchars(Utils::cleanXml($attr_key), ENT_XML1, 'UTF-8') . '="' . htmlspecialchars(Utils::cleanXml($attr_value), ENT_XML1, 'UTF-8') . '"';
-				}
-			}
-
-			$escaped_value = Utils::cleanXml($data['value']);
-
-			// Self-closing tag for empty value
-			if ($escaped_value === '') {
-				echo ' />';
-			} else {
-				if (preg_match('/[<&>]/', $escaped_value)) {
-					echo '><![CDATA[' . $escaped_value . ']]>';
-				} else {
-					echo '>' . htmlspecialchars($escaped_value, ENT_XML1, 'UTF-8');
-				}
-				echo '</' . ($data['identifier'] ?? $child_tag ?? $key) . '>';
-			}
-		}
-	}
-
-	echo "\n" . $indent . '</' . $parent_tag . '>';
-}
diff --git a/Themes/default/index.template.php b/Themes/default/index.template.php
deleted file mode 100644
index c94c85a005f..00000000000
--- a/Themes/default/index.template.php
+++ /dev/null
@@ -1,931 +0,0 @@
-<?php
-
-/**
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines https://www.simplemachines.org
- * @copyright 2026 Simple Machines and individual contributors
- * @license https://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 3.0 Alpha 5-dev
- */
-
-use SMF\Config;
-use SMF\IntegrationHook;
-use SMF\Lang;
-use SMF\Theme;
-use SMF\Time;
-use SMF\User;
-use SMF\Utils;
-
-/*	This template is, perhaps, the most important template in the theme. It
-	contains the main template layer that displays the header and footer of
-	the forum, namely with main_above and main_below. It also contains the
-	menu sub template, which appropriately displays the menu; the init sub
-	template, which is there to set the theme up; (init can be missing.) and
-	the linktree sub template, which sorts out the link tree.
-
-	The init sub template should load any data and set any hardcoded options.
-
-	The main_above sub template is what is shown above the main content, and
-	should contain anything that should be shown up there.
-
-	The main_below sub template, conversely, is shown after the main content.
-	It should probably contain the copyright statement and some other things.
-
-	The linktree sub template should display the link tree, using the data
-	in the Utils::$context['linktree'] variable.
-
-	The menu sub template should display all the relevant buttons the user
-	wants and or needs.
-
-	For more information on the templating system, please see the site at:
-	https://www.simplemachines.org/
-*/
-
-/**
- * Initialize the template... mainly little settings.
- */
-function template_init()
-{
-	/* $context, $options and $txt may be available for use, but may not be fully populated yet. */
-
-	// The version this template/theme is for. This should probably be the version of SMF it was created for.
-	Theme::$current->settings['theme_version'] = '2.1';
-
-	/*
-	 * Whether this theme supports a dark mode.
-	 *
-	 * Set this to `false` to disable.
-	 *
-	 * A not so trivial note:
-	 * A 'dark' theme with dark mode is exactly the same as a 'light'
-	 * theme with dark mode. This means the index.css file should
-	 * always contain the light colors.
-	 */
-	Theme::$current->settings['has_dark_mode'] = true;
-
-	/*
-	 * Define the theme variants. Each variant has its own CSS file.
-	 *
-	 * Example:
-	 * - index_red.css is loaded when the user selects the `red` variant.
-	 *
-	 * Additionally, a variants.css file is always loaded as well, in
-	 * case you'd rather keep the styles in a single file or they're minimal.
-	 */
-	Theme::$current->settings['theme_variants'] = [];
-
-	// Set the following variable to true if this theme wants to display the avatar of the user that posted the last and the first post on the message index and recent pages.
-	Theme::$current->settings['avatars_on_indexes'] = false;
-
-	// Set the following variable to true if this theme wants to display the avatar of the user that posted the last post on the board index.
-	Theme::$current->settings['avatars_on_boardIndex'] = false;
-
-	// Set the following variable to true if this theme wants to display the login and register buttons in the main forum menu.
-	Theme::$current->settings['login_main_menu'] = false;
-
-	// This defines the formatting for the page indexes used throughout the forum.
-	Theme::$current->settings['page_index'] = [
-		'extra_before' => '<span class="pages">' . Lang::getTxt('pages', file: 'General') . '</span>',
-		'previous_page' => '<span class="main_icons previous_page"></span>',
-		'current_page' => '<span class="current_page">%1$d</span> ',
-		'page' => '<a class="nav_page" href="{URL}">%2$s</a> ',
-		'expand_pages' => '<span class="expand_pages" onclick="expandPages(this, {LINK}, {FIRST_PAGE}, {LAST_PAGE}, {PER_PAGE});"> ... </span>',
-		'next_page' => '<span class="main_icons next_page"></span>',
-		'extra_after' => '',
-	];
-
-	// Allow css/js files to be disabled for this specific theme.
-	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
-	if (!isset(Theme::$current->settings['disable_files'])) {
-		Theme::$current->settings['disable_files'] = [];
-	}
-}
-
-/**
- * The main sub template above the content.
- */
-function template_html_above()
-{
-	// Show right to left, the language code, and the character set for ease of translating.
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', !empty(Lang::getTxt('lang_locale', file: 'General')) ? ' lang="' . str_replace('_', '-', substr(Lang::getTxt('lang_locale', file: 'General'), 0, strcspn(Lang::getTxt('lang_locale', file: 'General'), '.'))) . '"' : '',!empty(Theme::$current->settings['theme_variants']) ? ' data-variant=' . (Utils::$context['theme_variant'] ?: 'default') . '' : '', !empty(Theme::$current->settings['has_dark_mode']) ? ' data-mode=' . (Utils::$context['theme_colormode'] ?? 'light') . '' : '', '>
-<head>
-	<meta charset="UTF-8">';
-
-	/*
-		You don't need to manually load index.css, this will be set up for you.
-		Note that RTL will also be loaded for you.
-		To load other CSS and JS files you should use the functions
-		Theme::loadCSSFile() and Theme::loadJavaScriptFile() respectively.
-		This approach will let you take advantage of SMF's automatic CSS
-		minimization and other benefits. You can, of course, manually add any
-		other files you want after Theme::template_css() has been run.
-
-	*	Short example:
-			- CSS: Theme::loadCSSFile('filename.css', array('minimize' => true));
-			- JS:  Theme::loadJavaScriptFile('filename.js', array('minimize' => true));
-			You can also read more detailed usages of the parameters for these
-			functions on the SMF wiki.
-
-	*	Themes:
-			The most efficient way of writing multi themes is to use a master
-			index.css plus variant.css files. If you've set them up properly
-			(through Theme::$current->settings['theme_variants']), the variant files will be loaded
-			for you automatically.
-			Additionally, tweaking the CSS for the editor requires you to include
-			a custom 'jquery.sceditor.theme.css' file in the css folder if you need it.
-
-	*	MODs:
-			If you want to load CSS or JS files in here, the best way is to use the
-			'integrate_load_theme' hook for adding multiple files, or using
-			'integrate_pre_css_output', 'integrate_pre_javascript_output' for a single file.
-	*/
-
-	// load in any css from mods or themes so they can overwrite if wanted
-	Theme::template_css();
-
-	// load in any javascript files from mods and themes
-	Theme::template_javascript();
-
-	echo '
-	<title>', Utils::$context['page_title_html_safe'], '</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">';
-
-	// Content related meta tags, like description, keywords, Open Graph stuff, etc...
-	foreach (Utils::$context['meta_tags'] as $meta_tag) {
-		echo '
-	<meta';
-
-		foreach ($meta_tag as $meta_key => $meta_value) {
-			echo ' ', $meta_key, '="', $meta_value, '"';
-		}
-
-		echo '>';
-	}
-
-	/*	What is your Lollipop's color?
-		Theme Authors, you can change the color here to make sure your theme's main color gets visible on tab */
-	echo '
-	<meta name="theme-color" content="#557EA0">';
-
-	// Please don't index these Mr Robot.
-	if (!empty(Utils::$context['robot_no_index'])) {
-		echo '
-	<meta name="robots" content="noindex">';
-	}
-
-	// Present a canonical url for search engines to prevent duplicate content in their indices.
-	if (!empty(Utils::$context['canonical_url'])) {
-		echo '
-	<link rel="canonical" href="', Utils::$context['canonical_url'], '">';
-	}
-
-	// Show all the relative links, such as help, search, contents, and the like.
-	echo '
-	<link rel="help" href="', Config::$scripturl, '?action=help">
-	<link rel="contents" href="', Config::$scripturl, '">', (Utils::$context['allow_search'] ? '
-	<link rel="search" href="' . Config::$scripturl . '?action=search">' : '');
-
-	// If RSS feeds are enabled, advertise the presence of one.
-	if (!empty(Config::$modSettings['xmlnews_enable']) && (!empty(Config::$modSettings['allow_guestAccess']) || !User::$me->is_guest)) {
-		echo '
-	<link rel="alternate" type="application/rss+xml" title="', Utils::$context['forum_name_html_safe'], ' - ', Lang::getTxt('rss', file: 'General'), '" href="', Config::$scripturl, '?action=feed;type=rss2', !empty(Utils::$context['current_board']) ? ';board=' . Utils::$context['current_board'] : '', '">
-	<link rel="alternate" type="application/atom+xml" title="', Utils::$context['forum_name_html_safe'], ' - ', Lang::getTxt('atom', file: 'General'), '" href="', Config::$scripturl, '?action=feed;type=atom', !empty(Utils::$context['current_board']) ? ';board=' . Utils::$context['current_board'] : '', '">';
-	}
-
-	// If we're viewing a topic, these should be the previous and next topics, respectively.
-	if (!empty(Utils::$context['links']['next'])) {
-		echo '
-	<link rel="next" href="', Utils::$context['links']['next'], '">';
-	}
-
-	if (!empty(Utils::$context['links']['prev'])) {
-		echo '
-	<link rel="prev" href="', Utils::$context['links']['prev'], '">';
-	}
-
-	// If we're in a board, or a topic for that matter, the index will be the board's index.
-	if (!empty(Utils::$context['current_board'])) {
-		echo '
-	<link rel="index" href="', Config::$scripturl, '?board=', Utils::$context['current_board'], '.0">';
-	}
-
-	// Output any remaining HTML headers. (from mods, maybe?)
-	echo Utils::$context['html_headers'];
-
-	echo '
-</head>
-<body id="', Utils::$context['browser_body_id'], '" class="action_', !empty(Utils::$context['current_action']) ? Utils::$context['current_action'] : (!empty(Utils::$context['current_board']) ?
-		'messageindex' : (!empty(Utils::$context['current_topic']) ? 'display' : 'home')), !empty(Utils::$context['current_board']) ? ' board_' . Utils::$context['current_board'] : '', '">
-<div id="footerfix">';
-}
-
-/**
- * The upper part of the main template layer. This is the stuff that shows above the main forum content.
- */
-function template_body_above()
-{
-	// Wrapper div now echoes permanently for better layout options. h1 a is now target for "Go up" links.
-	echo '
-	<div id="top_section">
-		<div class="inner_wrap content_wrapper">';
-
-	// If the user is logged in, display some things that might be useful.
-	if (!User::$me->is_guest) {
-		// Firstly, the user's menu
-		echo '
-			<ul class="floatleft" id="top_info">
-				<li>
-					<a href="', Config::$scripturl, '?action=profile"', !empty(Utils::$context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top">';
-
-		if (!empty(User::$me->avatar)) {
-			echo User::$me->avatar['image'];
-		}
-
-		echo '<span class="textmenu">', User::$me->name, '</span></a>
-					<div id="profile_menu" class="top_menu"></div>
-				</li>';
-
-		// Secondly, PMs if we're doing them
-		if (Utils::$context['allow_pm']) {
-			echo '
-				<li>
-					<a href="', Config::$scripturl, '?action=pm"', !empty(Utils::$context['self_pm']) ? ' class="active"' : '', ' id="pm_menu_top">
-						<span class="main_icons inbox"></span>
-						<span class="textmenu">', Lang::getTxt('pm_short', file: 'General'), '</span>', !empty(User::$me->unread_messages) ? '
-						<span class="amt">' . User::$me->unread_messages . '</span>' : '', '
-					</a>
-					<div id="pm_menu" class="top_menu scrollable"></div>
-				</li>';
-		}
-
-		// Thirdly, alerts
-		echo '
-				<li>
-					<a href="', Config::$scripturl, '?action=profile;area=showalerts;u=', User::$me->id, '"', !empty(Utils::$context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">
-						<span class="main_icons alerts"></span>
-						<span class="textmenu">', Lang::getTxt('alerts', file: 'General'), '</span>', !empty(User::$me->alerts) ? '
-						<span class="amt">' . User::$me->alerts . '</span>' : '', '
-					</a>
-					<div id="alerts_menu" class="top_menu scrollable"></div>
-				</li>';
-
-		// A logout button for people without JavaScript.
-		if (empty(Theme::$current->settings['login_main_menu'])) {
-			echo '
-				<li id="nojs_logout">
-					<a href="', Config::$scripturl, '?action=logout;', Utils::$context['session_var'], '=', Utils::$context['session_id'], '">', Lang::getTxt('logout', file: 'General'), '</a>
-					<script>document.getElementById("nojs_logout").style.display = "none";</script>
-				</li>';
-		}
-
-		// And now we're done.
-		echo '
-			</ul>';
-	}
-	// Otherwise they're a guest. Ask them to either register or login.
-	elseif (empty(Config::$maintenance)) {
-		// Some people like to do things the old-fashioned way.
-		if (!empty(Theme::$current->settings['login_main_menu'])) {
-			echo '
-			<ul class="floatleft">
-				<li class="welcome">', Lang::getTxt(
-				Utils::$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest',
-				[
-					'forum_name' => Utils::$context['forum_name_html_safe'],
-					'login_url' => Config::$scripturl . '?action=login',
-					'onclick' => 'return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript(Lang::getTxt('login', file: 'General')) . ', \'login\');',
-					'register_url' => Config::$scripturl . '?action=signup',
-				],
-				file: 'General',
-			), '</li>
-			</ul>';
-		} else {
-			echo '
-			<ul class="floatleft" id="top_info">
-				<li class="welcome">
-					', Lang::getTxt('welcome_to_forum', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General'), '
-				</li>
-				<li class="button_login">
-					<a href="', Config::$scripturl, '?action=login" class="', Utils::$context['current_action'] == 'login' ? 'active' : 'open','" onclick="return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript(Lang::getTxt('login', file: 'General')) . ', \'login\');">
-						<span class="main_icons login"></span>
-						<span class="textmenu">', Lang::getTxt('login', file: 'General'), '</span>
-					</a>
-				</li>';
-
-			if (Utils::$context['can_register']) {
-				echo '
-				<li class="button_signup">
-					<a href="', Config::$scripturl, '?action=signup" class="', Utils::$context['current_action'] == 'signup' ? 'active' : 'open','">
-						<span class="main_icons regcenter"></span>
-						<span class="textmenu">', Lang::getTxt('register', file: 'General'), '</span>
-					</a>
-				</li>';
-			}
-
-			echo '
-			</ul>';
-		}
-	} else { // In maintenance mode, only login is allowed and don't show OverlayDiv
-		echo '
-			<ul class="floatleft welcome">
-				<li>', Lang::getTxt(
-			'welcome_guest',
-			[
-				'forum_name' => Utils::$context['forum_name_html_safe'],
-				'login_url' => Config::$scripturl . '?action=login',
-				'onclick' => 'return true;',
-			],
-			file: 'General',
-		), '</li>
-			</ul>';
-	}
-
-	if (!empty(Config::$modSettings['userLanguage']) && !empty(Utils::$context['languages']) && count(Utils::$context['languages']) > 1) {
-		echo '
-			<form id="languages_form" method="get" class="floatright">
-				<select id="language_select" name="language" onchange="this.form.submit()">';
-
-		foreach (Utils::$context['languages'] as $language) {
-			echo '
-					<option value="', $language['filename'], '"', isset(User::$me->language) && User::$me->language == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
-		}
-
-		echo '
-				</select>
-				<noscript>
-					<input type="submit" value="', Lang::getTxt('quick_mod_go', file: 'General'), '">
-				</noscript>
-			</form>';
-	}
-
-	if (Utils::$context['allow_search']) {
-		echo '
-			<form id="search_form" class="floatright" action="', Config::$scripturl, '?action=search2" method="post" accept-charset="UTF-8">
-				<input type="search" name="search" value="">&nbsp;';
-
-		// Using the quick search dropdown?
-		$selected = !empty(Utils::$context['current_topic']) ? 'current_topic' : (!empty(Utils::$context['current_board']) ? 'current_board' : 'all');
-
-		echo '
-				<select name="search_selection">
-					<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', Lang::getTxt('search_entireforum', file: 'General'), ' </option>';
-
-		// Can't limit it to a specific topic if we are not in one
-		if (!empty(Utils::$context['current_topic'])) {
-			echo '
-					<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', Lang::getTxt('search_thistopic', file: 'General'), '</option>';
-		}
-
-		// Can't limit it to a specific board if we are not in one
-		if (!empty(Utils::$context['current_board'])) {
-			echo '
-					<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', Lang::getTxt('search_thisboard', file: 'General'), '</option>';
-		}
-
-		// Can't search for members if we can't see the memberlist
-		if (!empty(Utils::$context['allow_memberlist'])) {
-			echo '
-					<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', Lang::getTxt('search_members', file: 'General'), ' </option>';
-		}
-
-		echo '
-				</select>';
-
-		// Search within current topic?
-		if (!empty(Utils::$context['current_topic'])) {
-			echo '
-				<input type="hidden" name="sd_topic" value="', Utils::$context['current_topic'], '">';
-		}
-
-		// If we're on a certain board, limit it to this board ;).
-		elseif (!empty(Utils::$context['current_board'])) {
-			echo '
-				<input type="hidden" name="sd_brd" value="', Utils::$context['current_board'], '">';
-		}
-
-		echo '
-				<input type="submit" name="search2" value="', Lang::getTxt('search', file: 'General'), '" class="button">
-				<input type="hidden" name="advanced" value="0">
-			</form>';
-	}
-
-	echo '
-		</div><!-- .inner_wrap -->
-	</div><!-- #top_section -->';
-
-	echo '
-	<header id="header" class="content_wrapper">
-		<h1 class="forumtitle">
-			<a id="top" href="', Config::$scripturl, '">', empty(Utils::$context['header_logo_url_html_safe']) ? Utils::$context['forum_name_html_safe'] : '<img src="' . Utils::$context['header_logo_url_html_safe'] . '" alt="' . Utils::$context['forum_name_html_safe'] . '">', '</a>
-		</h1>';
-
-	echo '
-		', empty(Theme::$current->settings['site_slogan']) ? '<img id="smflogo" src="' . Theme::$current->settings['images_url'] . '/smflogo.svg" alt="Simple Machines Forum" title="Simple Machines Forum">' : '<div id="siteslogan">' . Theme::$current->settings['site_slogan'] . '</div>', '';
-
-	echo '
-	</header>';
-
-	// The menu is a band of its own across the page, with its contents lined up
-	// with everything else by the wrapper inside it.
-	echo '
-	<nav id="main_menu" aria-label="', Lang::getTxt('mobile_user_menu', file: 'General'), '">
-		<div class="content_wrapper">
-			<a class="mobile_user_menu">
-				<span class="menu_icon"></span>
-				<span class="text_menu">', Lang::getTxt('mobile_user_menu', file: 'General'), '</span>
-			</a>
-			<div id="mobile_user_menu" class="popup_container">
-				<div class="popup_window description">
-					<div class="popup_heading">', Lang::getTxt('mobile_user_menu', file: 'General'), '
-						<a href="javascript:void(0);" class="main_icons hide_popup"></a>
-					</div>
-					', template_menu(), '
-				</div>
-			</div>
-		</div>
-	</nav>
-	<div id="wrapper" class="content_wrapper">
-		<div id="inner_wrap"', User::$me->is_guest ? ' class="hide_720"' : '', '>
-			<div class="user">
-				<time datetime="', Time::gmstrftime('%FT%TZ'), '">', Utils::$context['current_time'], '</time>';
-
-	if (!User::$me->is_guest) {
-		echo '
-				<ul class="unread_links">
-					<li>
-						<a href="', Config::$scripturl, '?action=unread" title="', Lang::getTxt('unread_since_visit', file: 'General'), '">', Lang::getTxt('view_unread_category', file: 'General'), '</a>
-					</li>
-					<li>
-						<a href="', Config::$scripturl, '?action=unreadreplies" title="', Lang::getTxt('show_unread_replies', file: 'General'), '">', Lang::getTxt('unread_replies', file: 'General'), '</a>
-					</li>
-				</ul>';
-	}
-
-	echo '
-			</div>';
-
-	// Show a random news item? (or you could pick one from news_lines...)
-	if (!empty(Theme::$current->settings['enable_news']) && !empty(Utils::$context['random_news_line'])) {
-		echo '
-			<div class="news">
-				<h2>', Lang::getTxt('news', file: 'General'), ': </h2>
-				<p>', Utils::$context['random_news_line'], '</p>
-			</div>';
-	}
-
-	echo '
-		</div><!-- #inner_wrap -->';
-
-	theme_linktree();
-
-	// The main content should go here.
-	echo '
-		<div id="content_section">
-			<main id="main_content_section">';
-}
-
-/**
- * The stuff shown immediately below the main content, including the footer
- */
-function template_body_below()
-{
-	echo '
-			</main><!-- #main_content_section -->
-		</div><!-- #content_section -->
-	</div><!-- #wrapper -->
-</div><!-- #footerfix -->';
-
-	// Show the footer with copyright, terms and help links.
-	echo '
-	<footer id="footer">
-		<div class="content_wrapper">';
-
-	// The copyright at one end, the help links and the "Go to top" link at the
-	// other. They used to be separated by literal pipes; the gap does that now.
-	echo '
-		<ul>
-			<li class="copyright">', Theme::copyright(), '</li>
-			<li class="helplinks">
-				<a href="', Config::$scripturl, '?action=help">', Lang::getTxt('help', file: 'General'), '</a>', (!empty(Config::$modSettings['requireAgreement'])) ? '
-				<a href="' . Config::$scripturl . '?action=agreement">' . Lang::getTxt('terms_and_rules', file: 'General') . '</a>' : '', '
-				<a href="#top_section">', Lang::getTxt('go_up', file: 'General'), ' &#9650;</a>
-			</li>
-		</ul>';
-
-	// Show the load time?
-	if (Utils::$context['show_load_time']) {
-		echo '
-		<p>', Lang::getTxt(
-			'page_created_full',
-			[
-				Utils::$context['load_time'],
-				Utils::$context['load_queries'],
-			],
-			file: 'General',
-		), '</p>';
-	}
-
-	echo '
-		</div>
-	</footer><!-- #footer -->';
-
-}
-
-/**
- * This shows any deferred JavaScript and closes out the HTML
- */
-function template_html_below()
-{
-	// Load in any javascript that could be deferred to the end of the page
-	Theme::template_javascript(true);
-
-	echo '
-</body>
-</html>';
-}
-
-/**
- * Show a linktree. This is that thing that shows "My Community | General Category | General Discussion"..
- *
- * @param bool $force_show Whether to force showing it even if settings say otherwise
- */
-function theme_linktree($force_show = false)
-{
-	global $shown_linktree;
-
-	// If linktree is empty, just return - also allow an override.
-	if (empty(Utils::$context['linktree']) || (!empty(Utils::$context['dont_default_linktree']) && !$force_show)) {
-		return;
-	}
-
-	// A breadcrumb trail is a landmark, and it is an ordered list rather than an
-	// unordered one - "General Category" comes before "General Discussion".
-	echo '
-				<nav class="navigate_section" aria-label="', Lang::getTxt('breadcrumb', file: 'General'), '">
-					<ol itemscope itemtype="https://schema.org/BreadcrumbList">';
-
-	// Each tree item has a URL and name. Some may have extra_before and extra_after.
-	foreach (Utils::$context['linktree'] as $link_num => $tree) {
-		echo '
-						<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"', ($link_num == count(Utils::$context['linktree']) - 1) ? ' class="last"' : '', '>';
-
-		// Don't show a separator for the first one.
-		// Better here. Always points to the next level when the linktree breaks to a second line.
-		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
-		if ($link_num != 0) {
-			echo '
-							<span class="dividers">', Utils::$context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
-		}
-
-		// Show something before the link?
-		if (isset($tree['extra_before'])) {
-			echo $tree['extra_before'], ' ';
-		}
-
-		// Show the link, including a URL if it should have one. The itemprop
-		// attributes let a search engine read the trail as a breadcrumb.
-		if (isset($tree['url'])) {
-			echo '
-							<a itemprop="item" href="' . $tree['url'] . '"><span itemprop="name">' . $tree['name'] . '</span></a>';
-		} else {
-			echo '
-							<span itemprop="name">' . $tree['name'] . '</span>';
-		}
-
-		// Where this one sits in the trail. Positions are 1 based.
-		echo '
-							<meta itemprop="position" content="', $link_num + 1, '">';
-
-		// Show something after the link...?
-		if (isset($tree['extra_after'])) {
-			echo ' ', $tree['extra_after'];
-		}
-
-		echo '
-						</li>';
-	}
-
-	echo '
-					</ol>
-				</nav><!-- .navigate_section -->';
-
-	$shown_linktree = true;
-}
-
-/**
- * Show the menu up top. Something like [home] [help] [profile] [logout]...
- */
-function template_menu()
-{
-	echo '
-					<ul class="dropmenu menu_nav">';
-
-	// Note: Menu markup has been cleaned up to remove unnecessary spans and classes.
-	foreach (Utils::$context['menu_buttons'] as $act => $button) {
-		echo '
-						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' : '"', '>
-							<a', $button['active_button'] ? ' class="active"' : '', ' href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', isset($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', '>
-								', $button['icon'], '<span class="textmenu">', $button['title'], !empty($button['amt']) ? ' <span class="amt">' . $button['amt'] . '</span>' : '', '</span>
-							</a>';
-
-		// 2nd level menus
-		if (!empty($button['sub_buttons'])) {
-			echo '
-							<ul>';
-
-			foreach ($button['sub_buttons'] as $childbutton) {
-				echo '
-								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' : '', '>
-									<a href="', $childbutton['href'], '"', isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', isset($childbutton['onclick']) ? ' onclick="' . $childbutton['onclick'] . '"' : '', '>
-										', $childbutton['title'], !empty($childbutton['amt']) ? ' <span class="amt">' . $childbutton['amt'] . '</span>' : '', '
-									</a>';
-
-				// 3rd level menus :)
-				if (!empty($childbutton['sub_buttons'])) {
-					echo '
-									<ul>';
-
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
-						echo '
-										<li>
-											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', isset($grandchildbutton['onclick']) ? ' onclick="' . $grandchildbutton['onclick'] . '"' : '', '>
-												', $grandchildbutton['title'], !empty($grandchildbutton['amt']) ? ' <span class="amt">' . $grandchildbutton['amt'] . '</span>' : '', '
-											</a>
-										</li>';
-					}
-
-					echo '
-									</ul>';
-				}
-
-				echo '
-								</li>';
-			}
-			echo '
-							</ul>';
-		}
-		echo '
-						</li>';
-	}
-
-	echo '
-					</ul><!-- .menu_nav -->';
-}
-
-/**
- * Generate a strip of buttons.
- *
- * @param array $button_strip An array with info for displaying the strip
- * @param string $direction The direction
- * @param array $strip_options Options for the button strip
- */
-function template_button_strip($button_strip, $direction = '', $strip_options = [])
-{
-	if (!is_array($strip_options)) {
-		$strip_options = [];
-	}
-
-	// Create the buttons...
-	$buttons = [];
-
-	foreach ($button_strip as $key => $value) {
-		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
-		if (!isset($value['test']) || !empty(Utils::$context[$value['test']])) {
-			if (!isset($value['id'])) {
-				$value['id'] = $key;
-			}
-
-			$button = '
-				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . (!empty($value['icon']) ? '<span class="main_icons ' . $value['icon'] . '"></span>' : '') . Lang::getTxt($value['text']) . '</a>';
-
-			if (!empty($value['sub_buttons'])) {
-				$button .= '
-					<div class="top_menu dropmenu ' . $key . '_dropdown">
-						<div class="viewport">
-							<div class="overview">';
-
-				foreach ($value['sub_buttons'] as $element) {
-					if (isset($element['test']) && empty(Utils::$context[$element['test']])) {
-						continue;
-					}
-
-					$button .= '
-								<a href="' . $element['url'] . '"><strong>' . Lang::getTxt($element['text']) . '</strong>';
-
-					if (Lang::txtExists($element['text'] . '_desc')) {
-						$button .= '<br><span>' . Lang::getTxt($element['text'] . '_desc') . '</span>';
-					}
-
-					$button .= '</a>';
-				}
-				$button .= '
-							</div><!-- .overview -->
-						</div><!-- .viewport -->
-					</div><!-- .top_menu -->';
-			}
-
-			$buttons[] = $button;
-		}
-	}
-
-	// No buttons? No button strip either.
-	if (empty($buttons)) {
-		return;
-	}
-
-	echo '
-		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
-			', implode('', $buttons), '
-		</div>';
-}
-
-/**
- * Generate a list of quickbuttons.
- *
- * @param array $list_items An array with info for displaying the strip
- * @param string $list_class Used for integration hooks and as a class name
- * @param string $output_method The output method. If 'echo', simply displays the buttons, otherwise returns the HTML for them
- * @return void|string Returns nothing unless output_method is something other than 'echo'
- */
-function template_quickbuttons($list_items, $list_class = null, $output_method = 'echo')
-{
-	// Enable manipulation with hooks
-	if (!empty($list_class)) {
-		IntegrationHook::call('integrate_' . $list_class . '_quickbuttons', [&$list_items]);
-	}
-
-	// Make sure the list has at least one shown item
-	foreach ($list_items as $key => $li) {
-		// Is there a sublist, and does it have any shown items
-		if ($key == 'more') {
-			foreach ($li as $subkey => $subli) {
-				if (isset($subli['show']) && !$subli['show']) {
-					unset($list_items[$key][$subkey]);
-				}
-			}
-
-			if (empty($list_items[$key])) {
-				unset($list_items[$key]);
-			}
-		}
-		// A normal list item
-		elseif (isset($li['show']) && !$li['show']) {
-			unset($list_items[$key]);
-		}
-	}
-
-	// Now check if there are any items left
-	if (empty($list_items)) {
-		return;
-	}
-
-	// Print the quickbuttons
-	$output = '
-		<ul class="quickbuttons' . (!empty($list_class) ? ' quickbuttons_' . $list_class : '') . '">';
-
-	// This is used for a list item or a sublist item
-	$list_item_format = function ($li) {
-		$html = '
-			<li' . (!empty($li['class']) ? ' class="' . $li['class'] . '"' : '') . (!empty($li['id']) ? ' id="' . $li['id'] . '"' : '') . (!empty($li['custom']) ? ' ' . $li['custom'] : '') . '>';
-
-		if (isset($li['content'])) {
-			$html .= $li['content'];
-		} else {
-		$html .= '
-				<a href="' . (!empty($li['href']) ? $li['href'] : 'javascript:void(0);') . '"' . (!empty($li['javascript']) ? ' ' . $li['javascript'] : '') . '>
-					' . (!empty($li['icon']) ? '<span class="main_icons ' . $li['icon'] . '"></span>' : '') . (!empty($li['label']) ? $li['label'] : '') . '
-				</a>';
-		}
-
-		$html .= '
-			</li>';
-
-		return $html;
-	};
-
-	foreach ($list_items as $key => $li) {
-		// Handle the sublist
-		if ($key == 'more') {
-			$output .= '
-			<li class="post_options">
-				<a href="javascript:void(0);">' . Lang::getTxt('post_options', file: 'General') . '</a>
-				<ul>';
-
-			foreach ($li as $subli) {
-				$output .= $list_item_format($subli);
-			}
-
-			$output .= '
-				</ul>
-			</li>';
-		}
-		// Ordinary list item
-		else {
-		$output .= $list_item_format($li);
-		}
-	}
-
-	$output .= '
-		</ul><!-- .quickbuttons -->';
-
-	// There are a few spots where the result needs to be returned
-	if ($output_method == 'echo') {
-		echo $output;
-	} else {
-	return $output;
-	}
-}
-
-/**
- * The upper part of the maintenance warning box
- */
-function template_maint_warning_above()
-{
-	echo '
-	<div class="errorbox" id="errors">
-		<dl>
-			<dt>
-				<strong id="error_serious">', Lang::getTxt('forum_in_maintenance', file: 'General'), '</strong>
-			</dt>
-			<dd class="error" id="error_list">
-				', Lang::getTxt('maintenance_page', ['url' => Config::$scripturl . '?action=admin;area=serversettings;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']], file: 'General'), '
-			</dd>
-		</dl>
-	</div>';
-}
-
-/**
- * The lower part of the maintenance warning box.
- */
-function template_maint_warning_below() {}
-
-/**
- * The upper part of the security warning box
- */
-function template_security_warning_above()
-{
-	echo '
-	<div class="errorbox">
-		<p class="alert">!!</p>
-		<h3>', Lang::getTxt(!isset(Utils::$context['warnings']['file']) && empty(Utils::$context['auth_secret_missing']) ? 'generic_warning' : 'security_risk', file: 'General'), '</h3>';
-
-	foreach ((Utils::$context['warnings']['file'] ?? []) as $security_file) {
-		echo '
-		<p>', Lang::getTxt($security_file[0], $security_file[1], file: 'General'), '</p>';
-	}
-
-	for ($i = 0, $n = count(Utils::$context['warnings']) - 1; $i < $n; $i++) {
-		if (is_string(Utils::$context['warnings'][$i])) {
-			echo '
-		<p>' . Utils::$context['warnings'][$i] . '</p>';
-		} else {
-			echo '
-		<p>', Lang::getTxt(Utils::$context['warnings'][$i][0], Utils::$context['warnings'][$i][1] ?? [], file: 'General'), '</p>';
-		}
-	}
-
-	echo '
-	</div>';
-}
-
-/**
- * The lower part of the security warning box.
- */
-function template_security_warning_below() {}
-
-/**
- * The upper part of the ban warning box
- */
-function template_banned_warning_above()
-{
-	echo '
-	<div class="noticebox">';
-
-	echo '
-		<p>', Lang::getTxt('you_are_post_banned', ['name' => User::$me->is_guest ? Lang::getTxt('guest_title', file: 'General') : User::$me->name]), '</p>';
-
-	if (!empty($_SESSION['ban']['cannot_post']['reason'])) {
-		echo '
-		<p>', $_SESSION['ban']['cannot_post']['reason'], '</p>';
-	}
-
-	if (!empty($_SESSION['ban']['expire_time'])) {
-		echo '
-		<p>', Lang::getTxt('your_ban_expires', ['datetime' => Time::create('@' . $_SESSION['ban']['expire_time'])->format(null, false)], file: 'General'), '</p>';
-	} else {
-		echo '
-		<p>', Lang::getTxt('your_ban_expires_never', file: 'General'), '</p>';
-	}
-
-	echo '
-	</div>';
-}
-
-/**
- * The lower part of the ban warning box.
- */
-function template_banned_warning_below() {}
diff --git a/Themes/default/templates/Admin/admin.php b/Themes/default/templates/Admin/admin.php
new file mode 100644
index 00000000000..753dfa6b9d9
--- /dev/null
+++ b/Themes/default/templates/Admin/admin.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is the administration center home.
+ */
+?>
+
+<?php /* Is there an update available? */ ?>
+						<div id="update_section"></div>
+						<div id="admin_main_section">
+<?php /* Display the "live news" from simplemachines.org. */ ?>
+							<div id="live_news" class="floatleft">
+								<div class="cat_bar">
+									<h3 class="catbg">
+										<a href="<?= Config::$scripturl ?>?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('live', file: 'Admin') ?>
+									</h3>
+								</div>
+								<div class="windowbg nopadding">
+									<div id="smfAnnouncements"><?= Lang::getTxt('smf_news_cant_connect', file: 'Admin') ?></div>
+								</div>
+							</div>
+<?php /* Show the user version information from their server. */ ?>
+							<div id="support_info" class="floatright">
+								<div class="cat_bar">
+									<h3 class="catbg">
+										<a href="<?= Config::$scripturl ?>?action=admin;area=credits"><?= Lang::getTxt('support_title', file: 'Admin') ?></a>
+									</h3>
+								</div>
+								<div class="windowbg nopadding">
+									<div id="version_details" class="padding">
+										<strong><?= Lang::getTxt('support_versions', file: 'Admin') ?></strong>
+										<ul>
+											<li><?= Lang::getTxt('support_versions_forum', ['version' => Utils::$context['forum_version']], file: 'Admin') ?></li>
+											<li><?= Lang::getTxt('support_versions_current', ['version' => '??'], file: 'Admin') ?></li>
+											<li><?= Utils::$context['can_admin'] ? '<a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=routine;activity=version">' . Lang::getTxt('version_check_more', file: 'Admin') . '</a>' : '' ?></li>
+										</ul>
+<?php /* Display all the members who can administrate the forum. */ ?>
+										<br>
+										<?= Lang::getTxt('administrators', ['list' => Lang::sentenceList(Utils::$context['administrators'])], file: 'Admin') ?>
+
+<?php /* If we have lots of admins... don't show them all. */ ?>
+<?php if (!empty(Utils::$context['more_admins_link'])): ?>
+										(<?= Utils::$context['more_admins_link'] ?>)
+<?php endif; ?>
+									</div><!-- #version_details -->
+								</div><!-- .windowbg -->
+							</div><!-- #support_info -->
+						</div><!-- #admin_main_section -->
+<?php foreach (Utils::$context[Utils::$context['admin_menu_name']]['sections'] as $area_id => $area): ?>
+						<fieldset id="group_<?= $area_id ?>" class="windowbg admin_group">
+							<legend><?= $area['title'] ?></legend>
+<?php foreach ($area['areas'] as $item_id => $item): ?>
+<?php /* No point showing the 'home' page here, we're already on it! */ ?>
+<?php if ($area_id == 'forum' && $item_id == 'index'): ?>
+<?php continue; ?>
+<?php endif; ?>
+<?php $url = $item['url'] ?? Config::$scripturl . '?action=admin;area=' . $item_id . (!empty(Utils::$context[Utils::$context['admin_menu_name']]['extra_parameters']) ? Utils::$context[Utils::$context['admin_menu_name']]['extra_parameters'] : ''); ?>
+<?php if (!empty($item['icon_file'])): ?>
+							<a href="<?= $url ?>" class="admin_group<?= !empty($item['inactive']) ? ' inactive' : '' ?>"><img class="large_admin_menu_icon_file" src="<?= $item['icon_file'] ?>" alt=""><?= $item['label'] ?></a>
+<?php else: ?>
+							<a href="<?= $url ?>"><span class="large_<?= $item['icon_class'] ?><?= !empty($item['inactive']) ? ' inactive' : '' ?>"></span><?= $item['label'] ?></a>
+<?php endif; ?>
+<?php endforeach; ?>
+						</fieldset>
+<?php endforeach; ?>
+<?php /* The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization. */ ?>
+<?php if (empty(Config::$modSettings['disable_smf_js'])): ?>
+					<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=current-version.js"></script>
+					<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=latest-news.js"></script>
+<?php endif; ?>
+<?php /* This sets the announcements and current versions themselves ;). */ ?>
+					<script>
+						var oAdminIndex = new smf_AdminIndex({
+
+							bLoadAnnouncements: true,
+							sAnnouncementTemplate: <?= Utils::escapeJavaScript('
+								<dl>
+									%content%
+								</dl>
+							') ?>,
+							sAnnouncementMessageTemplate: <?= Utils::escapeJavaScript('
+								<dt><a href="%href%">%subject%</a>%time%</dt>
+								<dd>
+									%message%
+								</dd>
+							') ?>,
+							sAnnouncementContainerId: 'smfAnnouncements',
+
+							bLoadVersions: true,
+							sSmfVersionContainerId: 'smfVersion',
+							sYourVersionContainerId: 'yourVersion',
+							sVersionOutdatedTemplate: <?= Utils::escapeJavaScript('
+								<span class="alert">%currentVersion%</span>
+							') ?>,
+
+							bLoadUpdateNotification: true,
+							sUpdateNotificationContainerId: 'update_section',
+							sUpdateNotificationDefaultTitle: <?= Utils::escapeJavaScript(Lang::getTxt('update_available', file: 'Admin')) ?>,
+							sUpdateNotificationDefaultMessage: <?= Utils::escapeJavaScript(Lang::getTxt('update_message', file: 'Admin')) ?>,
+							sUpdateNotificationTemplate: <?= Utils::escapeJavaScript('
+								<h3 id="update_title">
+									%title%
+								</h3>
+								<div id="update_message" class="smalltext">
+									%message%
+								</div>
+							') ?>,
+							sUpdateNotificationLink: smf_scripturl + <?= Utils::escapeJavaScript('?action=admin;area=packages;pgdownload;auto;package=%package%;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>
+
+						});
+					</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/admin_quick_search.php b/Themes/default/templates/Admin/admin_quick_search.php
new file mode 100644
index 00000000000..1471ccb7943
--- /dev/null
+++ b/Themes/default/templates/Admin/admin_quick_search.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This shows the admin search form
+ */
+?><?php if (User::$me->is_admin): ?>
+								<form action="<?= Config::$scripturl ?>?action=admin;area=search" method="post" accept-charset="UTF-8" class="admin_search">
+									<span class="main_icons filter centericon"></span>
+									<input type="search" name="search_term" placeholder="<?= Lang::getTxt('admin_search', file: 'Admin') ?>"<?= isset(Utils::$context['search_term']) ? ' value="' . Utils::$context['search_term'] . '"' : '' ?>>
+									<select name="search_type">
+										<option value="internal"<?= (empty(Utils::$context['admin_preferences']['sb']) || Utils::$context['admin_preferences']['sb'] == 'internal' ? ' selected' : '') ?>><?= Lang::getTxt('admin_search_type_internal', file: 'Admin') ?></option>
+										<option value="member"<?= (!empty(Utils::$context['admin_preferences']['sb']) && Utils::$context['admin_preferences']['sb'] == 'member' ? ' selected' : '') ?>><?= Lang::getTxt('admin_search_type_member', file: 'Admin') ?></option>
+										<option value="online"<?= (!empty(Utils::$context['admin_preferences']['sb']) && Utils::$context['admin_preferences']['sb'] == 'online' ? ' selected' : '') ?>><?= Lang::getTxt('admin_search_type_online', file: 'Admin') ?></option>
+									</select>
+									<input type="submit" name="search_go" id="search_go" value="<?= Lang::getTxt('admin_search_go', file: 'Admin') ?>" class="button">
+								</form><?php endif; ?>
diff --git a/Themes/default/templates/Admin/admin_search_results.php b/Themes/default/templates/Admin/admin_search_results.php
new file mode 100644
index 00000000000..721e47c38b5
--- /dev/null
+++ b/Themes/default/templates/Admin/admin_search_results.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Results page for an admin search.
+ */
+?>
+						<div id="section_header" class="cat_bar">
+							<h3 class="catbg">
+								<span id="quick_search_results">
+									<?= Lang::getTxt('admin_search_results_desc', Utils::$context, file: 'Admin') ?>
+								</span>
+							</h3>
+							<?php $this->subTemplate('admin_quick_search'); ?>
+						</div><!-- #section_header -->
+						<div class="windowbg generic_list_wrapper">
+<?php if (empty(Utils::$context['search_results'])): ?>
+							<p class="centertext">
+								<strong><?= Lang::getTxt('admin_search_results_none', file: 'Admin') ?></strong>
+							</p>
+<?php else: ?>
+							<ol class="search_results">
+<?php foreach (Utils::$context['search_results'] as $result): ?>
+<?php /* Is it a result from the online manual? */ ?>
+<?php if (Utils::$context['search_type'] == 'online'): ?>
+								<li>
+									<p>
+										<a href="<?= Utils::$context['doc_scripturl'] ?><?= str_replace(' ', '_', $result['title']) ?>" target="_blank" rel="noopener"><strong><?= $result['title'] ?></strong></a>
+									</p>
+									<p class="double_height">
+										<?= $result['snippet'] ?>
+									</p>
+								</li>
+<?php /* Otherwise it's... not! */ ?>
+<?php else: ?>
+								<li>
+									<a href="<?= $result['url'] ?>"><strong><?= $result['name'] ?></strong></a> [<?= Lang::txtExists('admin_search_section_' . $result['type'], file: 'Admin') ? Lang::getTxt('admin_search_section_' . $result['type'], file: 'Admin') : $result['type'] ?>]
+<?php if ($result['help']): ?>
+									<p class="double_height"><?= $result['help'] ?></p>
+<?php endif; ?>
+								</li>
+<?php endif; ?>
+<?php endforeach; ?>
+							</ol>
+<?php endif; ?>
+						</div><!-- .generic_list_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/callback_question_answer_list.php b/Themes/default/templates/Admin/callback_question_answer_list.php
new file mode 100644
index 00000000000..92fe14fca2a
--- /dev/null
+++ b/Themes/default/templates/Admin/callback_question_answer_list.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This little beauty shows questions and answer from the captcha type feature.
+ */
+?><?php foreach (Utils::$context['languages'] as $lang_id => $lang): ?><?php
+$lang_id = strtr($lang_id, ['-utf8' => '']);
+$lang['name'] = strtr($lang['name'], ['-utf8' => '']);
+?>
+						<dt id="qa_dt_<?= $lang_id ?>" class="qa_link">
+							<a href="javascript:void(0);">[ <?= $lang['name'] ?> ]</a>
+						</dt>
+						<fieldset id="qa_fs_<?= $lang_id ?>" class="qa_fieldset">
+							<legend><a href="javascript:void(0);"><?= $lang['name'] ?></a></legend>
+							<dl class="settings">
+								<dt>
+									<strong><?= Lang::getTxt('setup_verification_question', file: 'ManageSettings') ?></strong>
+								</dt>
+								<dd>
+									<strong><?= Lang::getTxt('setup_verification_answer', file: 'ManageSettings') ?></strong>
+								</dd><?php if (!empty(Utils::$context['qa_by_lang'][$lang_id])): ?><?php foreach (Utils::$context['qa_by_lang'][$lang_id] as $q_id): ?><?php $question = Utils::$context['question_answers'][$q_id]; ?>
+								<dt>
+									<input type="text" name="question[<?= $lang_id ?>][<?= $q_id ?>]" value="<?= $question['question'] ?>" size="50" class="verification_question">
+								</dt>
+								<dd><?php foreach ($question['answers'] as $answer): ?>
+									<input type="text" name="answer[<?= $lang_id ?>][<?= $q_id ?>][]" value="<?= $answer ?>" size="50" class="verification_answer"><?php endforeach; ?>
+									<div class="qa_add_answer"><a href="javascript:void(0);">[ <?= Lang::getTxt('setup_verification_add_answer', file: 'ManageSettings') ?> ]</a></div>
+								</dd><?php endforeach; ?><?php endif; ?>
+								<dt class="qa_add_question"><a href="javascript:void(0);">[ <?= Lang::getTxt('setup_verification_add_more', file: 'ManageSettings') ?> ]</a></dt>
+							</dl>
+						</fieldset><?php endforeach; ?>
diff --git a/Themes/default/templates/Admin/clean_cache_button_above.php b/Themes/default/templates/Admin/clean_cache_button_above.php
new file mode 100644
index 00000000000..9e8e00cf9ea
--- /dev/null
+++ b/Themes/default/templates/Admin/clean_cache_button_above.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Content shown above the clean cache button
+ */
diff --git a/Themes/default/templates/Admin/clean_cache_button_below.php b/Themes/default/templates/Admin/clean_cache_button_below.php
new file mode 100644
index 00000000000..e2cd8163f76
--- /dev/null
+++ b/Themes/default/templates/Admin/clean_cache_button_below.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Content shown below the clean cache button?
+ */
+?>
+					<div class="cat_bar">
+						<h3 class="catbg"><?= Lang::getTxt('maintain_cache', file: 'ManageMaintenance') ?></h3>
+					</div>
+					<div class="windowbg">
+						<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=routine;activity=cleancache" method="post" accept-charset="UTF-8">
+							<p><?= Lang::getTxt('maintain_cache_info', file: 'ManageMaintenance') ?></p>
+							<span><input type="submit" value="<?= Lang::getTxt('maintain_run_now', file: 'ManageMaintenance') ?>" class="button"></span>
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+							<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+						</form>
+					</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/credits.php b/Themes/default/templates/Admin/credits.php
new file mode 100644
index 00000000000..0d1b6848fc1
--- /dev/null
+++ b/Themes/default/templates/Admin/credits.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show some support information and credits to those who helped make this.
+ */
+?><?php /* Show the user version information from their server. */ ?>
+					<div class="roundframe noup">
+						<div class="title_bar">
+							<h3 class="titlebg">
+								<?= Lang::getTxt('support_title', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div class="padding">
+							<img src="<?= Theme::$current->settings['images_url'] ?>/smflogo.svg" class="floatright" alt="">
+							<strong><?= Lang::getTxt('support_versions', file: 'Admin') ?></strong>
+							<ul>
+								<li><?= Lang::getTxt('support_versions_forum', ['version' => Utils::$context['forum_version']], file: 'Admin') ?><?= Utils::$context['can_admin'] ? ' <a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=routine;activity=version">' . Lang::getTxt('version_check_more', file: 'Admin') . '</a>' : '' ?></li>
+								<li><?= Lang::getTxt('support_versions_current', ['version' => '??'], file: 'Admin') ?></li>
+							</ul><?php /* Display all the variables we have server information for. */ ?><?php foreach (Utils::$context['current_versions'] as $version): ?>
+								<?= $version['title'] ?>:
+							<em><?= $version['version'] ?></em><?php /* more details for this item, show them a link */ ?><?php if (Utils::$context['can_admin'] && isset($version['more'])): ?> <a href="<?= Config::$scripturl ?><?= $version['more'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('version_check_more', file: 'Admin') ?></a><?php endif; ?>
+							<br><?php endforeach; ?>
+						</div><!-- .padding --><?php /* Point the admin to common support resources. */ ?>
+						<div id="support_resources" class="title_bar">
+							<h3 class="titlebg">
+								<?= Lang::getTxt('support_resources', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div class="padding">
+							<p><?= Lang::getTxt('support_resources_p1', file: 'Admin') ?></p>
+							<p><?= Lang::getTxt('support_resources_p2', file: 'Admin') ?></p>
+						</div><?php /* The most important part - the credits :P. */ ?>
+						<div id="credits_sections" class="title_bar">
+							<h3 class="titlebg">
+								<?= Lang::getTxt('admin_credits', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div id="support_credits_list" class="padding"><?php foreach (Utils::$context['credits'] as $section): ?><?php if (isset($section['pretext'])): ?>
+							<p><?= $section['pretext'] ?></p>
+							<hr><?php endif; ?>
+							<dl><?php foreach ($section['groups'] as $group): ?><?php if (isset($group['title'])): ?>
+								<dt>
+									<strong><?= $group['title'] ?></strong>
+								</dt><?php endif; ?>
+								<dd><?= implode(', ', $group['members']) ?></dd><?php endforeach; ?>
+							</dl><?php if (isset($section['posttext'])): ?>
+							<hr>
+							<p><?= $section['posttext'] ?></p><?php endif; ?><?php endforeach; ?>
+						</div><!-- .padding -->
+					</div><!-- #support_credits --><?php /* This makes all the support information available to the support script... */ ?>
+					<script>
+						var smfSupportVersions = {};
+
+						smfSupportVersions.forum = "<?= Utils::$context['forum_version'] ?>";<?php /* Don't worry, none of this is logged, it's just used to give information that might be of use. */ ?><?php foreach (Utils::$context['current_versions'] as $variable => $version): ?>
+
+						smfSupportVersions.<?= $variable ?> = "<?= $version['version'] ?>";<?php endforeach; ?><?php /* Now we just have to include the script and wait ;). */ ?>
+
+					</script>
+					<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=current-version.js"></script>
+					<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=latest-news.js"></script><?php /* This sets the latest support stuff. */ ?>
+					<script>
+						function smfCurrentVersion()
+						{
+							var smfVer, yourVer;
+
+							if (!window.smfVersion)
+								return;
+
+							smfVer = document.getElementById("smfVersion");
+							yourVer = document.getElementById("yourVersion");
+
+							setInnerHTML(smfVer, window.smfVersion);
+
+							var currentVersion = getInnerHTML(yourVer);
+							if (currentVersion != window.smfVersion)
+								setInnerHTML(yourVer, "<span class=\"alert\">" + currentVersion + "</span>");
+						}
+						addLoadEvent(smfCurrentVersion)
+					</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/edit_censored.php b/Themes/default/templates/Admin/edit_censored.php
new file mode 100644
index 00000000000..c25cb1d34f0
--- /dev/null
+++ b/Themes/default/templates/Admin/edit_censored.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Form for stopping people using naughty words, etc.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+					<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?><?php /* First section is for adding/removing words from the censored list. */ ?>
+						<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=postsettings;sa=censor" method="post" accept-charset="UTF-8">
+							<div id="section_header" class="cat_bar">
+								<h3 class="catbg">
+									<?= Lang::getTxt('admin_censored_words', file: 'Admin') ?>
+								</h3>
+							</div>
+							<div class="windowbg">
+								<p><?= Lang::getTxt('admin_censored_where', file: 'Admin') ?></p><?php /* Show text boxes for censoring [bad   ] => [good  ]. */ ?><?php foreach (Utils::$context['censored_words'] as $vulgar => $proper): ?>
+								<div class="block">
+									<input type="text" name="censor_vulgar[]" value="<?= $vulgar ?>" size="30"> =&gt; <input type="text" name="censor_proper[]" value="<?= $proper ?>" size="30">
+								</div><?php endforeach; ?><?php /* Now provide a way to censor more words. */ ?>
+								<div class="block">
+									<input type="text" name="censor_vulgar[]" size="30"> =&gt; <input type="text" name="censor_proper[]" size="30">
+								</div>
+								<div id="moreCensoredWords"></div>
+								<div class="block hidden" id="moreCensoredWords_link">
+									<a class="button" href="#" onclick="addNewWord(); return false;"><?= Lang::getTxt('censor_clickadd', file: 'Admin') ?></a><br>
+								</div>
+								<script>
+									document.getElementById("moreCensoredWords_link").classList.remove('hidden');
+								</script>
+								<hr>
+								<dl class="settings">
+									<dt>
+										<strong><label for="allow_no_censored"><?= Lang::getTxt('allow_no_censored', file: 'Themes') ?></label></strong>
+									</dt>
+									<dd>
+										<input type="checkbox" name="allow_no_censored" value="1" id="allow_no_censored"<?= empty(Config::$modSettings['allow_no_censored']) ? '' : ' checked' ?>>
+									</dd>
+									<dt>
+										<strong><label for="censorWholeWord_check"><?= Lang::getTxt('censor_whole_words', file: 'Admin') ?></label></strong>
+									</dt>
+									<dd>
+										<input type="checkbox" name="censorWholeWord" value="1" id="censorWholeWord_check"<?= empty(Config::$modSettings['censorWholeWord']) ? '' : ' checked' ?>>
+									</dd>
+									<dt>
+										<strong><label for="censorIgnoreCase_check"><?= Lang::getTxt('censor_case', file: 'Admin') ?></label></strong>
+									</dt>
+									<dd>
+										<input type="checkbox" name="censorIgnoreCase" value="1" id="censorIgnoreCase_check"<?= empty(Config::$modSettings['censorIgnoreCase']) ? '' : ' checked' ?>>
+									</dd>
+									<dt>
+										<a id="spoofdetector_censor_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=spoofdetector_censor" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+										<strong><label for="spoofdetector_censor_check"><?= Lang::getTxt('spoofdetector_censor', file: 'Admin') ?></label></strong>
+										<br>
+										<span class="smalltext"><?= Lang::getTxt('spoofdetector_censor_desc', file: 'Admin') ?></span>
+
+									</dt>
+									<dd>
+										<input type="checkbox" name="spoofdetector_censor" value="1" id="spoofdetector_censor_check"<?= empty(Config::$modSettings['spoofdetector_censor']) ? '' : ' checked' ?>>
+									</dd>
+								</dl>
+								<input type="submit" name="save_censor" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+							</div><!-- .windowbg --><?php /* This table lets you test out your filters by typing in rude words and seeing what comes out. */ ?>
+							<div class="cat_bar">
+								<h3 class="catbg">
+									<?= Lang::getTxt('censor_test', file: 'Admin') ?>
+								</h3>
+							</div>
+							<div class="windowbg">
+								<p class="centertext">
+									<input type="text" name="censortest" value="<?= empty(Utils::$context['censor_test']) ? '' : Utils::$context['censor_test'] ?>">
+									<input type="submit" value="<?= Lang::getTxt('censor_test_save', file: 'Admin') ?>" class="button">
+								</p>
+							</div>
+
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+							<input type="hidden" name="<?= Utils::$context['admin-censor_token_var'] ?>" value="<?= Utils::$context['admin-censor_token'] ?>">
+						</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/edit_profile_field.php b/Themes/default/templates/Admin/edit_profile_field.php
new file mode 100644
index 00000000000..57aa889776e
--- /dev/null
+++ b/Themes/default/templates/Admin/edit_profile_field.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for editing a custom profile field
+ */
+?>
+
+<?php /* All the javascript for this page - quite a bit in script.js! */ ?>
+					<script>
+						var startOptID = <?= count(Utils::$context['field']['options']) ?>;
+					</script>
+<?php /* any errors messages to show? */ ?>
+<?php if (isset($_GET['msg'])): ?>
+<?php if (Lang::txtExists('custom_option_' . $_GET['msg'], file: 'Errors')): ?>
+					<div class="errorbox"><?= Lang::getTxt('custom_option_' . $_GET['msg'], file: 'Errors') ?>
+					</div>
+<?php endif; ?>
+<?php endif; ?>
+						<form action="<?= Config::$scripturl ?>?action=admin;area=featuresettings;sa=profileedit;fid=<?= Utils::$context['fid'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+							<div id="section_header" class="cat_bar">
+								<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+							</div>
+							<div class="windowbg">
+								<fieldset>
+									<legend><?= Lang::getTxt('custom_edit_general', file: 'ManageSettings') ?></legend>
+
+									<dl class="settings">
+										<dt>
+											<a id="field_name_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+											<strong><label for="field_name"><?= Lang::getTxt('custom_edit_name', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<input type="text" name="field_name" id="field_name" value="<?= Utils::$context['field']['name'] ?>" size="20" maxlength="40">
+										</dd>
+										<dt>
+											<a id="field_desc_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);" class="help">
+												<span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span>
+											</a>
+											<strong><label for="field_desc"><?= Lang::getTxt('custom_edit_desc', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<textarea name="field_desc" id="field_desc" rows="3" cols="40"><?= Utils::$context['field']['desc'] ?></textarea>
+										</dd>
+										<dt>
+											<strong><label for="profile_area"><?= Lang::getTxt('custom_edit_profile', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_profile_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<select name="profile_area" id="profile_area">
+												<option value="none"<?= Utils::$context['field']['profile_area'] == 'none' ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_profile_none', file: 'ManageSettings') ?></option>
+												<option value="account"<?= Utils::$context['field']['profile_area'] == 'account' ? ' selected' : '' ?>><?= Lang::getTxt('account', file: 'General') ?></option>
+												<option value="forumprofile"<?= Utils::$context['field']['profile_area'] == 'forumprofile' ? ' selected' : '' ?>><?= Lang::getTxt('forumprofile', file: 'General') ?></option>
+												<option value="theme"<?= Utils::$context['field']['profile_area'] == 'theme' ? ' selected' : '' ?>><?= Lang::getTxt('theme', file: 'General') ?></option>
+											</select>
+										</dd>
+										<dt>
+											<a id="field_reg_require" href="<?= Config::$scripturl ?>?action=helpadmin;help=field_reg_require" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+											<strong><label for="reg"><?= Lang::getTxt('custom_edit_registration', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<select name="reg" id="reg">
+												<option value="0"<?= Utils::$context['field']['reg'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_registration_disable', file: 'ManageSettings') ?></option>
+												<option value="1"<?= Utils::$context['field']['reg'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_registration_allow', file: 'ManageSettings') ?></option>
+												<option value="2"<?= Utils::$context['field']['reg'] == 2 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_registration_require', file: 'ManageSettings') ?></option>
+											</select>
+										</dd>
+										<dt>
+											<strong><label for="display"><?= Lang::getTxt('custom_edit_display', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<input type="checkbox" name="display" id="display"<?= Utils::$context['field']['display'] ? ' checked' : '' ?>>
+										</dd>
+										<dt>
+											<strong><label for="mlist"><?= Lang::getTxt('custom_edit_mlist', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<input type="checkbox" name="mlist" id="show_mlist"<?= Utils::$context['field']['mlist'] ? ' checked' : '' ?>>
+										</dd>
+										<dt>
+											<strong><label for="placement"><?= Lang::getTxt('custom_edit_placement', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<select name="placement" id="placement">
+<?php foreach (Utils::$context['cust_profile_fields_placement'] as $order => $name): ?>
+												<option value="<?= $order ?>"<?= Utils::$context['field']['placement'] == $order ? ' selected' : '' ?>><?= Lang::getTxt('custom_profile_placement_' . $name, file: 'ManageSettings') ?></option>
+<?php endforeach; ?>
+											</select>
+										</dd>
+										<dt>
+											<a id="field_show_enclosed" href="<?= Config::$scripturl ?>?action=helpadmin;help=field_show_enclosed" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+											<strong><label for="enclose"><?= Lang::getTxt('custom_edit_enclose', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_enclose_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<textarea name="enclose" id="enclose" rows="10" cols="50"><?= @Utils::$context['field']['enclose'] ?></textarea>
+										</dd>
+									</dl>
+								</fieldset>
+								<fieldset>
+									<legend><?= Lang::getTxt('custom_edit_input', file: 'ManageSettings') ?></legend>
+									<dl class="settings">
+										<dt>
+											<strong><label for="field_type"><?= Lang::getTxt('custom_edit_picktype', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<select name="field_type" id="field_type" onchange="updateInputBoxes();">
+<?php foreach (['text', 'textarea', 'select', 'radio', 'check'] as $field_type): ?>
+												<option value="<?= $field_type ?>"<?= Utils::$context['field']['type'] == $field_type ? ' selected' : '' ?>><?= Lang::getTxt('custom_profile_type_' . $field_type, file: 'ManageSettings') ?></option>
+<?php endforeach; ?>
+											</select>
+										</dd>
+										<dt id="max_length_dt">
+											<strong><label for="max_length_dd"><?= Lang::getTxt('custom_edit_max_length', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_max_length_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<input type="text" name="max_length" id="max_length_dd" value="<?= Utils::$context['field']['max_length'] ?>" size="7" maxlength="6">
+										</dd>
+										<dt id="dimension_dt">
+											<strong><label for="dimension_dd"><?= Lang::getTxt('custom_edit_dimension', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd id="dimension_dd">
+											<strong><?= Lang::getTxt('custom_edit_dimension_row', file: 'ManageSettings') ?></strong> <input type="text" name="rows" value="<?= Utils::$context['field']['rows'] ?>" size="5" maxlength="3">
+											<strong><?= Lang::getTxt('custom_edit_dimension_col', file: 'ManageSettings') ?></strong> <input type="text" name="cols" value="<?= Utils::$context['field']['cols'] ?>" size="5" maxlength="3">
+										</dd>
+										<dt id="bbc_dt">
+											<strong><label for="bbc_dd"><?= Lang::getTxt('custom_edit_bbc', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<input type="checkbox" name="bbc" id="bbc_dd"<?= Utils::$context['field']['bbc'] ? ' checked' : '' ?>>
+										</dd>
+										<dt id="options_dt">
+											<a href="<?= Config::$scripturl ?>?action=helpadmin;help=customoptions" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+											<strong><label for="options_dd"><?= Lang::getTxt('custom_edit_options', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_options_desc', file: 'ManageSettings') ?></span>
+											<br>
+											<span><?= Lang::getTxt('custom_edit_name_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd id="options_dd">
+<?php foreach (Utils::$context['field']['options'] as $k => $option): ?>
+											<?= $k == 0 ? '' : '<br>' ?><input type="radio" name="default_select" value="<?= $k ?>"<?= Utils::$context['field']['default_select'] == $option ? ' checked' : '' ?>><input type="text" name="select_option[<?= $k ?>]" value="<?= $option ?>">
+<?php endforeach; ?>
+											<span id="addopt"></span>
+											[<a href="" onclick="addOption(); return false;"><?= Lang::getTxt('custom_edit_options_more', file: 'ManageSettings') ?></a>]
+										</dd>
+										<dt id="default_dt">
+											<strong><label for="default_dd"><?= Lang::getTxt('custom_edit_default', file: 'ManageSettings') ?></label></strong>
+										</dt>
+										<dd>
+											<input type="checkbox" name="default_check" id="default_dd"<?= Utils::$context['field']['default_check'] ? ' checked' : '' ?>>
+										</dd>
+									</dl>
+								</fieldset>
+								<fieldset>
+									<legend><?= Lang::getTxt('custom_edit_advanced', file: 'ManageSettings') ?></legend>
+									<dl class="settings">
+										<dt id="mask_dt">
+											<a id="custom_mask" href="<?= Config::$scripturl ?>?action=helpadmin;help=custom_mask" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+											<strong><label for="mask"><?= Lang::getTxt('custom_edit_mask', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_mask_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<select name="mask" id="mask" onchange="updateInputBoxes();">
+												<option value="nohtml"<?= Utils::$context['field']['mask'] == 'nohtml' ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_mask_nohtml', file: 'ManageSettings') ?></option>
+												<option value="email"<?= Utils::$context['field']['mask'] == 'email' ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_mask_email', file: 'ManageSettings') ?></option>
+												<option value="number"<?= Utils::$context['field']['mask'] == 'number' ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_mask_number', file: 'ManageSettings') ?></option>
+												<option value="regex"<?= str_starts_with(Utils::$context['field']['mask'], 'regex') ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_mask_regex', file: 'ManageSettings') ?></option>
+											</select>
+											<br>
+											<span id="regex_div">
+												<input type="text" name="regex" value="<?= Utils::$context['field']['regex'] ?>" size="30">
+											</span>
+										</dd>
+										<dt>
+											<strong><label for="private"><?= Lang::getTxt('custom_edit_privacy', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_privacy_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<select name="private" id="private" onchange="updateInputBoxes();">
+												<option value="0"<?= Utils::$context['field']['private'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_privacy_all', file: 'ManageSettings') ?></option>
+												<option value="1"<?= Utils::$context['field']['private'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_privacy_see', file: 'ManageSettings') ?></option>
+												<option value="2"<?= Utils::$context['field']['private'] == 2 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_privacy_owner', file: 'ManageSettings') ?></option>
+												<option value="3"<?= Utils::$context['field']['private'] == 3 ? ' selected' : '' ?>><?= Lang::getTxt('custom_edit_privacy_none', file: 'ManageSettings') ?></option>
+											</select>
+										</dd>
+										<dt id="can_search_dt">
+											<strong><label for="can_search_dd"><?= Lang::getTxt('custom_edit_can_search', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_can_search_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<input type="checkbox" name="can_search" id="can_search_dd"<?= Utils::$context['field']['can_search'] ? ' checked' : '' ?>>
+										</dd>
+										<dt>
+											<strong><label for="can_search_check"><?= Lang::getTxt('custom_edit_active', file: 'ManageSettings') ?></label></strong><br>
+											<span class="smalltext"><?= Lang::getTxt('custom_edit_active_desc', file: 'ManageSettings') ?></span>
+										</dt>
+										<dd>
+											<input type="checkbox" name="active" id="can_search_check"<?= Utils::$context['field']['active'] ? ' checked' : '' ?>>
+										</dd>
+									</dl>
+								</fieldset>
+								<input type="submit" name="save" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+<?php if (Utils::$context['fid']): ?>
+								<input type="submit" name="delete" value="<?= Lang::getTxt('delete', file: 'General') ?>" data-confirm="<?= Lang::getTxt('custom_edit_delete_sure', file: 'ManageSettings') ?>" class="button you_sure">
+<?php endif; ?>
+							</div><!-- .windowbg -->
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+							<input type="hidden" name="<?= Utils::$context['admin-ecp_token_var'] ?>" value="<?= Utils::$context['admin-ecp_token'] ?>">
+						</form>
+<?php /* Get the javascript bits right! */ ?>
+					<script>
+						updateInputBoxes();
+					</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/index.php b/Themes/default/templates/Admin/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Admin/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Admin/not_done.php b/Themes/default/templates/Admin/not_done.php
new file mode 100644
index 00000000000..62c8c8d0f8f
--- /dev/null
+++ b/Themes/default/templates/Admin/not_done.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is the page shown when we've temporarily paused things such as during maintenance tasks, sending newsletters, etc.
+ */
+?>
+						<div id="section_header" class="cat_bar">
+							<h3 class="catbg">
+								<?= Lang::getTxt('not_done_title', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div class="windowbg">
+							<?= Lang::getTxt('not_done_reason', file: 'Admin') ?>
+
+<?php if (!empty(Utils::$context['continue_percent'])): ?>
+							<div class="progress_bar">
+								<span><?= Utils::$context['continue_percent'] ?>%</span>
+								<div class="bar" style="width: <?= Utils::$context['continue_percent'] ?>%;"></div>
+							</div>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['substep_enabled'])): ?>
+							<div class="progress_bar progress_blue">
+								<span><?= Utils::$context['substep_title'] ?> (<?= Utils::$context['substep_continue_percent'] ?>%)</span>
+								<div class="bar" style="width: <?= Utils::$context['substep_continue_percent'] ?>%;"></div>
+							</div>
+<?php endif; ?>
+							<form action="<?= Config::$scripturl ?><?= Utils::$context['continue_get_data'] ?>" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">
+<?php /* Do we have a token? */ ?>
+<?php if (isset(Utils::$context['not_done_token'], Utils::$context[Utils::$context['not_done_token'] . '_token'],Utils::$context[Utils::$context['not_done_token'] . '_token_var'])): ?>
+							<input type="hidden" name="<?= Utils::$context[Utils::$context['not_done_token'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['not_done_token'] . '_token'] ?>">
+<?php endif; ?>
+								<input type="submit" name="cont" value="<?= Lang::getTxt('not_done_continue', file: 'Admin') ?>" class="button">
+								<?= Utils::$context['continue_post_data'] ?>
+							</form>
+						</div><!-- .windowbg -->
+					<script>
+						doAutoSubmit(<?= Utils::$context['continue_countdown'] ?>, "<?= Lang::getTxt('not_done_continue', file: 'Admin') ?>");
+					</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/php_info.php b/Themes/default/templates/Admin/php_info.php
new file mode 100644
index 00000000000..df37311215c
--- /dev/null
+++ b/Themes/default/templates/Admin/php_info.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Retrieves info from the php_info function, scrubs and preps it for display
+ */
+?>
+					<div id="admin_form_wrapper">
+						<div id="section_header" class="cat_bar">
+							<h3 class="catbg">
+								<?= Lang::getTxt('phpinfo_settings', file: 'Admin') ?>
+							</h3>
+						</div>
+<?php /* for each php info area */ ?>
+<?php foreach (Utils::$context['pinfo'] as $area => $php_area): ?>
+						<table id="<?= str_replace(' ', '_', $area) ?>" class="table_grid">
+							<thead>
+								<tr class="title_bar">
+									<th class="equal_table" scope="col"></th>
+									<th class="centercol equal_table" scope="col"><strong><?= $area ?></strong></th>
+									<th class="equal_table" scope="col"></th>
+								</tr>
+							</thead>
+							<tbody>
+<?php
+$localmaster = true;
+// and for each setting in this category
+?>
+<?php foreach ($php_area as $key => $setting): ?>
+<?php /* start of a local / master setting (3 col) */ ?>
+<?php if (is_array($setting)): ?>
+<?php if ($localmaster): ?>
+<?php /* heading row for the settings section of this category's settings */ ?>
+								<tr class="title_bar">
+									<td class="equal_table"><strong><?= Lang::getTxt('phpinfo_itemsettings', file: 'Admin') ?></strong></td>
+									<td class="equal_table"><strong><?= Lang::getTxt('phpinfo_localsettings', file: 'Admin') ?></strong></td>
+									<td class="equal_table"><strong><?= Lang::getTxt('phpinfo_defaultsettings', file: 'Admin') ?></strong></td>
+								</tr>
+<?php $localmaster = false; ?>
+<?php endif; ?>
+								<tr class="windowbg">
+									<td class="equal_table"><?= $key ?></td>
+<?php foreach ($setting as $key_lm => $value): ?>
+									<td class="equal_table"><?= $value ?></td>
+<?php endforeach; ?>
+								</tr>
+<?php /* just a single setting (2 col) */ ?>
+<?php else: ?>
+								<tr class="windowbg">
+									<td class="equal_table"><?= $key ?></td>
+									<td colspan="2" class="word_break"><?= str_replace(',', ', ', $setting) ?></td>
+								</tr>
+<?php endif; ?>
+<?php endforeach; ?>
+							</tbody>
+						</table>
+						<br>
+<?php endforeach; ?>
+					</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Admin/repair_boards.php b/Themes/default/templates/Admin/repair_boards.php
new file mode 100644
index 00000000000..9f9e80a5e60
--- /dev/null
+++ b/Themes/default/templates/Admin/repair_boards.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Repairing boards.
+ */
+?>
+						<div id="section_header" class="cat_bar">
+							<h3 class="catbg"><?= Utils::$context['error_search'] ? Lang::getTxt('errors_list', file: 'Admin') : Lang::getTxt('errors_fixing', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div class="windowbg"><?php /* Are we actually fixing them, or is this just a prompt? */ ?><?php if (Utils::$context['error_search']): ?><?php if (!empty(Utils::$context['to_fix'])): ?>
+							<?= Lang::getTxt('errors_found', file: 'Admin') ?>
+							<ul><?php foreach (Utils::$context['repair_errors'] as $error): ?>
+								<li>
+									<?= $error ?>
+								</li><?php endforeach; ?>
+							</ul>
+							<p>
+								<?= Lang::getTxt('errors_fix', file: 'Admin') ?>
+							</p>
+							<p class="padding">
+								<strong><a href="<?= Config::$scripturl ?>?action=admin;area=repairboards;fixErrors;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;<?= Utils::$context['admin-repairboards_token_var'] ?>=<?= Utils::$context['admin-repairboards_token'] ?>"><?= Lang::getTxt('yes', file: 'General') ?></a> - <a href="<?= Config::$scripturl ?>?action=admin;area=maintain"><?= Lang::getTxt('no', file: 'General') ?></a></strong>
+							</p><?php else: ?>
+							<p><?= Lang::getTxt('maintain_no_errors', file: 'Admin') ?></p>
+							<p class="padding">
+								<a href="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=routine"><?= Lang::getTxt('maintain_return', file: 'ManageMaintenance') ?></a>
+							</p><?php endif; ?><?php else: ?><?php if (!empty(Utils::$context['redirect_to_recount'])): ?>
+							<p>
+								<?= Lang::getTxt('errors_do_recount', file: 'Admin') ?>
+							</p>
+							<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=routine;activity=recount" id="recount_form" method="post">
+								<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+								<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+								<input type="submit" name="recount" id="recount_now" value="<?= Lang::getTxt('errors_recount_now', file: 'Admin') ?>">
+							</form><?php else: ?>
+							<p><?= Lang::getTxt('errors_fixed', file: 'Admin') ?></p>
+							<p class="padding">
+								<a href="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=routine"><?= Lang::getTxt('maintain_return', file: 'ManageMaintenance') ?></a>
+							</p><?php endif; ?><?php endif; ?>
+						</div><!-- .windowbg --><?php if (!empty(Utils::$context['redirect_to_recount'])): ?>
+					<script>
+						doAutoSubmit(5, "<?= Utils::escapeJavaScript(Lang::getTxt('errors_recount_now', file: 'Admin')) ?>", "recount_form", "recount");
+					</script><?php endif; ?>
diff --git a/Themes/default/templates/Admin/show_custom_profile.php b/Themes/default/templates/Admin/show_custom_profile.php
new file mode 100644
index 00000000000..51aba82970c
--- /dev/null
+++ b/Themes/default/templates/Admin/show_custom_profile.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing custom profile fields.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+					<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?><?php /* Standard fields. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'standard_profile_fields']); ?>
+					<script>
+						var iNumChecks = document.forms.standardProfileFields.length;
+						for (var i = 0; i < iNumChecks; i++)
+							if (document.forms.standardProfileFields[i].id.indexOf('reg_') == 0)
+								document.forms.standardProfileFields[i].disabled = document.forms.standardProfileFields[i].disabled || !document.getElementById('active_' + document.forms.standardProfileFields[i].id.substr(4)).checked;
+					</script>
+					<br><?php /* Custom fields. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'custom_profile_fields']); ?>
diff --git a/Themes/default/templates/Admin/show_settings.php b/Themes/default/templates/Admin/show_settings.php
new file mode 100644
index 00000000000..97739bfb2c9
--- /dev/null
+++ b/Themes/default/templates/Admin/show_settings.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Actions\Admin\Permissions;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing settings (Of any kind really!)
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+					<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php elseif (!empty(Utils::$context['saved_failed'])): ?>
+					<div class="errorbox"><?= Lang::getTxt('settings_not_saved', ['reason' => Utils::$context['saved_failed']], file: 'Admin') ?></div><?php endif; ?><?php if (!empty(Utils::$context['settings_pre_javascript'])): ?>
+					<script><?= Utils::$context['settings_pre_javascript'] ?></script><?php endif; ?><?php if (!empty(Utils::$context['settings_insert_above'])): ?><?= Utils::$context['settings_insert_above'] ?><?php endif; ?>
+						<form id="admin_form_wrapper" action="<?= Utils::$context['post_url'] ?>" method="post" accept-charset="UTF-8"<?= !empty(Utils::$context['force_form_onsubmit']) ? ' onsubmit="' . Utils::$context['force_form_onsubmit'] . '"' : '' ?>><?php /* Is there a custom title? */ ?><?php if (isset(Utils::$context['settings_title'])): ?>
+							<div class="cat_bar">
+								<h3 class="catbg"><?= Utils::$context['settings_title'] ?></h3>
+							</div><?php endif; ?><?php /* Have we got a message to display? */ ?><?php if (!empty(Utils::$context['settings_message'])): ?><?php $tag = !empty(Utils::$context['settings_message']['tag']) ? Utils::$context['settings_message']['tag'] : 'span'; ?>
+							<div class="information noup"><?php if (is_array(Utils::$context['settings_message'])): ?>
+								<<?= $tag ?><?= !empty(Utils::$context['settings_message']['class']) ? ' class="' . Utils::$context['settings_message']['class'] . '"' : '' ?>>
+									<?= Utils::$context['settings_message']['label'] ?>
+								</<?= $tag ?>><?php else: ?><?= Utils::$context['settings_message'] ?><?php endif; ?>
+							</div><?php endif; ?><?php
+// Filter out any redundant separators before we start the loop
+Utils::$context['config_vars'] = array_filter(
+	Utils::$context['config_vars'],
+	function ($v) {
+			static $config_vars, $prev;
+
+			$at_start = is_null($config_vars);
+			$config_vars = $at_start ? Utils::$context['config_vars'] : $config_vars;
+
+			$next = next($config_vars);
+			$at_end = key($config_vars) === null;
+
+			if (!$at_start && !$at_end) {
+				$div_types = ['title', 'desc'];
+				$at_start = isset($prev['type']) && in_array($prev['type'], $div_types);
+				$at_end = isset($next['type']) && in_array($next['type'], $div_types);
+			}
+
+			$prev = $v;
+
+			return ($v === '' && ($at_start || $at_end || $v === $next)) ? false : true;
+		},
+);
+// Now actually loop through all the variables.
+$is_open = false;
+?><?php foreach (Utils::$context['config_vars'] as $config_var): ?><?php /* Is it a title or a description? */ ?><?php if (is_array($config_var) && ($config_var['type'] == 'title' || $config_var['type'] == 'desc')): ?><?php /* Not a list yet? */ ?><?php if ($is_open): ?><?php $is_open = false; ?>
+									</dl>
+							</div><?php endif; ?><?php /* A title? */ ?><?php if ($config_var['type'] == 'title'): ?>
+							<div class="cat_bar">
+								<h3 class="<?= !empty($config_var['class']) ? $config_var['class'] : 'catbg' ?>"<?= !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '' ?>>
+									<?= ($config_var['help'] ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : '') ?>
+									<?= $config_var['label'] ?>
+								</h3>
+							</div><?php /* A description? */ ?><?php else: ?>
+							<div class="information noup">
+								<?= $config_var['label'] ?>
+							</div><?php endif; ?><?php continue; ?><?php endif; ?><?php /* Not a list yet? */ ?><?php if (!$is_open): ?><?php $is_open = true; ?>
+							<div class="windowbg noup">
+								<dl class="settings"><?php endif; ?><?php /* Hang about? Are you pulling my leg - a callback?! */ ?><?php if (is_array($config_var) && $config_var['type'] == 'callback'): ?><?php if ($this->hasSubTemplate('callback_' . $config_var['name'])): ?><?php $this->subTemplate('callback_' . $config_var['name']); ?><?php endif; ?><?php continue; ?><?php endif; ?><?php if (is_array($config_var)): ?><?php /* First off, is this a span like a message? */ ?><?php if (in_array($config_var['type'], ['message', 'warning'])): ?>
+									<dd<?= $config_var['type'] == 'warning' ? ' class="alert"' : '' ?><?= (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : '') ?>>
+										<?= $config_var['label'] ?>
+									</dd><?php /* Otherwise it's an input box of some kind. */ ?><?php else: ?>
+									<dt<?= is_array($config_var) && !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '' ?>><?php
+// Some quick helpers...
+$javascript = $config_var['javascript'];
+$disabled = !empty($config_var['disabled']) ? ' disabled' : '';
+$subtext = !empty($config_var['subtext']) ? '<br><span class="smalltext"> ' . $config_var['subtext'] . '</span>' : '';
+$placeholder = !empty($config_var['placeholder']) ? ' placeholder="' . $config_var['placeholder'] . '"' : '';
+// Various HTML5 input types that are basically enhanced textboxes
+$text_types = ['color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'];
+// Show the [?] button.
+?><?php if ($config_var['help']): ?>
+										<a id="setting_<?= $config_var['name'] ?>_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=<?= $config_var['help'] ?>" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?php endif; ?>
+										<a id="setting_<?= $config_var['name'] ?>"></a> <span<?= ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')) ?>><label<?= ($config_var['type'] == 'boards' || $config_var['type'] == 'permissions' ? '' : ' for="' . $config_var['name'] . '"') ?>><?= $config_var['label'] ?></label><?= $subtext ?><?= ($config_var['type'] == 'password' ? '<br><em>' . Lang::getTxt('admin_confirm_password', file: 'Admin') . '</em>' : '') ?></span>
+									</dt>
+									<dd<?= (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : '') ?>><?= $config_var['preinput'] ?><?php /* Show a check box. */ ?><?php if ($config_var['type'] == 'check'): ?>
+										<input type="checkbox"<?= $javascript ?><?= $disabled ?> name="<?= $config_var['name'] ?>" id="<?= $config_var['name'] ?>"<?= ($config_var['value'] ? ' checked' : '') ?> value="1"><?php /* Escape (via htmlspecialchars.) the text box. */ ?><?php elseif ($config_var['type'] == 'password'): ?>
+										<input type="password"<?= $disabled ?><?= $javascript ?> name="<?= $config_var['name'] ?>[0]"<?= ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : '') ?> value="*#fakepass#*" onfocus="this.value = ''; this.form.<?= $config_var['name'] ?>.disabled = false;"><br>
+										<input type="password" disabled id="<?= $config_var['name'] ?>" name="<?= $config_var['name'] ?>[1]"<?= ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : '') ?>><?php /* Show a selection box. */ ?><?php elseif ($config_var['type'] == 'select'): ?><?php if ($config_var['name'] === 'default_timezone'): ?><?php $this->subTemplate('timezone_select', ['name' => $config_var['name'], 'selection' => $config_var['value'] ?? '', 'disabled' => (int) $disabled]); ?><?php else: ?>
+										<select name="<?= $config_var['name'] ?>" id="<?= $config_var['name'] ?>" <?= $javascript ?><?= $disabled ?><?= (!empty($config_var['multiple']) ? ' multiple' : '') ?> size="<?= $config_var['size'] ?>"><?php foreach ($config_var['data'] as $option): ?>
+											<option value="<?= $option[0] ?>"<?= (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : '') ?>><?= $option[1] ?></option><?php endforeach; ?>
+										</select><?php endif; ?><?php /* Show a color box */ ?><?php elseif ($config_var['type'] == 'color'): ?>
+										<input name="<?= $config_var['name'] ?>" id="<?= $config_var['name'] ?>" data-coloris value="<?= $config_var['value'] ?>"><?php /* List of boards? This requires getBoardList() having been run and the results in Utils::$context['board_list']. */ ?><?php elseif ($config_var['type'] == 'boards'): ?><?php $first = true; ?>
+										<a href="#" class="board_selector">[ <?= Lang::getTxt('select_boards_from_list', file: 'ManageSettings') ?> ]</a>
+										<fieldset>
+											<legend class="board_selector">
+												<a href="#"><?= Lang::getTxt('select_boards_from_list', file: 'ManageSettings') ?></a>
+											</legend><?php foreach (Utils::$context['board_list'] as $id_cat => $cat): ?><?php if (!$first): ?>
+											<hr><?php endif; ?>
+											<strong><?= $cat['name'] ?></strong>
+											<ul><?php foreach ($cat['boards'] as $id_board => $brd): ?>
+												<li><label><input type="checkbox" name="<?= $config_var['name'] ?>[<?= $brd['id'] ?>]" value="1"<?= in_array($brd['id'], $config_var['value']) ? ' checked' : '' ?>> <?= $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '' ?><?= $brd['name'] ?></label></li><?php endforeach; ?>
+											</ul><?php $first = false; ?><?php endforeach; ?>
+											<hr />
+											<input type="checkbox" onclick="invertAll(this, this.form, '<?= $config_var['name'] ?>[');">
+											<span><?= Lang::getTxt('check_all', file: 'General') ?></span>
+										</fieldset><?php /* Text area? */ ?><?php elseif ($config_var['type'] == 'large_text'): ?>
+										<textarea rows="<?= (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)) ?>" cols="<?= (!empty($config_var['cols']) ? $config_var['cols'] : 30) ?>" <?= $javascript ?><?= $disabled ?> name="<?= $config_var['name'] ?>" id="<?= $config_var['name'] ?>"><?= $config_var['value'] ?></textarea><?php /* Permission group? */ ?><?php elseif ($config_var['type'] == 'permissions'): ?><?php
+Permissions::theme_inline_permissions($config_var['name']);
+// BBC selection?
+?><?php elseif ($config_var['type'] == 'bbc'): ?>
+										<fieldset id="<?= $config_var['name'] ?>">
+											<legend><?= Utils::$context['bbc_sections'][$config_var['name']]['title'] ?></legend>
+											<ul><?php foreach (Utils::$context['bbc_sections'][$config_var['name']]['columns'] as $bbcColumn): ?><?php foreach ($bbcColumn as $bbcTag): ?>
+												<li class="list_bbc floatleft">
+													<input type="checkbox" name="<?= $config_var['name'] ?>_enabledTags[]" id="tag_<?= $config_var['name'] ?>_<?= $bbcTag['tag'] ?>" value="<?= $bbcTag['tag'] ?>"<?= !in_array($bbcTag['tag'], Utils::$context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '' ?><?= in_array($bbcTag['tag'], Utils::$context['bbc_sections'][$config_var['name']]['forced']) ? ' disabled' : '' ?>> <label for="tag_<?= $config_var['name'] ?>_<?= $bbcTag['tag'] ?>"><?= $bbcTag['tag'] ?></label><?= $bbcTag['show_help'] ? ' <a href="' . Config::$scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);" class="main_icons help"></a>' : '' ?>
+												</li><?php endforeach; ?><?php endforeach; ?>					</ul>
+											<input type="checkbox" id="bbc_<?= $config_var['name'] ?>_select_all" onclick="invertAll(this, this.form, '<?= $config_var['name'] ?>_enabledTags');"<?= Utils::$context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '' ?>> <label for="bbc_<?= $config_var['name'] ?>_select_all"><em><?= Lang::getTxt('enabled_bbc_select_all', file: 'Admin') ?></em></label>
+										</fieldset><?php /* A simple message? */ ?><?php elseif ($config_var['type'] == 'var_message'): ?>
+										<div<?= !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '' ?>>
+											<?= $config_var['var_message'] ?>
+										</div><?php /* Assume it must be a text box */ ?><?php else: ?><?php
+// Figure out the exact type - use "number" for "float" and "int".
+$type = in_array($config_var['type'], $text_types) ? $config_var['type'] : ($config_var['type'] == 'int' || $config_var['type'] == 'float' ? 'number' : 'text');
+// Extra options for float/int values - how much to decrease/increase by, the min value and the max value
+// The step - only set if incrementing by something other than 1 for int or 0.1 for float
+$step = isset($config_var['step']) ? ' step="' . $config_var['step'] . '"' : ($config_var['type'] == 'float' ? ' step="0.1"' : '');
+// Minimum allowed value for this setting. SMF forces a default of 0 if not specified in the settings
+$min = isset($config_var['min']) ? ' min="' . $config_var['min'] . '"' : '';
+// Maximum allowed value for this setting.
+$max = isset($config_var['max']) ? ' max="' . $config_var['max'] . '"' : '';
+// Some input fields allow multiple.
+$multiple = $type === 'email' && (!empty($config_var['multiple']) ? ' multiple' : '');
+?>
+										<input type="<?= $type ?>"<?= $javascript ?><?= $disabled ?> name="<?= $config_var['name'] ?>" id="<?= $config_var['name'] ?>" value="<?= $config_var['value'] ?>"<?= ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : '') ?><?= $min ?><?= $max ?><?= $step ?><?= $multiple ?><?= $placeholder ?>><?php endif; ?><?= isset($config_var['postinput']) ? '
+											' . $config_var['postinput'] : '' ?>
+									</dd><?php endif; ?><?php else: ?><?php /* Just show a separator. */ ?><?php if ($config_var == ''): ?>
+								</dl>
+								<hr>
+								<dl class="settings"><?php else: ?>
+									<dt>
+										<strong><?= $config_var ?></strong>
+									</dt>
+									<dd></dd><?php endif; ?><?php endif; ?><?php endforeach; ?><?php if ($is_open): ?>
+								</dl><?php endif; ?><?php if (empty(Utils::$context['settings_save_dont_show'])): ?>
+								<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>"<?= (!empty(Utils::$context['save_disabled']) ? ' disabled' : '') ?><?= (!empty(Utils::$context['settings_save_onclick']) ? ' onclick="' . Utils::$context['settings_save_onclick'] . '"' : '') ?> class="button"><?php endif; ?><?php if ($is_open): ?>
+							</div><!-- .windowbg --><?php endif; ?><?php /* At least one token has to be used! */ ?><?php if (isset(Utils::$context['admin-ssc_token'])): ?>
+							<input type="hidden" name="<?= Utils::$context['admin-ssc_token_var'] ?>" value="<?= Utils::$context['admin-ssc_token'] ?>"><?php endif; ?><?php if (isset(Utils::$context['admin-dbsc_token'])): ?>
+							<input type="hidden" name="<?= Utils::$context['admin-dbsc_token_var'] ?>" value="<?= Utils::$context['admin-dbsc_token'] ?>"><?php endif; ?><?php if (isset(Utils::$context['admin-mp_token'])): ?>
+							<input type="hidden" name="<?= Utils::$context['admin-mp_token_var'] ?>" value="<?= Utils::$context['admin-mp_token'] ?>"><?php endif; ?>
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						</form><?php if (!empty(Utils::$context['settings_post_javascript'])): ?>
+					<script>
+						<?= Utils::$context['settings_post_javascript'] ?>
+
+					</script><?php endif; ?><?php if (!empty(Utils::$context['settings_insert_below'])): ?><?= Utils::$context['settings_insert_below'] ?><?php endif; ?><?php
+// We may have added a board listing. If we did, we need to make it work.
+Theme::addInlineJavascript('
+		$("legend.board_selector").closest("fieldset").hide();
+		$("a.board_selector").click(function(e) {
+			e.preventDefault();
+			$(this).hide().next("fieldset").show();
+		});
+		$("fieldset legend.board_selector a").click(function(e) {
+			e.preventDefault();
+			$(this).closest("fieldset").hide().prev("a").show();
+		});
+	', true);
+?>
diff --git a/Themes/default/templates/Admin/view_versions.php b/Themes/default/templates/Admin/view_versions.php
new file mode 100644
index 00000000000..a2cbf42edec
--- /dev/null
+++ b/Themes/default/templates/Admin/view_versions.php
@@ -0,0 +1,294 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays information about file versions installed, and compares them to current version.
+ */
+?>
+						<div id="section_header" class="cat_bar">
+							<h3 class="catbg">
+								<?= Lang::getTxt('admin_version_check', file: 'Admin') ?>
+							</h3>
+						</div>
+						<div class="information"><?= Lang::getTxt('version_check_desc', file: 'Admin') ?></div>
+						<div id="versions">
+							<table class="table_grid">
+								<thead>
+									<tr class="title_bar">
+										<th class="half_table">
+											<strong><?= Lang::getTxt('admin_smffile', file: 'Admin') ?></strong>
+										</th>
+										<th class="quarter_table">
+											<strong><?= Lang::getTxt('dvc_your', file: 'Admin') ?></strong>
+										</th>
+										<th class="quarter_table">
+											<strong><?= Lang::getTxt('dvc_current', file: 'Admin') ?></strong>
+										</th>
+									</tr>
+								</thead>
+								<tbody>
+<?php /* The current version of the core SMF package. */ ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= Lang::getTxt('admin_smfpackage', file: 'Admin') ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourSMF"><?= Utils::$context['forum_version'] ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentSMF">??</em>
+										</td>
+									</tr>
+<?php /* Now list all the root file versions, starting with the overall version (if all match!). */ ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Root-link"><?= Lang::getTxt('dvc_root', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourRoot">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentRoot">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Root" class="table_grid">
+								<tbody>
+<?php /* Loop through every source file displaying its version - using javascript. */ ?>
+<?php foreach (Utils::$context['root_versions'] as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourRoot<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentRoot<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+<?php /* Now list all the source file versions, starting with the overall version (if all match!). */ ?>
+								</tbody>
+							</table>
+							<table id="Root" class="table_grid">
+								<tbody>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Sources-link"><?= Lang::getTxt('dvc_sources', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourSources">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentSources">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Sources" class="table_grid">
+								<tbody>
+<?php /* Loop through every source file displaying its version - using javascript. */ ?>
+<?php foreach (Utils::$context['file_versions'] as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourSources<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentSources<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+<?php /* Default template files. */ ?>
+								</tbody>
+							</table>
+
+							<table class="table_grid">
+								<tbody>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Default-link"><?= Lang::getTxt('dvc_default', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourDefault">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentDefault">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Default" class="table_grid">
+								<tbody>
+<?php foreach (Utils::$context['default_template_versions'] as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourDefault<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentDefault<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+<?php /* Now the language files... */ ?>
+								</tbody>
+							</table>
+
+							<table class="table_grid">
+								<tbody>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Languages-link"><?= Lang::getTxt('dvc_languages', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourLanguages">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentLanguages">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Languages" class="table_grid">
+								<tbody>
+<?php foreach (Utils::$context['default_language_versions'] as $language => $files): ?>
+<?php foreach ($files as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<em><?= $language ?></em>/<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourLanguage_<?= $language ?>_<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentLanguage_<?= $language ?>_<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+<?php endforeach; ?>
+								</tbody>
+							</table>
+<?php /* Display the version information for the currently selected theme - if it is not the default one. */ ?>
+<?php if (!empty(Utils::$context['template_versions'])): ?>
+							<table class="table_grid">
+								<tbody>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Templates-link"><?= Lang::getTxt('dvc_templates', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourTemplates">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentTemplates">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Templates" class="table_grid">
+								<tbody>
+<?php foreach (Utils::$context['template_versions'] as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourTemplates<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentTemplates<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+								</tbody>
+							</table>
+<?php endif; ?>
+<?php /* Display the tasks files version. */ ?>
+<?php if (!empty(Utils::$context['tasks_versions'])): ?>
+							<table class="table_grid">
+								<tbody>
+									<tr class="windowbg">
+										<td class="half_table">
+											<a href="#" id="Tasks-link"><?= Lang::getTxt('dvc_tasks', file: 'Admin') ?></a>
+										</td>
+										<td class="quarter_table">
+											<em id="yourTasks">??</em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentTasks">??</em>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+
+							<table id="Tasks" class="table_grid">
+								<tbody>
+<?php foreach (Utils::$context['tasks_versions'] as $filename => $version): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<?= $filename ?>
+										</td>
+										<td class="quarter_table">
+											<em id="yourTasks<?= $filename ?>"><?= $version ?></em>
+										</td>
+										<td class="quarter_table">
+											<em id="currentTasks<?= $filename ?>">??</em>
+										</td>
+									</tr>
+<?php endforeach; ?>
+								</tbody>
+							</table>
+<?php endif; ?>
+						</div><!-- #versions -->
+<?php
+/* Below is the hefty javascript for this. Upon opening the page it checks the current file versions with ones
+	   held at simplemachines.org and works out if they are up to date. If they aren't it colors that files number
+	   red. It also contains the function, swapOption, that toggles showing the detailed information for each of the
+	   file categories. (sources, languages, and templates.) */
+?>
+					<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=detailed-version.js"></script>
+					<script>
+						var oViewVersions = new smf_ViewVersions({
+							aKnownLanguages: [
+								'<?= implode('\',
+								\'', Utils::$context['default_known_languages']) ?>'
+							],
+							oSectionContainerIds: {
+								Sources: 'Sources',
+								Default: 'Default',
+								Languages: 'Languages',
+								Templates: 'Templates',
+								Tasks: 'Tasks'
+							}
+						});
+					</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Agreement/index.php b/Themes/default/templates/Agreement/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Agreement/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Agreement/main.php b/Themes/default/templates/Agreement/main.php
new file mode 100644
index 00000000000..f7a7265e5a9
--- /dev/null
+++ b/Themes/default/templates/Agreement/main.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Time;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+// The main sub template - show the agreement and/or privacy policy
+?><?php if (!empty(Utils::$context['accept_doc'])): ?>
+	<form action="<?= Config::$scripturl ?>?action=acceptagreement;doc=<?= Utils::$context['accept_doc'] ?>" method="post"><?php endif; ?><?php if (!empty(Utils::$context['agreement'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt(!empty(Utils::$context['can_accept_agreement']) ? 'agreement_updated' : 'registration_agreement', file: 'General+Agreement') ?></h3>
+		</div><?php if (!empty(Utils::$context['can_accept_agreement'])): ?>
+		<div class="information noup">
+			<?= Lang::getTxt('agreement_updated_desc', file: 'Agreement') ?>
+		</div><?php elseif (!empty(Utils::$context['agreement_accepted_date'])): ?>
+		<div class="information noup">
+			<?= Lang::getTxt('agreement_accepted', ['date' => Time::create('@' . Utils::$context['agreement_accepted_date'])->format(null, false)], file: 'Agreement') ?>
+		</div><?php endif; ?>
+		<div class="windowbg noup">
+			<?= Utils::adjustHeadingLevels(Utils::$context['agreement'], 3) ?>
+		</div><?php endif; ?><?php if (!empty(Utils::$context['privacy_policy'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('privacy_policy' . (!empty(Utils::$context['can_accept_privacy_policy']) ? '_updated' : ''), file: 'General+Agreement') ?></h3>
+		</div><?php if (!empty(Utils::$context['can_accept_privacy_policy'])): ?>
+		<div class="information noup">
+			<?= Lang::getTxt('privacy_policy_updated_desc', file: 'Agreement') ?>
+		</div><?php elseif (!empty(Utils::$context['privacy_policy_accepted_date'])): ?>
+		<div class="information noup">
+			<?= Lang::getTxt('privacy_policy_accepted', ['date' => Time::create('@' . Utils::$context['privacy_policy_accepted_date'])->format(null, false)], file: 'Agreement') ?>
+		</div><?php endif; ?>
+		<div class="windowbg noup">
+			<?= Utils::adjustHeadingLevels(Utils::$context['privacy_policy'], 3) ?>
+		</div><?php endif; ?><?php if (!empty(Utils::$context['accept_doc'])): ?>
+		<div id="confirm_buttons"><?php if (!empty(Utils::$context['document_has_visible_changes'])): ?>
+			<a class="button" href="<?= Config::$scripturl ?>?action=agreement<?= (!isset($_GET['diff']) ? ';diff' : '') ?>"><?= Lang::getTxt((!isset($_GET['diff']) ? 'diff' : 'nodiff'), file: 'Agreement') ?></a><?php endif; ?>
+			<input type="submit" value="<?= Lang::getTxt('agree', file: 'Agreement') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</div>
+	</form><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/bi_board_children.php b/Themes/default/templates/BoardIndex/bi_board_children.php
new file mode 100644
index 00000000000..0b287e97008
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_children.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board children for a standard board.
+ *
+ * @param array $board Current board information.
+ */
+?><?php /* Show the "Child Boards: ". (there's a link_children but we're going to bold the new ones...) */ ?><?php if (!empty($board['children'])): ?><?php
+// Sort the links into an array with new boards bold so it can be imploded.
+$children = [];
+/* Each child in each board's children has:
+			id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
+?><?php foreach ($board['children'] as $child): ?><?php if (!$child['is_redirect']): ?><?php $child['link'] = '' . ($child['new'] ? '<a href="' . Config::$scripturl . '?action=unread;board=' . $child['id'] . '" title="' . Lang::getTxt('new_posts_stats', ['posts' => $child['posts'], 'topics' => $child['topics']], file: 'General') . '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a> ' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . Lang::getTxt($child['new'] ? 'new_posts_stats' : 'old_posts_stats', ['posts' => $child['posts'], 'topics' => $child['topics']], file: 'General') . '">' . $child['name'] . '</a>'; ?><?php else: ?><?php $child['link'] = '<a href="' . $child['href'] . '" title="' . Lang::getTxt('number_of_redirects', [$child['posts']], file: 'General') . ' - ' . $child['short_description'] . '">' . $child['name'] . '</a>'; ?><?php endif; ?><?php /* Has it posts awaiting approval? */ ?><?php if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics'])): ?><?php $child['link'] .= ' <a href="' . Config::$scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" title="' . Lang::getTxt('unapproved_posts', $child, file: 'General') . '" class="moderation_link amt">!</a>'; ?><?php endif; ?><?php $children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>'; ?><?php endforeach; ?>
+			<div id="board_<?= $board['id'] ?>_children" class="children">
+				<p><?= Lang::getTxt(
+					'sub_boards_list',
+					[
+						'id' => 'child_list_' . $board['id'],
+						'num' => count($children),
+						'list' => implode(' ', $children),
+					],
+					file: 'General',
+				) ?></p>
+			</div><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/bi_board_icon.php b/Themes/default/templates/BoardIndex/bi_board_icon.php
new file mode 100644
index 00000000000..e0f0969f9ae
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_icon.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\User;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board icon for a standard board.
+ *
+ * @param array $board Current board information.
+ */
+?>
+		<a href="<?= (User::$me->is_guest ? $board['href'] : Config::$scripturl . '?action=unread;board=' . $board['id'] . '.0;children') ?>" class="board_<?= $board['board_class'] ?>"<?= !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '' ?>></a>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/bi_board_info.php b/Themes/default/templates/BoardIndex/bi_board_info.php
new file mode 100644
index 00000000000..9820e073cbd
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_info.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board info for a standard board or redirect.
+ *
+ * @param array $board Current board information.
+ */
+?>
+		<a class="subject mobile_subject" href="<?= $board['href'] ?>" id="b<?= $board['id'] ?>">
+			<?= $board['name'] ?>
+		</a><?php /* Has it outstanding posts for approval? */ ?><?php if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])): ?>
+		<a href="<?= Config::$scripturl ?>?action=moderate;area=postmod;sa=<?= ($board['unapproved_topics'] > 0 ? 'topics' : 'posts') ?>;brd=<?= $board['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" title="<?= Lang::getTxt('unapproved_posts', ['unapproved_topics' => $board['unapproved_topics'], 'unapproved_posts' => $board['unapproved_posts']], file: 'General') ?>" class="moderation_link amt">!</a><?php endif; ?>
+		<div class="board_description"><?= $board['description'] ?></div><?php /* Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.) */ ?><?php if (!empty($board['link_moderators'])): ?>
+		<p class="moderators"><?= Lang::getTxt('moderators_list', ['num' => count($board['link_moderators']), 'list' => Lang::sentenceList($board['link_moderators'])], file: 'General') ?></p><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/bi_board_lastpost.php b/Themes/default/templates/BoardIndex/bi_board_lastpost.php
new file mode 100644
index 00000000000..c9a9be8b337
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_lastpost.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board lastposts for a standard board or a redirect.
+ * When on a mobile device, this may be hidden if no last post exists.
+ *
+ * @param array $board Current board information.
+ */
+?><?php if (!empty($board['last_post']['id'])): ?>
+			<p><?= $board['last_post']['last_post_message'] ?></p><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/bi_board_list.php b/Themes/default/templates/BoardIndex/bi_board_list.php
new file mode 100644
index 00000000000..69645da0463
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_list.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs a list of boards, each one drawn by the template_bi_* helpers below.
+ *
+ * The board index calls this once per category, and the message index calls it
+ * for the child boards of the board being viewed. Both used to carry their own
+ * copy of this loop.
+ *
+ * Each board has: new (is it new?), id, name, description, moderators (see
+ * below), link_moderators (just a list.), children (see below.), link_children
+ * (easier to use.), children_new (are they new?), topics (# of), posts (# of),
+ * link, href, and last_post. (see below.)
+ *
+ * @param array $boards The boards to draw, in the order they go in.
+ */
+?><?php foreach ($boards as $board): ?>
+				<div id="board_<?= $board['id'] ?>" class="up_contain <?= (!empty($board['css_class']) ? $board['css_class'] : '') ?>">
+					<div class="board_icon">
+						<?= $this->hasSubTemplate('bi_' . $board['type'] . '_icon') ? $this->fetchSubTemplate('bi_' . $board['type'] . '_icon', ['board' => $board]) : $this->fetchSubTemplate('bi_board_icon', ['board' => $board]) ?>
+					</div>
+					<div class="info">
+						<?= $this->hasSubTemplate('bi_' . $board['type'] . '_info') ? $this->fetchSubTemplate('bi_' . $board['type'] . '_info', ['board' => $board]) : $this->fetchSubTemplate('bi_board_info', ['board' => $board]) ?>
+					</div><!-- .info --><?php /* Show some basic information about the number of posts, etc. */ ?>
+					<div class="board_stats">
+						<?= $this->hasSubTemplate('bi_' . $board['type'] . '_stats') ? $this->fetchSubTemplate('bi_' . $board['type'] . '_stats', ['board' => $board]) : $this->fetchSubTemplate('bi_board_stats', ['board' => $board]) ?>
+					</div><?php /* Show the last post if there is one. */ ?>
+					<div class="lastpost">
+						<?= $this->hasSubTemplate('bi_' . $board['type'] . '_lastpost') ? $this->fetchSubTemplate('bi_' . $board['type'] . '_lastpost', ['board' => $board]) : $this->fetchSubTemplate('bi_board_lastpost', ['board' => $board]) ?>
+					</div><?php /* Won't somebody think of the children! */ ?><?php if ($this->hasSubTemplate('bi_' . $board['type'] . '_children')): ?><?php $this->subTemplate('bi_' . $board['type'] . '_children', ['board' => $board]); ?><?php else: ?><?php $this->subTemplate('bi_board_children', ['board' => $board]); ?><?php endif; ?>
+				</div><!-- #board_[id] --><?php endforeach; ?>
diff --git a/Themes/default/templates/BoardIndex/bi_board_stats.php b/Themes/default/templates/BoardIndex/bi_board_stats.php
new file mode 100644
index 00000000000..0573d00a1ad
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_board_stats.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board stats for a standard board.
+ *
+ * @param array $board Current board information.
+ */
+?>
+		<p>
+			<?= Lang::getTxt('number_of_posts', [$board->posts], file: 'General') ?><br><?= Lang::getTxt('number_of_topics', [$board->topics], file: 'General') ?>
+		</p>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/bi_redirect_icon.php b/Themes/default/templates/BoardIndex/bi_redirect_icon.php
new file mode 100644
index 00000000000..8f69abc3d05
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_redirect_icon.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board icon for a redirect.
+ *
+ * @param array $board Current board information.
+ */
+?>
+		<a href="<?= $board['href'] ?>" class="board_<?= $board['board_class'] ?>"<?= !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '' ?>></a>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/bi_redirect_stats.php b/Themes/default/templates/BoardIndex/bi_redirect_stats.php
new file mode 100644
index 00000000000..179dc74f3e1
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/bi_redirect_stats.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Outputs the board stats for a redirect.
+ *
+ * @param array $board Current board information.
+ */
+?>
+		<p>
+			<?= Lang::getTxt('number_of_redirects', [$board->posts], file: 'General') ?>
+		</p>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/boardindex.php b/Themes/default/templates/BoardIndex/boardindex.php
new file mode 100644
index 00000000000..0313864b575
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/boardindex.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This actually displays the board index
+ */
+?>
+	<div id="boardindex_table" class="boardindex_table"><?php
+/* Each category in categories is made up of:
+	id, href, link, name, is_collapsed (is it collapsed?), can_collapse (is it okay if it is?),
+	new (is it new?), collapse_href (href to collapse/expand), collapse_image (up/down image),
+	and boards. (see below.) */
+?><?php foreach (Utils::$context['categories'] as $category): ?><?php /* If there's no parent boards we can see, avoid showing an empty category (unless its collapsed) */ ?><?php if (empty($category['boards']) && !$category['is_collapsed']): ?><?php continue; ?><?php endif; ?>
+		<div class="main_container">
+			<div class="cat_bar <?= $category['is_collapsed'] ? 'collapsed' : '' ?>" id="category_<?= $category['id'] ?>">
+				<h3 class="catbg">
+					<?= $category['link'] ?>
+				</h3><?php /* If this category even can collapse, show a link to collapse it. */ ?><?php if ($category['can_collapse']): ?>
+				<span id="category_<?= $category['id'] ?>_upshrink" class="<?= $category['is_collapsed'] ? 'toggle_down' : 'toggle_up' ?>" data-collapsed="<?= (int) $category['is_collapsed'] ?>" title="<?= Lang::getTxt(!$category['is_collapsed'] ? 'hide_category' : 'show_category', file: 'General') ?>" style="display: none;"></span><?php endif; ?><?= !empty($category['description']) ? '
+				<div class="desc">' . $category['description'] . '</div>' : '' ?>
+			</div>
+			<div id="category_<?= $category['id'] ?>_boards" <?= (!empty($category['css_class']) ? ('class="' . $category['css_class'] . '"') : '') ?><?= $category['is_collapsed'] ? ' style="display: none;"' : '' ?>><?php $this->subTemplate('bi_board_list', ['boards' => $category['boards']]); ?>
+			</div><!-- #category_[id]_boards -->
+		</div><!-- .main_container --><?php endforeach; ?>
+	</div><!-- #boardindex_table --><?php /* Show the mark all as read button? */ ?><?php if (!User::$me->is_guest && !empty(Utils::$context['categories'])): ?>
+	<div class="mark_read">
+		<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['mark_read_button'], 'direction' => 'right']); ?>
+	</div><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/ic_block_calendar.php b/Themes/default/templates/BoardIndex/ic_block_calendar.php
new file mode 100644
index 00000000000..a046f6ebf8d
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/ic_block_calendar.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The calendar section of the info center
+ */
+?><?php /* Show information about events, birthdays, and holidays on the calendar. */ ?>
+			<div class="sub_bar">
+				<h4 class="subbg">
+					<a href="<?= Config::$scripturl ?>?action=calendar"><span class="main_icons calendar"></span> <?= Lang::getTxt(Utils::$context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming', file: 'Calendar') ?></a>
+				</h4>
+			</div><?php /* Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P */ ?><?php if (!empty(Utils::$context['calendar_holidays'])): ?><?php $holidays = []; ?><?php foreach (Utils::$context['calendar_holidays'] as $holiday): ?><?php $holidays[] = $holiday->title . (!empty($holiday->location) ? ' (' . $holiday->location . ')' : ''); ?><?php endforeach; ?>
+			<p class="inline holiday">
+				<span class="label"><?= Lang::getTxt('calendar_prompt', file: 'Calendar') ?></span> <?= implode(', ', $holidays) ?>
+			</p><?php endif; ?><?php /* People's birthdays. Like mine. And yours, I guess. Kidding. */ ?><?php if (!empty(Utils::$context['calendar_birthdays'])): ?>
+			<p class="inline">
+				<span class="birthday"><?= Lang::getTxt(Utils::$context['calendar_only_today'] ? 'birthdays' : 'birthdays_upcoming', file: 'Calendar') ?></span><?php /* Each member in calendar_birthdays has: id, name (person), age (if they have one set?), is_last. (last in list?), and is_today (birthday is today?) */ ?><?php foreach (Utils::$context['calendar_birthdays'] as $bday): ?>
+				<a href="<?= Config::$scripturl ?>?action=profile;u=<?= $bday->id ?>"><?= $bday->is_today ? '<strong class="fix_rtl_names">' : '' ?><?= $bday->name ?><?= $bday->is_today ? '</strong>' : '' ?><?= isset($bday->age) ? ' (' . $bday->age . ')' : '' ?></a><?= $bday->is_last ? '' : ', ' ?><?php endforeach; ?>
+			</p><?php endif; ?><?php /* Events like community get-togethers. */ ?><?php if (!empty(Utils::$context['calendar_events'])): ?>
+			<p class="inline">
+				<span class="event"><?= Lang::getTxt(Utils::$context['calendar_only_today'] ? 'events' : 'events_upcoming', file: 'Calendar') ?></span> <?php
+// Each event in calendar_events should have:
+//		title, href, is_last, can_edit (are they allowed?), modify_href, and is_today.
+?><?php foreach (Utils::$context['calendar_events'] as $event): ?>
+				<?= $event->can_edit ? '<a href="' . $event->modify_href . '" title="' . Lang::getTxt('calendar_edit', file: 'Calendar') . '"><span class="main_icons calendar_modify"></span></a> ' : '' ?><?= $event->href == '' ? '' : '<a href="' . $event->href . '">' ?><?= $event->is_today ? '<strong>' . $event->title . '</strong>' : $event->title ?><?= $event->href == '' ? '' : '</a>' ?><?= $event->is_last ? '<br>' : ', ' ?><?php endforeach; ?>
+			</p><?php endif; ?>
diff --git a/Themes/default/templates/BoardIndex/ic_block_online.php b/Themes/default/templates/BoardIndex/ic_block_online.php
new file mode 100644
index 00000000000..c8c284269b7
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/ic_block_online.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Time;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The who's online section of the info center
+ */
+?><?php /* "Users online" - in order of activity. */ ?>
+			<div class="sub_bar">
+				<h4 class="subbg">
+					<?= Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '' ?><span class="main_icons people"></span> <?= Lang::getTxt('online_users', file: 'General') ?><?= Utils::$context['show_who'] ? '</a>' : '' ?>
+				</h4>
+			</div>
+			<p class="inline">
+				<?= Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '' ?><strong><?= Lang::getTxt('online', file: 'General') ?>: </strong><?= empty(Config::$modSettings['no_guest_logging']) ? Lang::getTxt('number_of_guests', [Utils::$context['num_guests']], file: 'General') . ', ' : '' ?><?= Lang::getTxt('number_of_members', [Utils::$context['num_users_online']], file: 'General') ?><?php
+// Handle hidden users and buddies.
+$bracketList = [];
+?><?php if (Utils::$context['show_buddies']): ?><?php $bracketList[] = Lang::getTxt('number_of_buddies', [Utils::$context['num_buddies']], file: 'General'); ?><?php endif; ?><?php if (!empty(Utils::$context['num_spiders'])): ?><?php $bracketList[] = Lang::getTxt('number_of_spiders', [Utils::$context['num_spiders']], file: 'General'); ?><?php endif; ?><?php if (!empty(Utils::$context['num_users_hidden'])): ?><?php $bracketList[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['num_users_hidden']], file: 'General'); ?><?php endif; ?><?php $bracketList = array_filter($bracketList, 'strlen'); ?><?php if (!empty($bracketList)): ?> (<?= Lang::sentenceList($bracketList) ?>)<?php endif; ?><?= Utils::$context['show_who'] ? '</a>' : '' ?>
+
+
+				&nbsp;-&nbsp;<?= Lang::getTxt('most_online_today', file: 'General') ?>: <strong><?= Lang::numberFormat(Config::$modSettings['mostOnlineToday']) ?></strong>&nbsp;-&nbsp;
+				<?= Lang::getTxt('most_online_ever', file: 'General') ?>: <?= Lang::numberFormat(Config::$modSettings['mostOnline']) ?> (<?= Time::create('@' . Config::$modSettings['mostDate'])->format() ?>)<br><?php /* Assuming there ARE users online... each user in users_online has an id, username, name, group, href, and link. */ ?><?php if (!empty(Utils::$context['users_online'])): ?>
+				<?= Lang::getTxt('users_active', ['minutes' => Config::$modSettings['lastActive'], 'list' => Lang::sentenceList(Utils::$context['list_users_online'])], file: 'General') ?><?php /* Showing membergroups? */ ?><?php if (!empty(Theme::$current->settings['show_group_key']) && !empty(Utils::$context['membergroups'])): ?>
+				<span class="membergroups"><?= implode(', ', Utils::$context['membergroups']) ?></span><?php endif; ?><?php endif; ?>
+			</p>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/ic_block_recent.php b/Themes/default/templates/BoardIndex/ic_block_recent.php
new file mode 100644
index 00000000000..7e7337e0335
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/ic_block_recent.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The recent posts section of the info center
+ */
+?>
+
+<?php /* This is the "Recent Posts" bar. */ ?>
+			<div class="sub_bar">
+				<h4 class="subbg">
+					<a href="<?= Config::$scripturl ?>?action=recent"><span class="main_icons recent_posts"></span> <?= Lang::getTxt('recent_posts', file: 'General') ?></a>
+				</h4>
+			</div>
+			<div id="recent_posts_content">
+<?php /* Only show one post. */ ?>
+<?php if (Theme::$current->settings['number_recent_posts'] == 1): ?>
+<?php /* latest_post has link, href, time, subject, short_subject (shortened with...), and topic. (its id.) */ ?>
+				<p id="infocenter_onepost" class="inline">
+					<a href="<?= Config::$scripturl ?>?action=recent"><?= Lang::getTxt('recent_view', file: 'General') ?></a> <?= Lang::getTxt('is_recent_updated', ['link' => '&quot;' . Utils::$context['latest_post']['link'] . '&quot;'], file: 'General') ?> (<?= Utils::$context['latest_post']['time'] ?>)<br>
+				</p>
+<?php /* Show lots of posts. */ ?>
+<?php elseif (!empty(Utils::$context['latest_posts'])): ?>
+				<table id="ic_recentposts">
+					<tr class="windowbg">
+						<th class="recentpost"><?= Lang::getTxt('message', file: 'General') ?></th>
+						<th class="recentposter"><?= Lang::getTxt('author', file: 'General') ?></th>
+						<th class="recentboard"><?= Lang::getTxt('board', file: 'General') ?></th>
+						<th class="recenttime"><?= Lang::getTxt('date', file: 'General') ?></th>
+					</tr>
+<?php
+/* Each post in latest_posts has:
+			board (with an id, name, and link.), topic (the topic's id.), member (with id, name, and link.),
+			subject, short_subject (shortened with...), time, link, and href. */
+?>
+<?php foreach (Utils::$context['latest_posts'] as $post): ?>
+					<tr class="windowbg">
+						<td class="recentpost"><strong><?= $post['link'] ?></strong></td>
+						<td class="recentposter"><?= $post['member']['link'] ?></td>
+						<td class="recentboard"><?= $post['board']['link'] ?></td>
+						<td class="recenttime"><?= $post['time'] ?></td>
+					</tr>
+<?php endforeach; ?>
+				</table>
+<?php endif; ?>
+			</div><!-- #recent_posts_content -->
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/ic_block_stats.php b/Themes/default/templates/BoardIndex/ic_block_stats.php
new file mode 100644
index 00000000000..79529620e92
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/ic_block_stats.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The stats section of the info center
+ */
+?>
+
+<?php /* Show statistical style information... */ ?>
+			<div class="sub_bar">
+				<h4 class="subbg">
+					<?= Utils::$context['show_stats'] ? '<a href="' . Config::$scripturl . '?action=stats" title="' . Lang::getTxt('more_stats', file: 'General') . '">' : '' ?><span class="main_icons stats"></span> <?= Lang::getTxt('forum_stats', file: 'General') ?><?= Utils::$context['show_stats'] ? '</a>' : '' ?>
+				</h4>
+			</div>
+			<p class="inline">
+				<?= Utils::$context['common_stats']['boardindex_total_posts'] ?><?= !empty(Theme::$current->settings['show_latest_member']) ? ' - ' . Lang::getTxt('latest_member', file: 'General') . ': <strong> ' . Utils::$context['common_stats']['latest_member']['link'] . '</strong>' : '' ?><br>
+				<?= (!empty(Utils::$context['latest_post']) ? Lang::getTxt('latest_post', file: 'General') . ': <strong>&quot;' . Utils::$context['latest_post']['link'] . '&quot;</strong>  (' . Utils::$context['latest_post']['time'] . ')<br>' : '') ?>
+				<a href="<?= Config::$scripturl ?>?action=recent"><?= Lang::getTxt('recent_view', file: 'General') ?></a>
+			</p>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/index.php b/Themes/default/templates/BoardIndex/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/BoardIndex/info_center.php b/Themes/default/templates/BoardIndex/info_center.php
new file mode 100644
index 00000000000..52a4e7935c1
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/info_center.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays the info center
+ */
+?><?php if (empty(Utils::$context['info_center'])): ?><?php return; ?><?php endif; ?><?php /* Here's where the "Info Center" starts... */ ?>
+	<div class="roundframe" id="info_center">
+		<div class="title_bar">
+			<h3 class="titlebg">
+				<a href="#" id="upshrink_link"><?= Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General') ?></a>
+			</h3>
+			<span class="toggle_up" id="upshrink_ic" title="<?= Lang::getTxt('hide_infocenter', file: 'General') ?>" style="display: none;"></span>
+		</div>
+		<div id="upshrink_stats"<?= empty(Theme::$current->options['collapse_header_ic']) ? '' : ' style="display: none;"' ?>><?php foreach (Utils::$context['info_center'] as $block): ?><?php $this->subTemplate('ic_block_' . $block['tpl']); ?><?php endforeach; ?>
+		</div><!-- #upshrink_stats -->
+	</div><!-- #info_center --><?php /* Info center collapse object. */ ?>
+	<script>
+		var oInfoCenterToggle = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: <?= empty(Theme::$current->options['collapse_header_ic']) ? 'false' : 'true' ?>,
+			aSwappableContainers: [
+				'upshrink_stats'
+			],
+			aSwapImages: [
+				{
+					sId: 'upshrink_ic',
+					altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide_infocenter', file: 'General')) ?>,
+					altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show_infocenter', file: 'General')) ?>
+
+				}
+			],
+			aSwapLinks: [
+				{
+					sId: 'upshrink_link',
+					msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General')) ?>,
+					msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('info_center_title', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General')) ?>
+
+				}
+			],
+			oThemeOptions: {
+				bUseThemeSettings: <?= User::$me->is_guest ? 'false' : 'true' ?>,
+				sOptionName: 'collapse_header_ic',
+				sSessionId: smf_session_id,
+				sSessionVar: smf_session_var,
+			},
+			oCookieOptions: {
+				bUseCookie: <?= User::$me->is_guest ? 'true' : 'false' ?>,
+				sCookieName: 'upshrinkIC'
+			}
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/BoardIndex/newsfader.php b/Themes/default/templates/BoardIndex/newsfader.php
new file mode 100644
index 00000000000..6b5d4598c09
--- /dev/null
+++ b/Themes/default/templates/BoardIndex/newsfader.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This shows the newsfader
+ */
+?><?php /* Show the news fader?  (assuming there are things to show...) */ ?><?php if (!empty(Theme::$current->settings['show_newsfader']) && !empty(Utils::$context['news_lines'])): ?>
+		<ul id="smf_slider" class="roundframe"><?php foreach (Utils::$context['news_lines'] as $news): ?>
+			<li><?= $news ?></li><?php endforeach; ?>
+		</ul>
+		<script>
+			jQuery("#smf_slider").slippry({
+				pause: <?= Theme::$current->settings['newsfader_time'] ?>,
+				adaptiveHeight: 0,
+				captions: 0,
+				controls: 0,
+			});
+		</script><?php endif; ?>
diff --git a/Themes/default/templates/Calendar/bcd.php b/Themes/default/templates/Calendar/bcd.php
new file mode 100644
index 00000000000..5180312fbdd
--- /dev/null
+++ b/Themes/default/templates/Calendar/bcd.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a clock
+ */
+?><?php $this->subTemplate('geek_clock', ['style' => 'bcd', 'title' => 'BCD Clock']); ?>
+			<div class="centertext">
+				<a href="<?= Config::$scripturl ?>?action=clock;rb" class="button">Are you hardcore?</a>
+			</div>
+		</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/calendar_top.php b/Themes/default/templates/Calendar/calendar_top.php
new file mode 100644
index 00000000000..4ac5b4a901f
--- /dev/null
+++ b/Themes/default/templates/Calendar/calendar_top.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Calendar controls under the title
+ *
+ * Creates the view selector (list, month, week), the date selector (either a
+ * select menu or a date range chooser, depending on the circumstances), and the
+ * "Post Event" button.
+ *
+ * @param array $calendar_data The data for the calendar grid that this is for
+ */
+?>
+		<div class="calendar_top roundframe<?= empty($calendar_data['disable_title']) ? ' noup' : '' ?>">
+			<div id="calendar_viewselector" class="buttonrow floatleft">
+				<a href="<?= Config::$scripturl ?>?action=calendar;viewlist;year=<?= Utils::$context['current_year'] ?>;month=<?= Utils::$context['current_month'] ?>;day=<?= Utils::$context['current_day'] ?>" class="button<?= Utils::$context['calendar_view'] == 'viewlist' ? ' active' : '' ?>"><?= Lang::getTxt('calendar_list', file: 'Calendar') ?></a>
+				<a href="<?= Config::$scripturl ?>?action=calendar;viewmonth;year=<?= Utils::$context['current_year'] ?>;month=<?= Utils::$context['current_month'] ?>;day=<?= Utils::$context['current_day'] ?>" class="button<?= Utils::$context['calendar_view'] == 'viewmonth' ? ' active' : '' ?>"><?= Lang::getTxt('calendar_month', file: 'Calendar') ?></a>
+				<a href="<?= Config::$scripturl ?>?action=calendar;viewweek;year=<?= Utils::$context['current_year'] ?>;month=<?= Utils::$context['current_month'] ?>;day=<?= Utils::$context['current_day'] ?>" class="button<?= Utils::$context['calendar_view'] == 'viewweek' ? ' active' : '' ?>"><?= Lang::getTxt('calendar_week', file: 'Calendar') ?></a>
+			</div>
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['calendar_buttons'], 'direction' => 'right']); ?>
+			<form action="<?= Config::$scripturl ?>?action=calendar;<?= Utils::$context['calendar_view'] ?>" id="<?= !empty($calendar_data['end_date']) ? 'calendar_range' : 'calendar_navigation' ?>" method="post" accept-charset="UTF-8">
+				<input type="date" name="start_date" id="start_date" value="<?= $calendar_data['iso_start_date'] ?>" class="date_input start" data-type="date">
+<?php if (!empty($calendar_data['end_date'])): ?>
+				<span><?= Utils::strtolower(Lang::getTxt('to', file: 'General')) ?></span>
+				<input type="date" name="end_date" id="end_date" value="<?= $calendar_data['iso_end_date'] ?>" class="date_input end" data-type="date">
+<?php endif; ?>
+				<input type="submit" class="button" style="float:none" id="view_button" value="<?= Lang::getTxt('view', file: 'General') ?>">
+			</form>
+		</div><!-- .calendar_top -->
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/event_post.php b/Themes/default/templates/Calendar/event_post.php
new file mode 100644
index 00000000000..71fdf8c939f
--- /dev/null
+++ b/Themes/default/templates/Calendar/event_post.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for posting a calendar event.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=calendar;sa=post" method="post" name="postevent" accept-charset="UTF-8" onsubmit="submitonce(this);">
+<?php if (!empty(Utils::$context['event']->new)): ?>
+			<input type="hidden" name="eventid" value="<?= Utils::$context['event']->id ?>">
+			<input type="hidden" name="recurrenceid" value="<?= Utils::$context['event']->selected_occurrence->id ?>">
+<?php endif; ?>
+<?php /* Start the main table. */ ?>
+			<div id="post_event">
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<?= Utils::$context['page_title'] ?>
+					</h3>
+				</div>
+<?php if (!empty(Utils::$context['post_error']['messages'])): ?>
+				<div class="errorbox">
+					<dl class="event_error">
+						<dt>
+							<?= Utils::$context['error_type'] == 'serious' ? '<strong>' . Lang::getTxt('error_while_submitting', file: 'General') . '</strong>' : '' ?>
+						</dt>
+						<dt class="error">
+							<?= implode('<br>', Utils::$context['post_error']['messages']) ?>
+						</dt>
+					</dl>
+				</div>
+<?php endif; ?>
+				<div class="roundframe noup"><?php $this->subTemplate('event_options'); ?>
+					<div class="buttonlist">
+						<input type="submit" value="<?= Lang::getTxt(empty(Utils::$context['event']->new) ? 'save' : 'post', file: 'General') ?>" class="button floatright">
+<?php if (!Utils::$context['event']->new): ?>
+						<input type="submit" name="deleteevent" value="<?= Lang::getTxt('calendar_repeat_delete_label', file: 'Calendar') ?>" class="button floatright you_sure" data-confirm="<?= Lang::getTxt(Utils::$context['event']->selected_occurrence->is_first ? 'calendar_confirm_delete' : 'calendar_confirm_occurrence_delete', file: 'Calendar') ?>">
+<?php if (!Utils::$context['event']->selected_occurrence->is_first): ?>
+						<a href="<?= Utils::$context['event']->modify_href ?>" class="button floatright"><?= Lang::getTxt('calendar_repeat_adjustment_edit_first', file: 'Calendar') ?></a>
+<?php endif; ?>
+<?php endif; ?>
+					</div>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				</div><!-- .roundframe -->
+			</div><!-- #post_event -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/geek_clock.php b/Themes/default/templates/Calendar/geek_clock.php
new file mode 100644
index 00000000000..bed9459a135
--- /dev/null
+++ b/Themes/default/templates/Calendar/geek_clock.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Draws the lamps of one of the geek clocks.
+ *
+ * The lamps start out unlit and carry the unit and the bit they stand for.
+ * calendar.js lights the right ones twice a second, so nothing echoed here goes
+ * stale the moment the page has finished loading. Leaves the .roundframe open
+ * for the caller to add its own footer to.
+ *
+ * @param string $style Which clock this is. calendar.js reads the digits to show from it.
+ * @param string $title Heading to put above the clock.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= $title ?></h3>
+		</div>
+		<div class="roundframe noup">
+			<ul id="geek_clock" class="<?= $style ?>">
+<?php foreach (Utils::$context['clockicons'] as $unit => $bits): ?>
+				<li>
+					<ul>
+<?php foreach ($bits as $bit): ?>
+						<li data-unit="<?= $unit ?>" data-bit="<?= $bit ?>"></li>
+<?php endforeach; ?>
+					</ul>
+				</li>
+<?php endforeach; ?>
+			</ul>
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/hms.php b/Themes/default/templates/Calendar/hms.php
new file mode 100644
index 00000000000..1307c9d25db
--- /dev/null
+++ b/Themes/default/templates/Calendar/hms.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays the hours, minutes and seconds for our clock
+ */
+?><?php $this->subTemplate('geek_clock', ['style' => 'hms', 'title' => 'Binary Clock']); ?>
+			<div class="centertext">
+				<a href="<?= Config::$scripturl ?>?action=clock" class="button">Too tough for you?</a>
+			</div>
+		</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/index.php b/Themes/default/templates/Calendar/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Calendar/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Calendar/main.php b/Themes/default/templates/Calendar/main.php
new file mode 100644
index 00000000000..f4fe5d6a98b
--- /dev/null
+++ b/Themes/default/templates/Calendar/main.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Our main calendar template, which encapsulates weeks and months.
+ */
+?>
+
+<?php /* The main calendar wrapper. */ ?>
+		<div id="calendar">
+<?php /* Show the mini-blocks if they're enabled. */ ?>
+<?php if (empty(Utils::$context['blocks_disabled'])): ?>
+			<div id="month_grid">
+				<?php $this->subTemplate('show_month_grid', ['grid_name' => 'prev', 'is_mini' => true]); ?>
+				<?php $this->subTemplate('show_month_grid', ['grid_name' => 'current', 'is_mini' => true]); ?>
+				<?php $this->subTemplate('show_month_grid', ['grid_name' => 'next', 'is_mini' => true]); ?>
+			</div>
+<?php endif; ?>
+<?php /* What view are we showing? */ ?>
+<?php if (Utils::$context['calendar_view'] == 'viewlist'): ?>
+			<div id="main_grid">
+				<?php $this->subTemplate('show_upcoming_list', ['grid_name' => 'main']); ?>
+			</div>
+<?php elseif (Utils::$context['calendar_view'] == 'viewweek'): ?>
+			<div id="main_grid">
+				<?php $this->subTemplate('show_week_grid', ['grid_name' => 'main']); ?>
+			</div>
+<?php else: ?>
+			<div id="main_grid">
+				<?php $this->subTemplate('show_month_grid', ['grid_name' => 'main']); ?>
+			</div>
+<?php endif; ?>
+<?php /* Close our wrapper. */ ?>
+		</div><!-- #calendar -->
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/omfg.php b/Themes/default/templates/Calendar/omfg.php
new file mode 100644
index 00000000000..716cc7ea057
--- /dev/null
+++ b/Themes/default/templates/Calendar/omfg.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a binary clock
+ */
+?><?php $this->subTemplate('geek_clock', ['style' => 'omfg', 'title' => 'OMFG Binary Clock']); ?>
+		</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/show_month_grid.php b/Themes/default/templates/Calendar/show_month_grid.php
new file mode 100644
index 00000000000..efe5bba303a
--- /dev/null
+++ b/Themes/default/templates/Calendar/show_month_grid.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Display a monthly calendar grid.
+ *
+ * @param string $grid_name The grid name
+ * @param bool $is_mini Is this a mini grid?
+ * @return void|bool Returns false if the grid doesn't exist.
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['is_mini' => false], EXTR_SKIP);
+?><?php /* If the grid doesn't exist, no point in proceeding. */ ?><?php if (!isset(Utils::$context['calendar_grid_' . $grid_name])): ?><?php return false; ?><?php endif; ?><?php
+// A handy little pointer variable.
+$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
+// Some conditions for whether or not we should show the week links *here*.
+?><?php if (isset($calendar_data['show_week_links']) && ($calendar_data['show_week_links'] == 3 || (($calendar_data['show_week_links'] == 1 && $is_mini === true) || $calendar_data['show_week_links'] == 2 && $is_mini === false))): ?><?php $show_week_links = true; ?><?php else: ?><?php $show_week_links = false; ?><?php endif; ?><?php /* Assuming that we've not disabled it, show the title block! */ ?><?php if (empty($calendar_data['disable_title'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg centertext largetext"><?php /* Previous Link: If we're showing prev / next and it's not a mini-calendar. */ ?><?php if (empty($calendar_data['previous_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false): ?>
+					<span class="floatleft">
+						<a href="<?= $calendar_data['previous_calendar']['href'] ?>">&#171;</a>
+					</span><?php endif; ?><?php /* Next Link: if we're showing prev / next and it's not a mini-calendar. */ ?><?php if (empty($calendar_data['next_calendar']['disabled']) && $calendar_data['show_next_prev'] && $is_mini === false): ?>
+					<span class="floatright">
+						<a href="<?= $calendar_data['next_calendar']['href'] ?>">&#187;</a>
+					</span><?php endif; ?><?php /* Arguably the most exciting part, the title! */ ?>
+					<a href="<?= Config::$scripturl ?>?action=calendar;<?= Utils::$context['calendar_view'] ?>;year=<?= $calendar_data['current_year'] ?>;month=<?= $calendar_data['current_month'] ?>;day=<?= $calendar_data['current_day'] ?>"><?= Lang::getTxt('months_titles', file: 'General')[$calendar_data['current_month']] ?> <?= $calendar_data['current_year'] ?></a>
+				</h3>
+			</div><!-- .cat_bar --><?php endif; ?><?php /* Show the controls on main grids */ ?><?php if ($is_mini === false): ?><?php $this->subTemplate('calendar_top', ['calendar_data' => $calendar_data]); ?><?php endif; ?><?php /* Finally, the main calendar table. */ ?>
+			<table class="calendar_table"><?php /* Show each day of the week. */ ?><?php if (empty($calendar_data['disable_day_titles'])): ?>
+				<tr><?php /* If we're showing week links, there's an extra column ahead of the week links, so let's think ahead and be prepared! */ ?><?php if ($show_week_links === true): ?>
+					<th></th><?php endif; ?><?php /* Now, loop through each actual day of the week. */ ?><?php foreach ($calendar_data['week_days'] as $day): ?>
+					<th class="days" scope="col"><?= Lang::getTxt([!empty($calendar_data['short_day_titles']) || $is_mini === true ? 'days_short' : 'days', $day], file: 'General') ?></th><?php endforeach; ?>
+				</tr><?php endif; ?><?php /* Our looping begins on a per-week basis. */ ?><?php foreach ($calendar_data['weeks'] as $week): ?><?php
+// Some useful looping variables.
+$current_month_started = false;
+$count = 1;
+$final_count = 1;
+?>
+				<tr class="days_wrapper"><?php /* This is where we add the actual week link, if enabled on this location. */ ?><?php if ($show_week_links === true): ?>
+					<td class="windowbg weeks">
+						<a href="<?= Config::$scripturl ?>?action=calendar;viewweek;year=<?= $calendar_data['current_year'] ?>;month=<?= $calendar_data['current_month'] ?>;day=<?= $week['days'][0]['day'] ?>" title="<?= Lang::getTxt('calendar_view_week', file: 'Calendar') ?>">&#187;</a>
+					</td><?php endif; ?><?php /* Now loop through each day in the week we're on. */ ?><?php foreach ($week['days'] as $day): ?><?php
+// What classes should each day inherit? Day is default.
+$classes = ['days'];
+?><?php if (!empty($day['day'])): ?><?php
+$classes[] = !empty($day['is_today']) ? 'calendar_today' : 'windowbg';
+// Additional classes are given for events, holidays, and birthdays.
+?><?php foreach (['events', 'holidays', 'birthdays'] as $event_type): ?><?php if (!empty($day[$event_type])): ?><?php $classes[] = $event_type; ?><?php endif; ?><?php endforeach; ?><?php else: ?><?php $classes[] = 'disabled'; ?><?php endif; ?><?php /* Now, implode the classes for each day. */ ?>
+					<td class="<?= implode(' ', $classes) ?>"><?php /* If it's within this current month, go ahead and begin. */ ?><?php if (!empty($day['day'])): ?><?php
+// If it's the first day of this month and not a mini-calendar, we'll add the month title - whether short or full.
+$title_prefix = !empty($day['is_first_of_month']) && Utils::$context['current_month'] == $calendar_data['current_month'] && $is_mini === false ? Lang::getTxt([!empty($calendar_data['short_month_titles']) ? 'months_short' : 'months_titles', $calendar_data['current_month']], file: 'General') . ' ' : '';
+// The actual day number - be it a link, or just plain old text!
+?><?php if (!empty(Config::$modSettings['cal_daysaslink']) && Utils::$context['can_post']): ?>
+						<a href="<?= Config::$scripturl ?>?action=calendar;sa=post;year=<?= $calendar_data['current_year'] ?>;month=<?= $calendar_data['current_month'] ?>;day=<?= $day['day'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="day_text"><?= $title_prefix ?><?= $day['day'] ?></span></a><?php elseif ($is_mini): ?>
+						<a href="<?= Config::$scripturl ?>?action=calendar;<?= Utils::$context['calendar_view'] ?>;year=<?= $calendar_data['current_year'] ?>;month=<?= $calendar_data['current_month'] ?>;day=<?= $day['day'] ?>"><span class="day_text"><?= $title_prefix ?><?= $day['day'] ?></span></a><?php else: ?>
+						<span class="day_text"><?= $title_prefix ?><?= $day['day'] ?></span><?php endif; ?><?php /* A lot of stuff, we're not showing on mini-calendars to conserve space. */ ?><?php if ($is_mini === false): ?><?php /* Holidays are always fun, let's show them! */ ?><?php if (!empty($day['holidays'])): ?>
+						<div class="smalltext holiday">
+							<span class="label"><?= Lang::getTxt('calendar_prompt', file: 'Calendar') ?></span> <?php endif; ?><?php $holidays = []; ?><?php foreach ($day['holidays'] as $holiday): ?><span class="holiday_wrapper"><?php $holiday_string = $holiday->title; ?><?php if (empty($holiday->allday) && !empty($holiday->start_time_local) && $holiday->start_date == $day['date']): ?><?php $holiday_string .= ' <span class="event_time">' . trim(str_replace(':00 ', ' ', $holiday->start_time_local)) . '</span>'; ?><?php endif; ?><?php if (!empty($holiday->location)): ?><?php $holiday_string .= ' <span class="event_location">' . $holiday->location . '</span>'; ?><?php endif; ?><?php $holidays[] = $holiday_string; ?><?php endforeach; ?><?= implode('<span>, <span class="holiday_wrapper">', $holidays) ?></span>
+						</div><?php /* Happy Birthday Dear Member! */ ?><?php if (!empty($day['birthdays'])): ?>
+						<div class="smalltext">
+							<span class="birthday"><?= Lang::getTxt('birthdays', file: 'Calendar') ?></span> <?php
+/* Each of the birthdays has:
+							id, name (person), age (if they have one set?), and is_last. (last in list?) */
+$use_js_hide = empty(Utils::$context['show_all_birthdays']) && count($day['birthdays']) > 15;
+$birthday_count = 0;
+?><?php foreach ($day['birthdays'] as $bday): ?><a href="<?= Config::$scripturl ?>?action=profile;u=<?= $bday->member ?>"><span class="fix_rtl_names"><?= $bday->name ?></span><?= isset($bday->age) ? ' (' . $bday->age . ')' : '' ?></a><?= $bday->is_last || ($count == 10 && $use_js_hide) ? '' : ', ' ?><?php /* 9...10! Let's stop there. */ ?><?php if ($birthday_count == 10 && $use_js_hide): ?><?php /* !!TODO - Inline CSS and JavaScript should be moved. */ ?><span class="hidelink" id="bdhidelink_<?= $day['day'] ?>">...<br><a href="<?= Config::$scripturl ?>?action=calendar;month=<?= $calendar_data['current_month'] ?>;year=<?= $calendar_data['current_year'] ?>;showbd" onclick="document.getElementById('bdhide_<?= $day['day'] ?>').classList.remove('hidden'); document.getElementById('bdhidelink_<?= $day['day'] ?>').classList.add('hidden'); return false;">(<?= Lang::getTxt('calendar_click_all', file: 'Calendar') ?>)</a></span><span id="bdhide_<?= $day['day'] ?>" class="hidden">, <?php endif; ?><?php ++$birthday_count; ?><?php endforeach; ?><?php if ($use_js_hide): ?>
+							</span><?php endif; ?>
+						</div><!-- .smalltext --><?php endif; ?><?php /* Any special posted events? */ ?><?php if (!empty($day['events'])): ?><?php
+// Sort events by start time (all day events will be listed first)
+uasort(
+	$day['events'],
+	function ($a, $b) {
+								if ($a['start_timestamp'] == $b['start_timestamp']) {
+									return 0;
+								}
+
+								return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
+							},
+);
+?>
+						<div class="smalltext lefttext">
+							<span class="event"><?= Lang::getTxt('events', file: 'Calendar') ?></span><br><?php
+/* The events are made up of:
+							title, href, is_last, can_edit (are they allowed to?), and modify_href. */
+?><?php foreach ($day['events'] as $event): ?><?php $event_icons_needed = ($event->can_edit || $event->can_export) ? true : false; ?>
+							<div class="event_wrapper<?= $event->start->date == $day['date'] ? ' event_starts_today' : '' ?><?= $event->end->date == $day['date'] ? ' event_ends_today' : '' ?><?= $event->allday == true ? ' allday' : '' ?><?= $event->is_selected ? ' sel_event' : '' ?>">
+								<?= $event->link ?><br>
+								<span class="event_time<?= empty($event_icons_needed) ? ' floatright' : '' ?>"><?php if (!empty($event->allday)): ?><?= Lang::getTxt('calendar_allday', file: 'Calendar') ?><?php elseif (!empty($event->start->time_local) && $event->start->date == $day['date']): ?><?= trim(str_replace(':00 ', ' ', $event->start->time_local)) ?><?php elseif (!empty($event->end->time_local) && $event->end->date == $day['date']): ?><?= strtolower(Lang::getTxt('ends', file: 'General')) ?> <?= trim(str_replace(':00 ', ' ', $event->end->time_local)) ?><?php endif; ?>
+								</span><?php if (!empty($event->location)): ?>
+								<br>
+								<span class="event_location<?= empty($event_icons_needed) ? ' floatright' : '' ?>"><?= $event->location ?></span><?php endif; ?><?php if ($event->can_edit || $event->can_export): ?>
+								<span class="modify_event_links"><?php /* If they can edit the event, show an icon they can click on.... */ ?><?php if ($event->can_edit): ?>
+									<a class="modify_event" href="<?= $event->modify_href ?>">
+										<span class="main_icons calendar_modify" title="<?= Lang::getTxt('calendar_edit', file: 'Calendar') ?>"></span>
+									</a><?php endif; ?><?php /* Exporting! */ ?><?php if ($event->can_export): ?>
+									<a class="modify_event" href="<?= $event->export_href ?>">
+										<span class="main_icons calendar_export" title="<?= Lang::getTxt('calendar_export', file: 'Calendar') ?>"></span>
+									</a><?php endif; ?>
+								</span><br class="clear"><?php endif; ?>
+							</div><!-- .event_wrapper --><?php endforeach; ?>
+						</div><!-- .smalltext --><?php endif; ?><?php endif; ?><?php
+$current_month_started = $count;
+// Otherwise, assuming it's not a mini-calendar, we can show previous / next month days!
+?><?php elseif ($is_mini === false): ?><?php if (empty($current_month_started) && !empty(Utils::$context['calendar_grid_prev'])): ?><a href="<?= Config::$scripturl ?>?action=calendar;viewmonth;year=<?= Utils::$context['calendar_grid_prev']['current_year'] ?>;month=<?= Utils::$context['calendar_grid_prev']['current_month'] ?>"><?= Utils::$context['calendar_grid_prev']['last_of_month'] - $calendar_data['shift']-- + 1 ?></a><?php elseif (!empty($current_month_started) && !empty(Utils::$context['calendar_grid_next'])): ?><a href="<?= Config::$scripturl ?>?action=calendar;viewmonth;year=<?= Utils::$context['calendar_grid_next']['current_year'] ?>;month=<?= Utils::$context['calendar_grid_next']['current_month'] ?>"><?= $current_month_started + 1 == $count ? Lang::getTxt([!empty($calendar_data['short_month_titles']) ? 'months_short' : 'months_titles', Utils::$context['calendar_grid_next']['current_month']], file: 'General') . ' ' : '' ?><?= $final_count++ ?></a><?php endif; ?><?php endif; ?><?php /* Close this day and increase var count. */ ?>
+					</td><?php ++$count; ?><?php endforeach; ?>
+				</tr><?php endforeach; ?><?php /* The end of our main table. */ ?>
+			</table>
\ No newline at end of file
diff --git a/Themes/default/templates/Calendar/show_upcoming_list.php b/Themes/default/templates/Calendar/show_upcoming_list.php
new file mode 100644
index 00000000000..8676726e8bc
--- /dev/null
+++ b/Themes/default/templates/Calendar/show_upcoming_list.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Display a list of upcoming events, birthdays, and holidays.
+ *
+ * @param string $grid_name The grid name
+ * @return void|bool Returns false if the grid doesn't exist.
+ */
+?><?php /* Bail out if we have nothing to work with */ ?><?php if (!isset(Utils::$context['calendar_grid_' . $grid_name])): ?><?php return false; ?><?php endif; ?><?php
+// Protect programmer sanity
+$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
+// Do we want a title?
+?><?php if (empty($calendar_data['disable_title'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg centertext largetext">
+					<a href="<?= Config::$scripturl ?>?action=calendar;viewlist;year=<?= $calendar_data['start_year'] ?>;month=<?= $calendar_data['start_month'] ?>;day=<?= $calendar_data['start_day'] ?>"><?= Lang::getTxt('calendar_upcoming', file: 'Calendar') ?></a>
+				</h3>
+			</div><?php endif; ?><?php /* Give the user some controls to work with */ ?><?php $this->subTemplate('calendar_top', ['calendar_data' => $calendar_data]); ?><?php /* Output something just so people know it's not broken */ ?><?php if (empty($calendar_data['events']) && empty($calendar_data['birthdays']) && empty($calendar_data['holidays'])): ?>
+			<div class="descbox"><?= Lang::getTxt('calendar_empty', file: 'Calendar') ?></div><?php endif; ?><?php /* First, list any events */ ?><?php if (!empty($calendar_data['events'])): ?>
+			<div>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= str_replace(':', '', Lang::getTxt('events', file: 'Calendar')) ?></h3>
+				</div>
+				<ul><?php $first_shown = []; ?><?php foreach ($calendar_data['events'] as $date => $date_events): ?><?php foreach ($date_events as $event): ?>
+					<li class="windowbg">
+						<strong class="event_title"><?= $event->link ?></strong><?php if ($event->can_edit): ?> <a href="<?= $event->modify_href ?>"><span class="main_icons calendar_modify" title="<?= Lang::getTxt('calendar_edit', file: 'Calendar') ?>"></span></a><?php endif; ?><?php if ($event->can_export): ?> <a href="<?= $event->export_href ?>"><span class="main_icons calendar_export" title="<?= Lang::getTxt('calendar_export', file: 'Calendar') ?>"></span></a><?php endif; ?>
+						<br><?php if (!empty($event->allday)): ?><time datetime="<?= $event->start->iso_gmdate ?>"><?= trim($event->start->date_local) ?></time><?= ($event->start->date_local < $event->last_date_local) ? ' &ndash; <time datetime="' . $event->last_iso_gmdate . '">' . trim($event->last_date_local) . '</time>' : '' ?><?php else: ?><?php /* Display event info relative to user's local timezone */ ?><time datetime="<?= $event->start->iso_gmdate ?>"><?= trim($event->start->date_local) ?>, <?= trim($event->start->time_local) ?></time> &ndash; <time datetime="<?= $event->end->iso_gmdate ?>"><?php if ($event->start->date_local != $event->end->date_local): ?><?= trim($event->end->date_local) ?>, <?php endif; ?><?= trim($event->end->time_local) ?><?php /* Display event info relative to original timezone */ ?><?php if ($event->start->date_local . $event->start->time_local != $event->start->date_orig . $event->start->time_orig): ?></time> (<time datetime="<?= $event->start->iso_gmdate ?>"><?php if ($event->start->date_orig != $event->start->date_local || $event->end->date_orig != $event->end->date_local || $event->start->date_orig != $event->end->date_orig): ?><?= trim($event->start->date_orig) ?>, <?php endif; ?><?= trim($event->start->time_orig) ?></time> &ndash; <time datetime="<?= $event->end->iso_gmdate ?>"><?php if ($event->start->date_orig != $event->end->date_orig): ?><?= trim($event->end->date_orig) ?>, <?php endif; ?><?= trim($event->end->time_orig) ?> <?= $event->tz_abbrev ?></time>)<?php /* Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion */ ?><?php else: ?> <?= $event->tz_abbrev ?></time><?php endif; ?><?php endif; ?><?php if (!empty($event->location)): ?><br><?= $event->location ?><?php endif; ?><?php
+// If the first occurrence is not visible on the current page,
+// we mention it in the RRULE description.
+?><?php if ($event->is_first): ?><?php $first_shown[] = $event->id_event; ?><?php endif; ?><?php $rrule_description = $event->getParentEvent()->recurrence_iterator->getRRule()->getDescription($event, !in_array($event->id_event, $first_shown)); ?><?php if (!empty($rrule_description)): ?>
+						<br><?= $rrule_description ?><?php endif; ?>
+					</li><?php endforeach; ?><?php endforeach; ?>
+				</ul>
+			</div><?php endif; ?><?php /* Next, list any birthdays */ ?><?php if (!empty($calendar_data['birthdays'])): ?>
+			<div>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= str_replace(':', '', Lang::getTxt('birthdays', file: 'Calendar')) ?></h3>
+				</div>
+				<div class="windowbg"><?php foreach ($calendar_data['birthdays'] as $date): ?>
+					<p class="inline">
+						<strong><?= $date['date_local'] ?></strong>: <?php
+unset($date['date_local']);
+$birthdays = [];
+?><?php foreach ($date as $bday): ?><?php $birthdays[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $bday->member . '">' . $bday->name . (isset($bday->age) ? ' (' . $bday->age . ')' : '') . '</a>'; ?><?php endforeach; ?><?= implode(', ', $birthdays) ?>
+					</p><?php endforeach; ?>
+				</div><!-- .windowbg -->
+			</div><?php endif; ?><?php /* Finally, list any holidays */ ?><?php if (!empty($calendar_data['holidays'])): ?>
+			<div>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= str_replace(':', '', Lang::getTxt('calendar_prompt', file: 'Calendar')) ?></h3>
+				</div>
+				<div class="windowbg">
+					<p class="inline holidays"><?php foreach ($calendar_data['holidays'] as $date): ?>
+						<span>
+							<strong><?= $date['date_local'] ?></strong>: <?php
+unset($date['date_local']);
+$holidays = [];
+?><?php foreach ($date as $holiday): ?><?php $holidays[] = $holiday->title . (!empty($holiday->location) ? ' (' . $holiday->location . ')' : ''); ?><?php endforeach; ?><?= implode(', ', $holidays) ?>.
+						</span><?php endforeach; ?>
+					</p>
+				</div><!-- .windowbg -->
+			</div><?php endif; ?>
diff --git a/Themes/default/templates/Calendar/show_week_grid.php b/Themes/default/templates/Calendar/show_week_grid.php
new file mode 100644
index 00000000000..1a3c38f8c96
--- /dev/null
+++ b/Themes/default/templates/Calendar/show_week_grid.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Shows a weekly grid
+ *
+ * @param string $grid_name The name of the grid
+ * @return void|bool Returns false if the grid doesn't exist
+ */
+?><?php /* We might have no reason to proceed, if the variable isn't there. */ ?><?php if (!isset(Utils::$context['calendar_grid_' . $grid_name])): ?><?php return false; ?><?php endif; ?><?php
+// Handy pointer.
+$calendar_data = &Utils::$context['calendar_grid_' . $grid_name];
+// At the very least, we have one month. Possibly two, though.
+$iteration = 1;
+?><?php foreach ($calendar_data['months'] as $month_data): ?><?php /* For our first iteration, we'll add a nice header! */ ?><?php if ($iteration == 1): ?>
+				<div class="cat_bar">
+					<h3 class="catbg centertext largetext"><?php /* Previous Week Link... */ ?><?php if (empty($calendar_data['previous_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])): ?>
+						<span class="floatleft">
+							<a href="<?= $calendar_data['previous_week']['href'] ?>">&#171;</a>
+						</span><?php endif; ?><?php /* Next Week Link... */ ?><?php if (empty($calendar_data['next_calendar']['disabled']) && !empty($calendar_data['show_next_prev'])): ?>
+						<span class="floatright">
+							<a href="<?= $calendar_data['next_week']['href'] ?>">&#187;</a>
+						</span><?php endif; ?><?php /* "Week beginning <date>" */ ?><?php if (!empty($calendar_data['week_title'])): ?><?= $calendar_data['week_title'] ?><?php endif; ?>
+					</h3>
+				</div><!-- .cat_bar --><?php /* Show the controls */ ?><?php $this->subTemplate('calendar_top', ['calendar_data' => $calendar_data]); ?><?php endif; ?><?php /* Our actual month... */ ?>
+				<div class="week_month_title">
+					<a href="<?= Config::$scripturl ?>?action=calendar;viewmonth;month=<?= $month_data['current_month'] ?>">
+						<?= Lang::getTxt(['months_titles', $month_data['current_month']], file: 'General') ?>
+					</a>
+				</div><?php /* The main table grid for $this week. */ ?>
+				<table class="table_grid calendar_week">
+					<tr>
+						<th class="days" scope="col"><?= Lang::getTxt('calendar_day', file: 'Calendar') ?></th><?php if (!empty($calendar_data['show_events'])): ?>
+						<th class="days" scope="col"><?= Lang::getTxt('events', file: 'Calendar') ?></th><?php endif; ?><?php if (!empty($calendar_data['show_holidays'])): ?>
+						<th class="days" scope="col"><?= Lang::getTxt('calendar_prompt', file: 'Calendar') ?></th><?php endif; ?><?php if (!empty($calendar_data['show_birthdays'])): ?>
+						<th class="days" scope="col"><?= Lang::getTxt('birthdays', file: 'Calendar') ?></th><?php endif; ?>
+					</tr><?php /* Each day of the week. */ ?><?php foreach ($month_data['days'] as $day): ?><?php
+// How should we be highlighted or otherwise not...?
+$classes = ['days'];
+$classes[] = !empty($day['is_today']) ? 'calendar_today' : 'windowbg';
+?>
+					<tr class="days_wrapper">
+						<td class="<?= implode(' ', $classes) ?> act_day"><?php /* Should the day number be a link? */ ?><?php if (!empty(Config::$modSettings['cal_daysaslink']) && Utils::$context['can_post']): ?>
+							<a href="<?= Config::$scripturl ?>?action=calendar;sa=post;month=<?= $month_data['current_month'] ?>;year=<?= $month_data['current_year'] ?>;day=<?= $day['day'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt(['days', $day['day_of_week']], file: 'General') ?> - <?= $day['day'] ?></a><?php else: ?><?= Lang::getTxt(['days', $day['day_of_week']], file: 'General') ?> - <?= $day['day'] ?><?php endif; ?>
+						</td><?php if (!empty($calendar_data['show_events'])): ?>
+						<td class="<?= implode(' ', $classes) ?><?= empty($day['events']) ? (' disabled' . (Utils::$context['can_post'] ? ' week_post' : '')) : ' events' ?> event_col" data-css-prefix="<?= Lang::getTxt('events', file: 'Calendar') ?> <?= (empty($day['events']) && empty(Utils::$context['can_post'])) ? Lang::getTxt('none', file: 'General') : '' ?>"><?php /* Show any events... */ ?><?php if (!empty($day['events'])): ?><?php
+// Sort events by start time (all day events will be listed first)
+uasort(
+	$day['events'],
+	function ($a, $b) {
+							if ($a['start_timestamp'] == $b['start_timestamp']) {
+								return 0;
+							}
+
+							return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;
+						},
+);
+?><?php foreach ($day['events'] as $event): ?>
+								<div class="event_wrapper"><?php $event_icons_needed = ($event->can_edit || $event->can_export) ? true : false; ?><?= $event->link ?><br>
+									<span class="event_time<?= empty($event_icons_needed) ? ' floatright' : '' ?>"><?php if (!empty($event->start->time_local)): ?><?= trim($event->start->time_local) ?><?= !empty($event->end->time_local) ? ' &ndash; ' . trim($event->end->time_local) : '' ?><?php else: ?><?= Lang::getTxt('calendar_allday', file: 'Calendar') ?><?php endif; ?>
+									</span><?php if (!empty($event->location)): ?><br>
+									<span class="event_location<?= empty($event_icons_needed) ? ' floatright' : '' ?>"><?= $event->location ?></span><?php endif; ?><?php if (!empty($event_icons_needed)): ?> <span class="modify_event_links"><?php /* If they can edit the event, show a star they can click on.... */ ?><?php if (!empty($event->can_edit)): ?>
+										<a class="modify_event" href="<?= $event->modify_href ?>">
+											<span class="main_icons calendar_modify" title="<?= Lang::getTxt('calendar_edit', file: 'Calendar') ?>"></span>
+										</a><?php endif; ?><?php /* Can we export? Sweet. */ ?><?php if (!empty($event->can_export)): ?>
+										<a class="modify_event" href="<?= $event->export_href ?>">
+											<span class="main_icons calendar_export" title="<?= Lang::getTxt('calendar_export', file: 'Calendar') ?>"></span>
+										</a><?php endif; ?>
+									</span><br class="clear"><?php endif; ?>
+								</div><!-- .event_wrapper --><?php endforeach; ?><?php if (!empty(Utils::$context['can_post'])): ?>
+								<div class="week_add_event">
+									<a href="<?= Config::$scripturl ?>?action=calendar;sa=post;month=<?= $month_data['current_month'] ?>;year=<?= $month_data['current_year'] ?>;day=<?= $day['day'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('calendar_post_event', file: 'Calendar') ?></a>
+								</div>
+								<br class="clear"><?php endif; ?><?php else: ?><?php if (!empty(Utils::$context['can_post'])): ?>
+								<div class="week_add_event">
+									<a href="<?= Config::$scripturl ?>?action=calendar;sa=post;month=<?= $month_data['current_month'] ?>;year=<?= $month_data['current_year'] ?>;day=<?= $day['day'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('calendar_post_event', file: 'Calendar') ?></a>
+								</div><?php endif; ?><?php endif; ?>
+							</td><?php endif; ?><?php if (!empty($calendar_data['show_holidays'])): ?>
+						<td class="<?= implode(' ', $classes) ?><?= !empty($day['holidays']) ? ' holidays' : ' disabled' ?> holiday_col" data-css-prefix="<?= Lang::getTxt('calendar_prompt', file: 'Calendar') ?> "><?php /* Show any holidays! */ ?><?php if (!empty($day['holidays'])): ?>
+							<div class="holiday_wrapper"><?php $holidays = []; ?><?php foreach ($day['holidays'] as $holiday): ?><?php $holiday_string = $holiday->title; ?><?php if (empty($holiday->allday) && !empty($holiday->start_time_local) && $holiday->start_date == $day['date']): ?><?php $holiday_string .= ' <span class="event_time">' . trim(str_replace(':00 ', ' ', $holiday->start_time_local)) . '</span>'; ?><?php endif; ?><?php if (!empty($holiday->location)): ?><?php $holiday_string .= ' <span class="event_location">' . $holiday->location . '</span>'; ?><?php endif; ?><?php $holidays[] = $holiday_string; ?><?php endforeach; ?><?= implode('
+							</div>
+							<div class="holiday_wrapper">', $holidays) ?>
+							</div><?php endif; ?>
+						</td><?php endif; ?><?php if (!empty($calendar_data['show_birthdays'])): ?>
+						<td class="<?= implode(' ', $classes) ?><?= !empty($day['birthdays']) ? ' birthdays' : ' disabled' ?> birthday_col" data-css-prefix="<?= Lang::getTxt('birthdays', file: 'Calendar') ?> "><?php /* Show any birthdays... */ ?><?php if (!empty($day['birthdays'])): ?><?php foreach ($day['birthdays'] as $member): ?>
+								<a href="<?= Config::$scripturl ?>?action=profile;u=<?= $member['id'] ?>"><?= $member['name'] ?></a>
+								<?= isset($member['age']) ? ' (' . $member['age'] . ')' : '' ?>
+								<?= $member['is_last'] ? '' : '<br>' ?><?php endforeach; ?><?php endif; ?>
+						</td><?php endif; ?>
+					</tr><?php endforeach; ?><?php
+// Increase iteration for loop counting.
+++$iteration;
+?>
+				</table><?php endforeach; ?>
diff --git a/Themes/default/templates/Calendar/thetime.php b/Themes/default/templates/Calendar/thetime.php
new file mode 100644
index 00000000000..6a9e37724a0
--- /dev/null
+++ b/Themes/default/templates/Calendar/thetime.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays the time
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">The time you requested</h3>
+		</div>
+		<div class="roundframe noup">
+			<ul id="geek_time">
+<?php
+// Unlike the clocks, this one never changes, so which lamps are lit is
+// settled here rather than in calendar.js.
+?>
+<?php foreach (Utils::$context['clockicons'] as $v): ?>
+				<li>
+					<ul>
+<?php foreach ($v as $lit): ?>
+						<li<?= $lit ? ' class="lit"' : '' ?>></li>
+<?php endforeach; ?>
+					</ul>
+				</li>
+<?php endforeach; ?>
+			</ul>
+		</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Display/index.php b/Themes/default/templates/Display/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Display/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Display/main.php b/Themes/default/templates/Display/main.php
new file mode 100644
index 00000000000..493a82c1ff9
--- /dev/null
+++ b/Themes/default/templates/Display/main.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template handles displaying a topic
+ */
+?><?php /* Let them know, if their report was a success! */ ?><?php if (Utils::$context['report_sent']): ?>
+		<div class="infobox">
+			<?= Lang::getTxt('report_sent', file: 'General') ?>
+		</div><?php endif; ?><?php /* Let them know why their message became unapproved. */ ?><?php if (Utils::$context['becomesUnapproved']): ?>
+		<div class="noticebox">
+			<?= Lang::getTxt('post_becomes_unapproved', file: 'General') ?>
+		</div><?php endif; ?><?php /* Show new topic info here? */ ?>
+		<div id="display_head" class="information">
+			<h2 class="display_title">
+				<span id="top_subject"><?= Utils::$context['subject'] ?></span><?= (Utils::$context['is_locked']) ? ' <span class="main_icons lock"></span>' : '' ?><?= (Utils::$context['is_sticky']) ? ' <span class="main_icons sticky"></span>' : '' ?>
+			</h2>
+			<p><?= Lang::getTxt('started_by_member_time', ['member' => Utils::$context['topic_poster_name'], 'time' => Utils::$context['topic_started_time']], file: 'General') ?></p><?php /* Next - Prev */ ?>
+			<span class="nextlinks floatright"><?= Utils::$context['previous_next'] ?></span><?php if (!empty(Theme::$current->settings['display_who_viewing'])): ?><?php /* Show just numbers...? */ ?><?php if (Theme::$current->settings['display_who_viewing'] == 1 || empty(Utils::$context['view_members_list'])): ?><?php
+// Count the ones this member is allowed to see. Any hidden ones get
+// their own mention below, so counting those here as well would say
+// the same people twice.
+$list_of_viewers = [
+	Lang::getTxt('number_of_members', [count(Utils::$context['view_members_list'])], file: 'General'),
+];
+// Or show the actual people viewing the topic?
+?><?php else: ?><?php $list_of_viewers = Utils::$context['view_members_list']; ?><?php endif; ?><?php if (!empty(Utils::$context['view_num_hidden']) && !Utils::$context['can_moderate_forum']): ?><?php $list_of_viewers[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['view_num_hidden']], file: 'General'); ?><?php endif; ?><?php /* Now show how many guests are here too. */ ?><?php if (!empty(Utils::$context['view_num_guests'])): ?><?php $list_of_viewers[] = Lang::getTxt('guest_plural', [Utils::$context['view_num_guests']], file: 'General'); ?><?php endif; ?>
+			<p>
+				<?= Lang::getTxt(
+			'who_viewing_topic',
+			[
+				'list_of_viewers' => Lang::sentenceList(array_values($list_of_viewers)),
+				'num_viewing' => count(Utils::$context['view_members_list'] ?? []) + (int) (Utils::$context['view_num_guests'] ?? 0) + (int) (Utils::$context['view_num_hidden'] ?? 0),
+			],
+			file: 'General',
+		) ?>
+			</p><?php endif; ?><?php /* Show the anchor for the top and for the first message. If the first message is new, say so. */ ?>
+		</div><!-- #display_head -->
+		<?= Utils::$context['first_new_message'] ? '<a id="new"></a>' : '' ?><?php /* Is this topic also a poll? */ ?><?php if (Utils::$context['is_poll']): ?>
+		<div id="poll">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="main_icons poll"></span><?= Utils::$context['poll']['is_locked'] ? '<span class="main_icons lock"></span>' : '' ?> <?= Utils::$context['poll']['question'] ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<div id="poll_options"><?php /* Are they not allowed to vote but allowed to view the options? */ ?><?php if (Utils::$context['poll']['show_results'] || !Utils::$context['allow_vote']): ?>
+					<dl class="options"><?php /* Show each option with its corresponding percentage bar. */ ?><?php foreach (Utils::$context['poll']['options'] as $option): ?>
+						<dt class="<?= $option['voted_this'] ? ' voted' : '' ?>"><?= $option['option'] ?></dt>
+						<dd class="statsbar generic_bar<?= $option['voted_this'] ? ' voted' : '' ?>"><?php if (Utils::$context['allow_results_view']): ?>
+							<?= $option['bar_ndt'] ?>
+							<span class="percentage"><?= $option['votes'] ?> (<?= $option['percent'] ?>%)</span><?php endif; ?>
+						</dd><?php endforeach; ?>
+					</dl><?php if (Utils::$context['allow_results_view']): ?>
+					<p><?= Lang::getTxt('poll_total_voters', [Utils::$context['poll']['total_votes']], file: 'General') ?></p><?php endif; ?><?php /* They are allowed to vote! Go to it! */ ?><?php else: ?>
+					<form action="<?= Config::$scripturl ?>?action=vote;topic=<?= Utils::$context['current_topic'] ?>.<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8"><?php /* Show a warning if they are allowed more than one option. */ ?><?php if (Utils::$context['poll']['allowed_warning']): ?>
+						<p class="smallpadding"><?= Utils::$context['poll']['allowed_warning'] ?></p><?php endif; ?>
+						<ul class="options"><?php /* Show each option with its button - a radio likely. */ ?><?php foreach (Utils::$context['poll']['options'] as $option): ?>
+							<li><?= $option['vote_button'] ?> <label for="options-<?= $option['id'] ?>"><?= $option['option'] ?></label></li><?php endforeach; ?>
+						</ul>
+						<div class="submitbutton">
+							<input type="submit" value="<?= Lang::getTxt('poll_vote', file: 'General') ?>" class="button">
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						</div>
+					</form><?php endif; ?><?php /* Is the clock ticking? */ ?><?php if (!empty(Utils::$context['poll']['expire_time'])): ?>
+					<p><strong><?= Lang::getTxt(Utils::$context['poll']['is_expired'] ? 'poll_expired_on' : 'poll_expires_on', file: 'General') ?>:</strong> <?= Utils::$context['poll']['expire_time'] ?></p><?php endif; ?>
+				</div><!-- #poll_options -->
+			</div><!-- .windowbg -->
+		</div><!-- #poll -->
+		<div id="pollmoderation"><?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['poll_buttons']]); ?>
+		</div><?php endif; ?><?php /* Does this topic have some events linked to it? */ ?><?php if (!empty(Utils::$context['linked_calendar_events'])): ?>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('calendar_linked_events', file: 'Calendar') ?></h3>
+		</div><?php $this->subTemplate('linked_events'); ?><?php endif; ?><?php /* Show the page index... "Pages: [1]". */ ?>
+		<div class="pagesection top">
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons'], 'direction' => 'right']); ?>
+			<?= Utils::$context['menu_separator'] ?>
+			<div class="pagelinks floatleft">
+				<a href="#bot" class="button"><?= Lang::getTxt('go_down', file: 'General') ?></a>
+				<?= Utils::$context['page_index'] ?>
+			</div><?php /* Mobile action - moderation buttons (top) */ ?><?php if (!empty(Utils::$context['normal_buttons'])): ?>
+		<div class="mobile_buttons floatright">
+			<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+			<?= !empty(Utils::$context['mod_buttons']) ? '<a class="button mobile_mod">' . Lang::getTxt('mobile_moderation', file: 'General') . '</a>' : '' ?>
+		</div><?php endif; ?>
+		</div><?php /* Show the topic information - icon, subject, etc. */ ?>
+		<div id="forumposts">
+			<form action="<?= Config::$scripturl ?>?action=quickmod2;topic=<?= Utils::$context['current_topic'] ?>.<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm"><?php
+Utils::$context['ignoredMsgs'] = [];
+Utils::$context['removableMessageIDs'] = [];
+// Get all the messages...
+?><?php while ($message = Utils::$context['get_message']()): ?><?php $this->subTemplate('single_post', ['message' => $message]); ?><?php endwhile; ?>
+			</form>
+		</div><!-- #forumposts --><?php /* Show the page index... "Pages: [1]". */ ?>
+		<div class="pagesection">
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons'], 'direction' => 'right']); ?>
+			<?= Utils::$context['menu_separator'] ?>
+			<div class="pagelinks floatleft">
+				<a href="#main_content_section" class="button" id="bot"><?= Lang::getTxt('go_up', file: 'General') ?></a>
+				<?= Utils::$context['page_index'] ?>
+			</div><?php /* Mobile action - moderation buttons (bottom) */ ?><?php if (!empty(Utils::$context['normal_buttons'])): ?>
+		<div class="mobile_buttons floatright">
+			<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+			<?= !empty(Utils::$context['mod_buttons']) ? '<a class="button mobile_mod">' . Lang::getTxt('mobile_moderation', file: 'General') . '</a>' : '' ?>
+		</div><?php endif; ?>
+		</div><?php /* Show the lower breadcrumbs. */ ?><?php $this->subTemplate('linktree'); ?><?php /* Moderation buttons */ ?>
+		<div id="moderationbuttons">
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['mod_buttons'], 'direction' => 'bottom', 'strip_options' => ['id' => 'moderationbuttons_strip']]); ?>
+		</div><?php /* Show the jumpto box, or actually...let Javascript do it. */ ?>
+		<div id="display_jump_to"></div><?php /* Show quickreply */ ?><?php if (Utils::$context['can_reply']): ?><?php $this->subTemplate('quickreply'); ?><?php endif; ?><?php /* User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device. */ ?>
+		<div id="mobile_action" class="popup_container">
+			<div class="popup_window description">
+				<div class="popup_heading">
+					<?= Lang::getTxt('mobile_action', file: 'General') ?>
+					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+				</div>
+				<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons']]); ?>
+			</div>
+		</div><?php /* Show the moderation button & pop (if there is anything to show) */ ?><?php if (!empty(Utils::$context['mod_buttons'])): ?>
+		<div id="mobile_moderation" class="popup_container">
+			<div class="popup_window description">
+				<div class="popup_heading">
+					<?= Lang::getTxt('mobile_moderation', file: 'General') ?>
+					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+				</div>
+				<div id="moderationbuttons_mobile">
+					<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['mod_buttons'], 'direction' => 'bottom', 'strip_options' => ['id' => 'moderationbuttons_strip_mobile']]); ?>
+				</div>
+			</div>
+		</div><?php endif; ?>
+		<script>
+			window.addEventListener("DOMContentLoaded", function() {<?php if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && Utils::$context['can_remove_post']): ?>
+
+				const strips = [
+					{ id: "moderationbuttons", display: "moderationbuttons_strip", varName: "oInTopicModeration" },
+					{ id: "moderationbuttons_mobile", display: "moderationbuttons_strip_mobile", varName: "oInTopicModerationMobile" }
+				];
+
+				for (let i = 0; i < strips.length; i++) {
+					const strip = strips[i];
+					window[strip.varName] = new InTopicModeration({
+						sCheckboxContainerMask: "in_topic_mod_check_",
+						aMessageIds: ["<?= implode('", "', Utils::$context['removableMessageIDs']) ?>"],
+						sSessionId: smf_session_id,
+						sSessionVar: smf_session_var,
+						sButtonStrip: strip.id,
+						sButtonStripDisplay: strip.display,
+						bUseImageButton: false,
+						bCanRemove: <?= Utils::$context['can_remove_post'] ? 'true' : 'false' ?>,
+						sRemoveButtonLabel: "<?= Lang::getTxt('quickmod_delete_selected', file: 'General') ?>",
+						sRemoveButtonImage: "delete_selected.png",
+						sRemoveButtonConfirm: "<?= Lang::getTxt('quickmod_confirm', file: 'General') ?>",
+						bCanRestore: <?= Utils::$context['can_restore_msg'] ? 'true' : 'false' ?>,
+						sRestoreButtonLabel: "<?= Lang::getTxt('quick_mod_restore', file: 'General') ?>",
+						sRestoreButtonImage: "restore_selected.png",
+						sRestoreButtonConfirm: "<?= Lang::getTxt('quickmod_confirm', file: 'General') ?>",
+						bCanSplit: <?= Utils::$context['can_split'] ? 'true' : 'false' ?>,
+						sSplitButtonLabel: "<?= Lang::getTxt('quickmod_split_selected', file: 'General') ?>",
+						sSplitButtonImage: "split_selected.png",
+						sSplitButtonConfirm: "<?= Lang::getTxt('quickmod_confirm', file: 'General') ?>",
+						sFormId: "quickModForm"
+					});
+				}<?php endif; ?>
+
+				new QuickModify({
+					sScriptUrl: smf_scripturl,
+					sFormName: 'quickModForm',
+					sClassName: 'quick_edit',
+					bShowModify: <?= Config::$modSettings['show_modify'] ? 'true' : 'false' ?>,
+					iTopicId: <?= Utils::$context['current_topic'] ?>,
+					sSaveButtonText: <?= Utils::escapeJavaScript(Lang::getTxt('save', file: 'General')) ?>,
+					sCancelButtonText: <?= Utils::escapeJavaScript(Lang::getTxt('modify_cancel', file: 'General')) ?>,
+					sEditReasonText: <?= Utils::escapeJavaScript(Lang::getTxt('reason_for_edit', file: 'General')) ?>,
+					sErrorBorderStyle: <?= Utils::escapeJavaScript('1px solid red') ?>
+
+				});
+
+				new JumpTo({
+					sContainerId: "display_jump_to",
+					sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\"><?= Utils::$context['jump_to']['label'] ?><" + "/label> %dropdown_list%",
+					iCurBoardId: <?= Utils::$context['current_board'] ?>,
+					iCurBoardChildLevel: <?= Utils::$context['jump_to']['child_level'] ?>,
+					sCurBoardName: "<?= Utils::$context['jump_to']['board_name'] ?>",
+					sBoardChildLevelIndicator: "==",
+					sBoardPrefix: "=> ",
+					sCatSeparator: "-----------------------------",
+					sCatPrefix: "",
+					sGoButtonLabel: "<?= Lang::getTxt('go', file: 'General') ?>"
+				});
+
+				new IconList({
+					sIconIdPrefix: "msg_icon_",
+					sScriptUrl: smf_scripturl,
+					bShowModify: <?= !empty(Config::$modSettings['show_modify']) ? 'true' : 'false' ?>,
+					iBoardId: <?= Utils::$context['current_board'] ?>,
+					iTopicId: <?= Utils::$context['current_topic'] ?>,
+					sSessionId: smf_session_id,
+					sSessionVar: smf_session_var,
+					sLabelIconList: "<?= Lang::getTxt('message_icon', file: 'General') ?>"
+				});<?php if (!empty(Utils::$context['ignoredMsgs'])): ?>
+
+				ignore_toggles([<?= implode(', ', Utils::$context['ignoredMsgs']) ?>], <?= Utils::escapeJavaScript(Lang::getTxt('show_ignore_user_post', file: 'General')) ?>);<?php endif; ?>
+
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Display/quickreply.php b/Themes/default/templates/Display/quickreply.php
new file mode 100644
index 00000000000..dd3c3b1788a
--- /dev/null
+++ b/Themes/default/templates/Display/quickreply.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for displaying the quick reply box.
+ */
+?>
+		<a id="quickreply_anchor"></a>
+		<div class="tborder" id="quickreply">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('quick_reply', file: 'General') ?>
+				</h3>
+			</div>
+			<div id="quickreply_options">
+				<div class="roundframe"><?php /* Is the topic locked? */ ?><?php if (Utils::$context['is_locked']): ?>
+					<p class="alert smalltext"><?= Lang::getTxt('quick_reply_warning', file: 'General') ?></p><?php endif; ?><?php /* Show a warning if the topic is old */ ?><?php if (!empty(Utils::$context['oldTopicError'])): ?>
+					<p class="alert smalltext"><?= Lang::getTxt('error_old_topic', [Config::$modSettings['oldTopicDays']], file: 'General') ?></p><?php endif; ?><?php /* Does the post need approval? */ ?><?php if (!Utils::$context['can_reply_approved']): ?>
+					<p><em><?= Lang::getTxt('wait_for_approval', file: 'General') ?></em></p><?php endif; ?>
+					<form action="<?= Config::$scripturl ?>?board=<?= Utils::$context['current_board'] ?>;action=post2" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" onsubmit="submitonce(this);">
+						<input type="hidden" name="topic" value="<?= Utils::$context['current_topic'] ?>">
+						<input type="hidden" name="subject" value="<?= Utils::$context['response_prefix'] ?><?= Utils::$context['subject'] ?>">
+						<input type="hidden" name="icon" value="xx">
+						<input type="hidden" name="from_qr" value="1">
+						<input type="hidden" name="notify" value="<?= Utils::$context['is_marked_notify'] || !empty(Theme::$current->options['auto_notify']) ? '1' : '0' ?>">
+						<input type="hidden" name="not_approved" value="<?= !Utils::$context['can_reply_approved'] ?>">
+						<input type="hidden" name="goback" value="<?= empty(Theme::$current->options['return_to_post']) ? '0' : '1' ?>">
+						<input type="hidden" name="last_msg" value="<?= Utils::$context['topic_last_message'] ?>">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="seqnum" value="<?= Utils::$context['form_sequence_number'] ?>"><?php /* Guests just need more. */ ?><?php if (User::$me->is_guest): ?>
+						<dl id="post_header">
+							<dt>
+								<?= Lang::getTxt('name', file: 'General') ?>
+							</dt>
+							<dd>
+								<input type="text" name="guestname" size="25" value="<?= Utils::$context['name'] ?>" required>
+							</dd><?php if (empty(Config::$modSettings['guest_post_no_email'])): ?>
+							<dt>
+								<?= Lang::getTxt('email', file: 'General') ?>
+							</dt>
+							<dd>
+								<input type="email" name="email" size="25" value="<?= Utils::$context['email'] ?>" required>
+							</dd><?php endif; ?>
+						</dl><?php endif; ?><?php $this->subTemplate('control_richedit', ['editor_id' => 'quickReply', 'smiley_container' => true, 'bbc_container' => true]); ?><?php /* Is visual verification enabled? */ ?><?php if (Utils::$context['require_verification']): ?>
+						<div class="post_verification">
+							<strong><?= Lang::getTxt('verification', file: 'General') ?></strong>
+							<?php $this->subTemplate('control_verification', ['verify_id' => Utils::$context['visual_verification_id'], 'display_type' => 'all']); ?>
+						</div><?php endif; ?><?php /* Finally, the submit buttons. */ ?>
+						<span id="post_confirm_buttons">
+							<?php $this->subTemplate('control_richedit_buttons', ['editor_id' => 'quickReply']); ?>
+						</span>
+					</form>
+				</div><!-- .roundframe -->
+			</div><!-- #quickreply_options -->
+		</div><!-- #quickreply -->
+		<br class="clear"><?php if (Utils::$context['show_spellchecking']): ?>
+		<form action="<?= Config::$scripturl ?>?action=spellcheck" method="post" accept-charset="UTF-8" name="spell_form" id="spell_form" target="spellWindow">
+			<input type="hidden" name="spellstring" value="">
+		</form><?php endif; ?>
+		<script>
+			window.addEventListener("DOMContentLoaded", function() {
+				new QuickReply({
+					bDefaultCollapsed: false,
+					iTopicId: <?= Utils::$context['current_topic'] ?>,
+					iStart: <?= Utils::$context['start'] ?>,
+					sScriptUrl: smf_scripturl,
+					sImagesUrl: smf_images_url,
+					sContainerId: "quickreply_options",
+					sImageId: "quickReplyExpand",
+					sClassCollapsed: "toggle_up",
+					sClassExpanded: "toggle_down",
+					sJumpAnchor: "quickreply_anchor",
+					bIsFull: true
+				});
+			});
+			var oEditorID = "<?= Utils::$context['post_box_name'] ?>";
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Display/single_post.php b/Themes/default/templates/Display/single_post.php
new file mode 100644
index 00000000000..2752ff78858
--- /dev/null
+++ b/Themes/default/templates/Display/single_post.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Time;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for displaying a single post.
+ *
+ * @param array $message An array of information about the message to display. Should have 'id' and 'member'. Can also have 'first_new', 'is_ignored' and 'css_class'.
+ */
+?><?php $ignoring = false; ?><?php if ($message['can_remove']): ?><?php Utils::$context['removableMessageIDs'][] = $message['id']; ?><?php endif; ?><?php /* Are we ignoring this message? */ ?><?php if (!empty($message['is_ignored'])): ?><?php
+$ignoring = true;
+Utils::$context['ignoredMsgs'][] = $message['id'];
+?><?php endif; ?><?php /* Show a "new" anchor if this message is new. */ ?><?php if (!empty($message['first_new']) && $message['id'] != Utils::$context['first_message']): ?>
+				<a id="new"></a><?php endif; ?><?php /* Inform the reader if this message bumped an old topic. */ ?><?php if (!empty($message['bump_notice'])): ?>
+				<?= $message['bump_notice'] ?><?php endif; ?><?php /* Show the message. */ ?>
+				<div class="<?= $message['css_class'] ?>" id="msg<?= $message['id'] ?>">
+					<div class="post_wrapper"><?php /* Show information about the poster of this message. */ ?>
+						<div class="poster"><?php /* Are there any custom fields above the member name? */ ?><?php if (!empty($message['custom_fields']['above_member'])): ?>
+							<div class="custom_fields_above_member">
+								<ul class="nolist"><?php foreach ($message['custom_fields']['above_member'] as $custom): ?>
+									<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+								</ul>
+							</div><?php endif; ?>
+							<h4><?php /* Show online and offline buttons? */ ?><?php if (!empty(Config::$modSettings['onlineEnable']) && !$message['member']['is_guest']): ?>
+								<?= Utils::$context['can_send_pm'] ? '<a href="' . $message['member']['online']['href'] . '" title="' . $message['member']['online']['label'] . '">' : '' ?><span class="<?= ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= $message['member']['online']['text'] ?>"></span><?= Utils::$context['can_send_pm'] ? '</a>' : '' ?><?php endif; ?><?php /* Custom fields BEFORE the username? */ ?><?php if (!empty($message['custom_fields']['before_member'])): ?><?php foreach ($message['custom_fields']['before_member'] as $custom): ?>
+								<span class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></span><?php endforeach; ?><?php endif; ?><?php /* Show a link to the member's profile. */ ?>
+								<?= $message['member']['link'] ?><?php /* Custom fields AFTER the username? */ ?><?php if (!empty($message['custom_fields']['after_member'])): ?><?php foreach ($message['custom_fields']['after_member'] as $custom): ?>
+								<span class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></span><?php endforeach; ?><?php endif; ?><?php /* Begin display of user info */ ?>
+							</h4>
+							<ul class="user_info"><?php /* Show the member's custom title, if they have one. */ ?><?php if (!empty($message['member']['title'])): ?>
+								<li class="title"><?= $message['member']['title'] ?></li><?php endif; ?><?php /* Show the member's primary group (like 'Administrator') if they have one. */ ?><?php if (!empty($message['member']['group'])): ?>
+								<li class="membergroup"><?= $message['member']['group'] ?></li><?php endif; ?><?php /* Show the user's avatar. */ ?><?php if (!empty(Config::$modSettings['show_user_images']) && empty(Theme::$current->options['show_no_avatars']) && !empty($message['member']['avatar']['image'])): ?>
+								<li class="avatar">
+									<a href="<?= $message['member']['href'] ?>"><?= $message['member']['avatar']['image'] ?></a>
+								</li><?php endif; ?><?php /* Are there any custom fields below the avatar? */ ?><?php if (!empty($message['custom_fields']['below_avatar'])): ?><?php foreach ($message['custom_fields']['below_avatar'] as $custom): ?>
+								<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php /* Don't show these things for guests. */ ?><?php if (!$message['member']['is_guest']): ?><?php /* Show the post group icons */ ?>
+								<li class="icons"><?= $message['member']['group_icons'] ?></li><?php /* Show the post group if and only if they have no other group or the option is on, and they are in a post group. */ ?><?php if ((empty(Config::$modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group'])): ?>
+								<li class="postgroup"><?= $message['member']['post_group'] ?></li><?php endif; ?><?php /* Show how many posts they have made. */ ?><?php if (!isset(Utils::$context['disabled_fields']['posts'])): ?>
+								<li class="postcount"><?= Lang::getTxt('member_postcount_num', [$message['member']['posts']], file: 'General') ?></li><?php endif; ?><?php /* Show their personal text? */ ?><?php if (!empty(Config::$modSettings['show_blurb']) && !empty($message['member']['blurb'])): ?>
+								<li class="blurb"><?= $message['member']['blurb'] ?></li><?php endif; ?><?php /* Any custom fields to show as icons? */ ?><?php if (!empty($message['custom_fields']['icons'])): ?>
+								<li class="im_icons">
+									<ol><?php foreach ($message['custom_fields']['icons'] as $custom): ?>
+										<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+									</ol>
+								</li><?php endif; ?><?php /* Show the website and email address buttons. */ ?><?php if ($message['member']['show_profile_buttons']): ?>
+								<li class="profile">
+									<ol class="profile_icons"><?php /* Don't show an icon if they haven't specified a website. */ ?><?php if (!empty($message['member']['website']['url']) && !isset(Utils::$context['disabled_fields']['website'])): ?>
+										<li><a href="<?= $message['member']['website']['url'] ?>" title="<?= $message['member']['website']['title'] ?>" target="_blank" rel="noopener"><span class="main_icons www centericon" title="<?= $message['member']['website']['title'] ?>"></span></a></li><?php endif; ?><?php /* Since we know this person isn't a guest, you *can* message them. */ ?><?php if (Utils::$context['can_send_pm']): ?>
+										<li><a href="<?= Config::$scripturl ?>?action=pm;sa=send;u=<?= $message['member']['id'] ?>" title="<?= Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') ?>"><span class="main_icons im_<?= ($message['member']['online']['is_online'] ? 'on' : 'off') ?> centericon" title="<?= Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') ?>"></span> </a></li><?php endif; ?><?php /* Show the email if necessary */ ?><?php if (!empty($message['member']['email']) && $message['member']['show_email']): ?>
+										<li class="email"><a href="mailto:<?= $message['member']['email'] ?>" rel="nofollow"><span class="main_icons mail centericon" title="<?= Lang::getTxt('email', file: 'General') ?>"></span></a></li><?php endif; ?>
+									</ol>
+								</li><!-- .profile --><?php endif; ?><?php /* Any custom fields for standard placement? */ ?><?php if (!empty($message['custom_fields']['standard'])): ?><?php foreach ($message['custom_fields']['standard'] as $custom): ?>
+								<li class="custom <?= $custom['col_name'] ?>"><?= $custom['title'] ?>: <?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php /* Otherwise, show the guest's email. */ ?><?php elseif (!empty($message['member']['email']) && $message['member']['show_email']): ?>
+								<li class="email">
+									<a href="mailto:<?= $message['member']['email'] ?>" rel="nofollow"><span class="main_icons mail centericon" title="<?= Lang::getTxt('email', file: 'General') ?>"></span></a>
+								</li><?php endif; ?><?php /* Show the IP to this user for this post - because you can moderate? */ ?><?php if (!empty(Utils::$context['can_moderate_forum']) && !empty($message['member']['ip'])): ?>
+								<li class="poster_ip">
+									<a href="<?= Config::$scripturl ?>?action=<?= !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'] ?>;searchip=<?= $message['member']['ip'] ?>" data-hover="<?= $message['member']['ip'] ?>" class="show_on_hover"><span><?= Lang::getTxt('show_ip', file: 'General') ?></span></a> <a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
+								</li><?php /* Or, should we show it because this is you? */ ?><?php elseif ($message['can_see_ip']): ?>
+								<li class="poster_ip">
+									<a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help show_on_hover" data-hover="<?= $message['member']['ip'] ?>"><span><?= Lang::getTxt('show_ip', file: 'General') ?></span></a>
+								</li><?php /* Okay, are you at least logged in? Then we can show something about why IPs are logged... */ ?><?php elseif (!User::$me->is_guest): ?>
+								<li class="poster_ip">
+									<a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help"><?= Lang::getTxt('logged', file: 'General') ?></a>
+								</li><?php /* Otherwise, you see NOTHING! */ ?><?php else: ?>
+								<li class="poster_ip"><?= Lang::getTxt('logged', file: 'General') ?></li><?php endif; ?><?php
+// Are we showing the warning status?
+// Don't show these things for guests.
+?><?php if (!$message['member']['is_guest'] && $message['member']['can_see_warning']): ?>
+								<li class="warning">
+									<?= Utils::$context['can_issue_warning'] ? '<a href="' . Config::$scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '' ?><span class="main_icons warning_<?= $message['member']['warning_status'] ?>"></span> <?= Utils::$context['can_issue_warning'] ? '</a>' : '' ?><span class="warn_<?= $message['member']['warning_status'] ?>"><?= Lang::getTxt('warn_' . $message['member']['warning_status'], file: 'General') ?></span>
+								</li><?php endif; ?><?php /* Are there any custom fields to show at the bottom of the poster info? */ ?><?php if (!empty($message['custom_fields']['bottom_poster'])): ?><?php foreach ($message['custom_fields']['bottom_poster'] as $custom): ?>
+								<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php /* Poster info ends. */ ?>
+							</ul>
+						</div><!-- .poster -->
+						<div class="postarea">
+							<div class="keyinfo"><?php /* Some people don't want subject... The div is still required or quick edit breaks. */ ?>
+								<div id="subject_<?= $message['id'] ?>" class="subject_title<?= (empty(Config::$modSettings['subject_toggle']) ? ' subject_hidden' : '') ?>">
+									<?= $message['link'] ?>
+								</div>
+								<?= !empty($message['counter']) ? '<span class="page_number floatright">#' . $message['counter'] . '</span>' : '' ?>
+								<div class="postinfo">
+									<span class="messageicon" <?= ($message['icon_url'] === Theme::$current->settings['images_url'] . '/post/xx.png' && !$message['can_modify']) ? ' style="position: absolute; z-index: -1;"' : '' ?>>
+										<img src="<?= $message['icon_url'] ?>" alt=""<?= $message['can_modify'] ? ' id="msg_icon_' . $message['id'] . '"' : '' ?>>
+									</span>
+									<a href="<?= $message['href'] ?>" rel="nofollow" title="<?= !empty($message['counter']) ? Lang::getTxt('reply_number', [$message['counter']], file: 'General') : '' ?><?= $message['subject'] ?>" class="smalltext"><?= $message['time'] ?></a>
+									<span class="spacer"></span><?php
+// Show "<< Last Edit: Time by Person >>" if this post was edited. But we need the div even if it wasn't modified!
+// Because we insert into it through AJAX and we don't want to stop themers moving it around if they so wish so they can put it where they want it.
+?>
+									<<?= (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history']) ? 'a href="" onclick="return false;"' : 'span') ?> class="smalltext modified floatright<?= !empty(Config::$modSettings['show_modify']) && !empty($message['modified']['last_edit_text']) ? ' mvisible' : '' ?>" id="modified_<?= $message['id'] ?>"><?php if (!empty(Config::$modSettings['show_modify']) && !empty($message['modified']['last_edit_text'])): ?><?= $message['modified']['last_edit_text'] ?><?php endif; ?>
+									</<?= (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history']) ? 'a' : 'span') ?>><?php if (!empty(Config::$modSettings['show_modify']) && !empty($message['edit_history'])): ?>
+									<div id="edit_history_list_<?= $message['id'] ?>" class="edit_history_list">
+										<div class="edit_history_count">
+											<?= Lang::getTxt('edit_history_count', [count($message['edit_history'])]) ?>
+										</div>
+										<ol><?php foreach ($message['edit_history'] as $diff): ?><?php
+$last_edit_text = Lang::getTxt(
+				'edit_history_linktext' . ($diff->reason !== '' ? '_reason' : ''),
+				[
+					'time' => (new Time($diff->time1))->setTimezone(User::$me->timezone)->format(),
+					'member' => $diff->name === '' ? '(' . Lang::getTxt('unknown') . ')' : $diff->name,
+					'reason' => $diff->reason,
+				],
+			);
+?>
+											<li>
+												<a href="<?= Config::$scripturl ?>?action=edithistory;msg=<?= $message['id'] ?>;hash=<?= $diff->label1 ?>" onclick="return reqOverlayDiv(this.href, <?= Utils::escapeJavaScript($last_edit_text) ?>, 'history');"><?= $last_edit_text ?></a>
+											</li><?php endforeach; ?>
+										</ol>
+									</div><?php endif; ?>
+								</div>
+								<div id="msg_<?= $message['id'] ?>_quick_mod"<?= $ignoring ? ' style="display:none;"' : '' ?>></div>
+							</div><!-- .keyinfo --><?php /* Ignoring this user? Hide the post. */ ?><?php if ($ignoring): ?>
+							<div id="msg_<?= $message['id'] ?>_ignored_prompt" class="noticebox">
+								<?= Lang::getTxt('ignoring_user', file: 'General') ?>
+								<a href="#" id="msg_<?= $message['id'] ?>_ignored_link" style="display: none;"><?= Lang::getTxt('show_ignore_user_post', file: 'General') ?></a>
+							</div><?php endif; ?><?php /* Show the post itself, finally! */ ?>
+							<div class="post"><?php if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == User::$me->id): ?>
+								<div class="noticebox">
+									<?= Lang::getTxt('post_awaiting_approval', file: 'General') ?>
+								</div><?php endif; ?>
+								<div class="inner" data-msgid="<?= $message['id'] ?>" id="msg_<?= $message['id'] ?>"<?= $ignoring ? ' style="display:none;"' : '' ?>>
+									<?= Utils::adjustHeadingLevels($message['body'], 4) ?>
+								</div>
+							</div><!-- .post --><?php /* Assuming there are attachments... */ ?><?php if (!empty($message['attachment'])): ?><?php
+$last_approved_state = 1;
+// Don't output the div unless we actually have something to show...
+$div_output = false;
+?><?php foreach ($message['attachment'] as $attachment): ?><?php /* Do we want this attachment to not be showed here? */ ?><?php if ($attachment['is_approved'] && !empty(Config::$modSettings['dont_show_attach_under_post']) && !empty(Utils::$context['show_attach_under_post'][$attachment['id']])): ?><?php continue; ?><?php endif; ?><?php if (!$div_output): ?><?php $div_output = true; ?>
+							<div id="msg_<?= $message['id'] ?>_footer" class="attachments"<?= $ignoring ? ' style="display:none;"' : '' ?>><?php endif; ?><?php /* Show a special box for unapproved attachments... */ ?><?php if ($attachment['is_approved'] != $last_approved_state): ?><?php $last_approved_state = 0; ?>
+								<fieldset>
+									<legend>
+										<?= Lang::getTxt('attach_awaiting_approve', file: 'General') ?><?php if (Utils::$context['can_approve']): ?>
+										&nbsp;[<a href="<?= Config::$scripturl ?>?action=attachapprove;sa=all;mid=<?= $message['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('approve_all', file: 'General') ?></a>]<?php endif; ?>
+									</legend><?php endif; ?>
+									<div class="attached"><?php if ($attachment['is_image'] && !empty(Config::$modSettings['attachmentShowImages'])): ?>
+										<div class="attachments_top"><?php if ($attachment['thumbnail']['has_thumb']): ?>
+											<a href="<?= $attachment['href'] ?>;image" id="link_<?= $attachment['id'] ?>" onclick="<?= $attachment['thumbnail']['javascript'] ?>"><img src="<?= $attachment['thumbnail']['href'] ?>" alt="" id="thumb_<?= $attachment['id'] ?>" class="atc_img"></a><?php else: ?>
+											<img src="<?= $attachment['href'] ?>;image" alt="" loading="lazy" class="atc_img"><?php endif; ?>
+										</div><!-- .attachments_top --><?php endif; ?>
+										<div class="attachments_bot">
+											<a href="<?= $attachment['href'] ?>"><img src="<?= Theme::$current->settings['images_url'] ?>/icons/clip.png" class="centericon" alt="*">&nbsp;<?= $attachment['name'] ?></a> <?php if (!$attachment['is_approved'] && Utils::$context['can_approve']): ?>
+											[<a href="<?= Config::$scripturl ?>?action=attachapprove;sa=approve;aid=<?= $attachment['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('approve', file: 'General') ?></a>] [<a href="<?= Config::$scripturl ?>?action=attachapprove;sa=reject;aid=<?= $attachment['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('delete', file: 'General') ?></a>] <?php endif; ?>
+											<br><?= $attachment['formatted_size'] ?><?= ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . '<br>' . Lang::getTxt('attach_viewed', [$attachment['downloads']], file: 'General') : '<br>' . Lang::getTxt('attach_downloaded', [$attachment['downloads']], file: 'General')) ?>
+										</div><!-- .attachments_bot -->
+									</div><!-- .attached --><?php endforeach; ?><?php /* If we had unapproved attachments clean up. */ ?><?php if ($last_approved_state == 0): ?>
+								</fieldset><?php endif; ?><?php /* Only do this if we output a div above - otherwise it'll break things */ ?><?php if ($div_output): ?>
+							</div><!-- #msg_[id]_footer --><?php endif; ?><?php endif; ?>
+							<div class="under_message"><?php /* What about likes? */ ?><?php if (!empty(Config::$modSettings['enable_likes'])): ?>
+								<ul class="floatleft"><?php if (!empty($message['likes']['can_like'])): ?>
+									<li class="smflikebutton" id="msg_<?= $message['id'] ?>_likes"<?= $ignoring ? ' style="display:none;"' : '' ?>>
+										<a href="<?= Config::$scripturl ?>?action=likes;ltype=msg;sa=like;like=<?= $message['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="msg_like"><span class="main_icons <?= $message['likes']['you'] ? 'unlike' : 'like' ?>"></span> <?= Lang::getTxt($message['likes']['you'] ? 'unlike' : 'like', file: 'General') ?></a>
+									</li><?php endif; ?><?php if (!empty($message['likes']['count'])): ?><?php
+Utils::$context['some_likes'] = true;
+$count = $message['likes']['count'];
+$base = 'likes_count';
+?><?php if ($message['likes']['you']): ?><?php
+$base = 'you_' . $base;
+$count--;
+?><?php endif; ?><?php
+$like_text = Lang::getTxt($base, ['url' => Config::$scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'num' => $count], file: 'General');
+// Remove link if no cookies; session reference won't work
+// Also, don't show link to guests
+?><?php if (empty($_COOKIE) || User::$me->is_guest): ?><?php $like_text = preg_replace('~</?a\b[^>]*>~', '', $like_text); ?><?php endif; ?>
+									<li class="like_count smalltext">
+										<?= $like_text ?>
+									</li><?php endif; ?>
+								</ul><?php endif; ?><?php /* Show the quickbuttons, for various operations on posts. */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $message['quickbuttons'], 'list_class' => 'post']); ?>
+							</div><!-- .under_message -->
+						</div><!-- .postarea -->
+						<div class="moderatorbar"><?php /* Are there any custom profile fields for above the signature? */ ?><?php if (!empty($message['custom_fields']['above_signature'])): ?>
+							<div class="custom_fields_above_signature">
+								<ul class="nolist"><?php foreach ($message['custom_fields']['above_signature'] as $custom): ?>
+									<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+								</ul>
+							</div><?php endif; ?><?php /* Show the member's signature? */ ?><?php if (!empty($message['member']['signature']) && empty(Theme::$current->options['show_no_signatures']) && Utils::$context['signature_enabled']): ?>
+							<div class="signature" id="msg_<?= $message['id'] ?>_signature"<?= $ignoring ? ' style="display:none;"' : '' ?>>
+								<?= $message['member']['signature'] ?>
+							</div><?php endif; ?><?php /* Are there any custom profile fields for below the signature? */ ?><?php if (!empty($message['custom_fields']['below_signature'])): ?>
+							<div class="custom_fields_below_signature">
+								<ul class="nolist"><?php foreach ($message['custom_fields']['below_signature'] as $custom): ?>
+									<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+								</ul>
+							</div><?php endif; ?>
+						</div><!-- .moderatorbar -->
+					</div><!-- .post_wrapper -->
+				</div><!-- $message[css_class] -->
+				<hr class="post_separator">
\ No newline at end of file
diff --git a/Themes/default/EditHistory.template.php b/Themes/default/templates/EditHistory/diff.php
similarity index 55%
rename from Themes/default/EditHistory.template.php
rename to Themes/default/templates/EditHistory/diff.php
index 607725970aa..94ccc4d85df 100644
--- a/Themes/default/EditHistory.template.php
+++ b/Themes/default/templates/EditHistory/diff.php
@@ -14,26 +14,27 @@
 use SMF\Theme;
 use SMF\Utils;
 
-/**
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
  * The template for displaying a diff in a popup or overlay.
  */
-function template_diff()
-{
-	echo '<!DOCTYPE html>
-<html', Utils::$context['right_to_left'] ? ' dir="rtl"' : '', '>
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
 	<head>
-		<meta charset="', Utils::$context['character_set'], '">
+		<meta charset="<?= Utils::$context['character_set'] ?>">
 		<meta name="robots" content="noindex">
-		<title>', Utils::$context['page_title'], '</title>
-		', Theme::template_css(), '
-		<script src="', Theme::$current->settings['default_theme_url'], '/scripts/script.js', Utils::$context['browser_cache'], '"></script>
+		<title><?= Utils::$context['page_title'] ?></title>
+		<?= Theme::template_css() ?>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/script.js<?= Utils::$context['browser_cache'] ?>"></script>
 	</head>
 	<body id="help_popup">
 		<div class="windowbg description">
-			', Utils::$context['diff'], '<br>
+			<?= Utils::$context['diff'] ?><br>
 			<br>
 			<a href="javascript:self.close();"></a>
 		</div>
 	</body>
-</html>';
-}
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/EditHistory/index.php b/Themes/default/templates/EditHistory/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/EditHistory/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Errors/attachment_errors.php b/Themes/default/templates/Errors/attachment_errors.php
new file mode 100644
index 00000000000..114c388155c
--- /dev/null
+++ b/Themes/default/templates/Errors/attachment_errors.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template handles showing attachment-related errors
+ */
+?>
+	<div>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Utils::$context['error_title'] ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<div class="padding">
+				<div class="noticebox"><?= Utils::$context['error_message'] ?>
+				</div>
+<?php if (!empty(Utils::$context['back_link'])): ?>
+				<a class="button" href="<?= Config::$scripturl ?><?= Utils::$context['back_link'] ?>"><?= Lang::getTxt('back', file: 'General') ?></a>
+<?php endif; ?>
+				<span style="float: right; margin:.5em;"></span>
+				<a class="button" href="<?= Config::$scripturl ?><?= Utils::$context['redirect_link'] ?>"><?= Lang::getTxt('continue', file: 'General') ?></a>
+			</div>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Errors/error_log.php b/Themes/default/templates/Errors/error_log.php
new file mode 100644
index 00000000000..58bc6ba37d3
--- /dev/null
+++ b/Themes/default/templates/Errors/error_log.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template handles the error log in the admin center.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;start=<?= Utils::$context['start'] ?><?= Utils::$context['has_filter'] ? Utils::$context['filter']['href'] : '' ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('errorlog', file: 'General') ?>
+				</h3>
+			</div>
+			<div class="information flow_hidden">
+				<div class="additional_row"><?php /* No errors, so just show a message and be done with it. */ ?><?php if (empty(Utils::$context['errors'])): ?>
+					<?= Lang::getTxt('errorlog_no_entries', file: 'Admin') ?>
+				</div>
+			</div>
+		</form><?php return; ?><?php endif; ?><?php if (Utils::$context['has_filter']): ?>
+				<div class="infobox">
+					<?= Lang::getTxt('applying_filter', ['type' => Utils::$context['filter']['entity'], 'value' => Utils::$context['filter']['value']['html']], file: 'ManageMaintenance') ?>
+				</div><?php endif; ?>
+				<div class="floatright">
+					<input type="submit" name="removeSelection" value="<?= Lang::getTxt('remove_selection', file: 'ManageMaintenance') ?>" data-confirm="<?= Lang::getTxt('remove_selection_confirm', file: 'ManageMaintenance') ?>" class="button you_sure">
+					<input type="submit" name="delall" value="<?= (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results', file: 'ManageMaintenance') : Lang::getTxt('remove_all', file: 'Admin')) ?>" data-confirm="<?= (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results_confirm', file: 'ManageMaintenance') : Lang::getTxt('sure_about_errorlog_remove', file: 'ManageMaintenance')) ?>" class="button you_sure">
+					<?= (Utils::$context['has_filter'] ? '<a href="' . Config::$scripturl . '?action=admin;area=logs;sa=errorlog' . (Utils::$context['sort_direction'] == 'down' ? ';desc' : '') . '" class="button">' . Lang::getTxt('clear_filter', file: 'ManageMaintenance') . '</a>' : '') ?>
+				</div><?php $error_types = []; ?><?php foreach (Utils::$context['error_types'] as $type => $details): ?><?php $error_types[] = ($details['is_selected'] ? '<span class="main_icons right_arrow"></span> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : 'style="font-weight: normal;"') . ' title="' . $details['description'] . '">' . ($details['error_type'] === 'critical' ? '<span class="error">' . $details['label'] . '</span>' : $details['label']) . '</a>'; ?><?php endforeach; ?>
+				<?= Lang::getTxt('apply_filter_of_type', ['list' => implode(' | ', $error_types)], file: 'ManageMaintenance') ?>
+				</div>
+			</div>
+			<div class="pagesection">
+				<div class="pagelinks">
+					<?= Utils::$context['page_index'] ?>
+				</div>
+				<div class="floatright" style="padding: 0 12px">
+					<label for="check_all"><strong><?= Lang::getTxt('check_all', file: 'General') ?></strong></label>
+					<input type="checkbox" id="check_all" onclick="invertAll(this, this.form, 'delete[]');">
+				</div>
+			</div><?php /* We have some errors, must be some mods installed :P */ ?><?php foreach (Utils::$context['errors'] as $error): ?>
+			<div class="windowbg word_break">
+				<div class="counter" style="padding: 0 10px 10px 0"><?= $error['id'] ?></div>
+				<div class="topic_details">
+					<span class="floatright">
+						<input type="checkbox" name="delete[]" value="<?= $error['id'] ?>">
+					</span>
+					<h5>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? '' : ';desc' ?><?= Utils::$context['has_filter'] ? Utils::$context['filter']['href'] : '' ?>" title="<?= Lang::getTxt('reverse_direction', file: 'ManageMaintenance') ?>"><span class="main_icons sort_<?= Utils::$context['sort_direction'] ?>"></span></a> <?= $error['time'] ?>
+					</h5>
+					<hr class="clear">
+				</div>
+				<div>
+					<div class="half_content">
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=id_member;value=<?= $error['member']['id'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_member', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a>
+						<strong><?= $error['member']['link'] ?></strong><?php if (!empty($error['member']['ip'])): ?>
+						<br>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=ip;value=<?= $error['member']['ip'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_ip', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a>
+						<strong><a href="<?= Config::$scripturl ?>?action=trackip;searchip=<?= $error['member']['ip'] ?>"><?= $error['member']['ip'] ?></a></strong><?php endif; ?><?php if (!empty($error['member']['session'])): ?>
+						<br>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=session;value=<?= $error['member']['session'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_session', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a> <a class="bbc_link" href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=session;value=<?= $error['member']['session'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_session', file: 'ManageMaintenance')]) ?>"><?= $error['member']['session'] ?></a><?php endif; ?>
+						<br>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=url;value=<?= $error['url']['href'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_url', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a>
+						<a href="<?= $error['url']['html'] ?>" class="bbc_link word_break"><?= $error['url']['html'] ?></a><?php if (!empty($error['file'])): ?>
+						<br>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=file;value=<?= $error['file']['search'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_file', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a> <?= Lang::getTxt('error_file_and_line', ['file' => '<a class="bbc_link" href="' . $error['file']['href'] . '" onclick="return reqWin(this.href, 600, 480, false);">' . $error['file']['file'] . '</a>', 'line' => $error['file']['line']], file: 'ManageMaintenance') ?><?php endif; ?>
+					</div>
+					<div class="half_content">
+						<strong class="floatright">
+							<span class="main_icons details"></span> <a class="bbc_link" href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog;backtrace=<?= $error['id'] ?>" onclick="return reqWin(this.href, 600, 480, false);"><?= Lang::getTxt('backtrace_title', file: 'ManageMaintenance') ?></a>
+						</strong>
+					</div>
+				</div>
+				<div class="post">
+					<br class="clear">
+					<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=error_type;value=<?= $error['error_type']['type'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_type', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter"></span></a><?= Lang::getTxt('error_type_name', ['type' => $error['error_type']['type'] === 'critical' ? '<span class="error">' . $error['error_type']['name'] . '</span>' : $error['error_type']['name']], file: 'ManageMaintenance') ?><br>
+					<a href="<?= Config::$scripturl ?>?action=admin;area=logs;sa=errorlog<?= Utils::$context['sort_direction'] == 'down' ? ';desc' : '' ?>;filter=message;value=<?= $error['message']['href'] ?>" title="<?= Lang::getTxt('apply_filter_type', ['type' => Lang::getTxt('filter_only_message', file: 'ManageMaintenance')]) ?>"><span class="main_icons filter floatleft"></span></a>
+					<div class="codeheader"><?= Lang::getTxt('error_message', file: 'ManageMaintenance') ?></div><pre data-select-txt="<?= Lang::getTxt('code_select', file: 'General') ?>" data-shrink-txt="<?= Lang::getTxt('code_shrink', file: 'General') ?>" data-expand-txt="<?= Lang::getTxt('code_expand', file: 'General') ?>" class="bbc_code" style="white-space: pre-line; overflow-y: auto"><code><?= $error['message']['html'] ?></code></pre>
+				</div>
+			</div><?php endforeach; ?>
+			<div class="pagesection">
+				<div class="pagelinks">
+					<?= Utils::$context['page_index'] ?>
+				</div>
+				<div class="floatright">
+					<input type="submit" name="removeSelection" value="<?= Lang::getTxt('remove_selection', file: 'ManageMaintenance') ?>" data-confirm="<?= Lang::getTxt('remove_selection_confirm', file: 'ManageMaintenance') ?>" class="button you_sure">
+					<input type="submit" name="delall" value="<?= (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results', file: 'ManageMaintenance') : Lang::getTxt('remove_all', file: 'Admin')) ?>" data-confirm="<?= (Utils::$context['has_filter'] ? Lang::getTxt('remove_filtered_results_confirm', file: 'ManageMaintenance') : Lang::getTxt('sure_about_errorlog_remove', file: 'ManageMaintenance')) ?>" class="button you_sure">
+				</div>
+			</div><?php if (Utils::$context['sort_direction'] == 'down'): ?>
+			<input type="hidden" name="desc" value="1"><?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-el_token_var'] ?>" value="<?= Utils::$context['admin-el_token'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Errors/fatal_error.php b/Themes/default/templates/Errors/fatal_error.php
new file mode 100644
index 00000000000..c2fde69c03b
--- /dev/null
+++ b/Themes/default/templates/Errors/fatal_error.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+// @todo
+/*	This template file contains only the sub template fatal_error. It is
+	shown when an error occurs, and should show at least a back button and
+	Utils::$context['error_message'].
+*/
+/*
+ * THis displays a fatal error message
+ */
+?><?php if (!empty(Utils::$context['simple_action'])): ?>
+	<strong>
+		<?= Utils::$context['error_title'] ?>
+	</strong><br>
+	<div <?= Utils::$context['error_code'] ?>class="padding">
+		<?= Utils::$context['error_message'] ?>
+	</div><?php else: ?>
+	<div id="fatal_error">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Utils::$context['error_title'] ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<div <?= Utils::$context['error_code'] ?>class="padding">
+				<?= Utils::$context['error_message'] ?>
+			</div>
+		</div>
+	</div><?php /* Show a back button */ ?>
+	<div class="centertext">
+		<a class="button floatnone" href="<?= Utils::$context['error_link'] ?>"><?= Lang::getTxt('back', file: 'General') ?></a>
+	</div><?php endif; ?>
diff --git a/Themes/default/templates/Errors/index.php b/Themes/default/templates/Errors/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Errors/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Errors/show_backtrace.php b/Themes/default/templates/Errors/show_backtrace.php
new file mode 100644
index 00000000000..a47ec56ff96
--- /dev/null
+++ b/Themes/default/templates/Errors/show_backtrace.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template shows a backtrace of the given error
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Lang::getTxt('backtrace_title', file: 'ManageMaintenance') ?></title><?php Theme::template_css(); ?>
+	</head>
+	<body class="padding"><?php if (!empty(Utils::$context['error_info'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('error', file: 'ManageMaintenance') ?>
+				</h3>
+			</div>
+			<div class="windowbg" id="backtrace">
+				<table class="table_grid">
+					<tbody><?php if (!empty(Utils::$context['error_info']['error_type'])): ?>
+						<tr class="title_bar">
+							<td><strong><?= Lang::getTxt('error_type', file: 'ManageMaintenance') ?></strong></td>
+						</tr>
+						<tr class="windowbg">
+							<td><?= ucfirst(Utils::$context['error_info']['error_type']) ?></td>
+						</tr><?php endif; ?><?php if (!empty(Utils::$context['error_info']['message'])): ?>
+						<tr class="title_bar">
+							<td><strong><?= Lang::getTxt('error_message', file: 'ManageMaintenance') ?></strong></td>
+						</tr>
+						<tr class="windowbg lefttext">
+							<td><code class="bbc_code" style="white-space: pre-line; overflow-y: auto"><?= Utils::$context['error_info']['message'] ?></code></td>
+						</tr><?php endif; ?><?php if (!empty(Utils::$context['error_info']['file'])): ?>
+						<tr class="title_bar">
+							<td><strong><?= Lang::getTxt('file', file: 'General') ?></strong></td>
+						</tr>
+						<tr class="windowbg">
+							<td><?= Utils::$context['error_info']['file'] ?></td>
+						</tr><?php endif; ?><?php if (!empty(Utils::$context['error_info']['line'])): ?>
+						<tr class="title_bar">
+							<td><strong><?= Lang::getTxt('line', file: 'General') ?></strong></td>
+						</tr>
+						<tr class="windowbg">
+							<td><?= Utils::$context['error_info']['line'] ?></td>
+						</tr><?php endif; ?><?php if (!empty(Utils::$context['error_info']['url'])): ?>
+						<tr class="title_bar">
+							<td><strong><?= Lang::getTxt('error_url', file: 'ManageMaintenance') ?></strong></td>
+						</tr>
+						<tr class="windowbg word_break">
+							<td><?= Utils::$context['error_info']['url'] ?></td>
+						</tr><?php endif; ?>
+					</tbody>
+				</table>
+			</div><?php endif; ?><?php if (!empty(Utils::$context['error_info']['backtrace'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('backtrace_title', file: 'ManageMaintenance') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<ul class="padding"><?php foreach (Utils::$context['error_info']['backtrace'] as $key => $value): ?><?php /* Check for existing */ ?><?php if (!property_exists($value, 'file') || empty($value->file)): ?><?php $value->file = Lang::getTxt('unknown', file: 'General'); ?><?php endif; ?><?php if (!property_exists($value, 'line') || empty($value->line)): ?><?php $value->line = -1; ?><?php endif; ?>
+					<li class="backtrace"><?= Lang::getTxt(
+						'backtrace_info' . ($value->file == Lang::getTxt('unknown', file: 'General') && $value->line == -1 ? '_internal_function' : ''),
+						[
+							$key,
+							(!empty($value->class) ? $value->class . $value->type : '') . $value->function,
+							$value->file,
+							$value->line,
+							base64_encode($value->file),
+							Config::$scripturl,
+						],
+						file: 'ManageMaintenance',
+					) ?></li><?php endforeach; ?>
+				</ul>
+			</div><?php endif; ?>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Errors/show_file.php b/Themes/default/templates/Errors/show_file.php
new file mode 100644
index 00000000000..67e37bb9727
--- /dev/null
+++ b/Themes/default/templates/Errors/show_file.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template shows a snippet of code from a file and highlights which line caused the error.
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Utils::$context['file_data']['file'] ?></title>
+		<?= Theme::template_css() ?>
+	</head>
+	<body>
+		<table class="errorfile_table"><?php foreach (Utils::$context['file_data']['contents'] as $index => $line): ?><?php
+$line_num = $index + Utils::$context['file_data']['min'];
+$is_target = $line_num == Utils::$context['file_data']['target'];
+?>
+			<tr>
+				<td class="file_line<?= $is_target ? ' current">==&gt;' : '">' ?><?= $line_num ?>:</td>
+				<td <?= $is_target ? 'class="current"' : '' ?>><?= $line ?></td>
+			</tr><?php endforeach; ?>
+		</table>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/event_board.php b/Themes/default/templates/EventEditor/event_board.php
new file mode 100644
index 00000000000..8fb8c78eb2e
--- /dev/null
+++ b/Themes/default/templates/EventEditor/event_board.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for choosing a board to create a linked topic in.
+ */
+?><?php /* If user cannot create new events, skip this. */ ?><?php if (!User::$me->allowedTo('calendar_post')): ?><?php return; ?><?php endif; ?>
+					<dl id="topic_link_to">
+						<dt class="clear">
+							<?= Lang::getTxt('calendar_post_in', file: 'Calendar') ?>
+						</dt>
+						<dd><?php if (!empty(Config::$modSettings['cal_allow_unlinked'])): ?>
+							<label>
+								<input type="radio" id="link_to_none" name="link_to" value="none"<?= (empty(Utils::$context['event']->topic) ? ' checked' : '') ?>>
+								<?= Lang::getTxt('calendar_only', file: 'Calendar') ?>
+							</label><?php endif; ?><?php if (!empty(Utils::$context['event']->categories)): ?>
+							<label>
+								<input type="radio" id="link_to_board" name="link_to" value="board"<?= (empty(Utils::$context['event']->topic) && empty(Config::$modSettings['cal_allow_unlinked']) ? ' checked' : '') ?>>
+								<?= Lang::getTxt('new_topic', file: 'General') ?>
+							</label><?php endif; ?>
+							<label>
+								<input type="radio" id="link_to_topic" name="link_to" value="topic"<?= (!empty(Utils::$context['event']->topic) ? ' checked' : '') ?>>
+								<?= Lang::getTxt('calendar_topic_existing', file: 'Calendar') ?>
+							</label>
+						</dd>
+					</dl><?php if (!empty(Utils::$context['event']->categories)): ?>
+					<dl id="event_board">
+						<dt class="clear">
+							<label><?= Lang::getTxt('board_name', file: 'General') ?></label>
+						</dt>
+						<dd>
+							<select name="board"<?= empty(Utils::$context['event']->board) ? ' disabled' : '' ?>><?php foreach (Utils::$context['event']->categories as $category): ?>
+								<optgroup label="<?= $category['name'] ?>"><?php foreach ($category['boards'] as $board): ?>
+									<option value="<?= $board['id'] ?>"<?= $board['id'] == Utils::$context['event']->board ? ' selected' : '' ?>><?= $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '' ?> <?= $board['name'] ?></option><?php endforeach; ?>
+								</optgroup><?php endforeach; ?>
+							</select>
+						</dd>
+					</dl><?php endif; ?>
+					<dl id="event_topic">
+						<dt class="clear">
+							<label><?= Lang::getTxt('calendar_link_topic_id', file: 'Calendar') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="topic" value="<?= (!empty(Utils::$context['event']->topic) ? Utils::$context['event']->topic : '') ?>">
+						</dd>
+					</dl>
+					<hr class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/event_link_to.php b/Themes/default/templates/EventEditor/event_link_to.php
new file mode 100644
index 00000000000..0b55c77c22c
--- /dev/null
+++ b/Themes/default/templates/EventEditor/event_link_to.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\User;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for linking an existing topic to an event.
+ */
+?><?php /* If user cannot edit existing events, we don't need to bother showing these options at all. */ ?><?php if (!User::$me->allowedTo('calendar_edit_any') && !User::$me->allowedTo('calendar_edit_own')): ?><?php return; ?><?php endif; ?><?php /* If user can both create and edit events, show both options. */ ?><?php if (User::$me->allowedTo('calendar_post')): ?>
+					<dl id="event_link_to">
+						<dt class="clear">
+							<?= Lang::getTxt('calendar_link_to', file: 'Calendar') ?>
+						</dt>
+						<dd>
+							<label>
+								<input type="radio" id="event_link_to_new" name="event_link_to" value="new" checked>
+								<span><?= Lang::getTxt('calendar_event_new', file: 'Calendar') ?></span>
+							</label>
+							<label>
+								<input type="radio" name="event_link_to" value="existing">
+								<span><?= Lang::getTxt('calendar_event_existing', file: 'Calendar') ?></span>
+							</label>
+						</dd>
+					</dl><?php endif; ?><?php /* Let the user specify an existing event to link to. */ ?>
+					<dl id="event_id_to_link">
+						<dt class="clear">
+							<?= Lang::getTxt('calendar_link_event_id', file: 'Calendar') ?>
+						</dt>
+						<dd>
+							<input type="text" name="event_id_to_link">
+						</dd>
+					</dl>
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/event_new.php b/Themes/default/templates/EventEditor/event_new.php
new file mode 100644
index 00000000000..fbd9a5100bc
--- /dev/null
+++ b/Themes/default/templates/EventEditor/event_new.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for entering info about a new event.
+ */
+?><?php /* If user cannot create new events, skip this. */ ?><?php if (!User::$me->allowedTo('calendar_post')): ?><?php return; ?><?php endif; ?><?php /* Basic event info */ ?>
+					<div id="event_new">
+						<dl id="event_basic_info">
+							<dt class="clear">
+								<label<?= isset(Utils::$context['post_error']['no_event']) ? ' class="error"' : '' ?>><?= Lang::getTxt('calendar_event_title', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<input type="text" id="evtitle" name="evtitle" maxlength="255" value="<?= Utils::$context['event']->selected_occurrence->title ?>"<?= isset(Utils::$context['post_error']['no_event']) ? ' class="error"' : '' ?>>
+							</dd>
+
+							<dt class="clear">
+								<label><?= Lang::getTxt('location', file: 'General') ?></label>
+							</dt>
+							<dd>
+								<input type="text" name="event_location" id="event_location" maxlength="255" value="<?= Utils::$context['event']->selected_occurrence->location ?>">
+							</dd>
+						</dl><?php /* Date and time info. */ ?>
+						<hr class="clear">
+						<dl id="event_date_and_time">
+							<dt class="clear">
+								<label for="allday"><?= Lang::getTxt('calendar_allday', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<input type="checkbox" name="allday" id="allday"<?= !empty(Utils::$context['event']->allday) ? ' checked' : '' ?><?= !empty(Utils::$context['event']->special_rrule) || (!Utils::$context['event']->new && !Utils::$context['event']->selected_occurrence->is_first) ? ' disabled' : '' ?>>
+
+							</dd>
+
+							<dt class="clear">
+								<label><?= Lang::getTxt('start', file: 'General') ?></label>
+							</dt>
+							<dd>
+								<input type="date" name="start_date" id="start_date" value="<?= Utils::$context['event']->selected_occurrence->start->format('Y-m-d') ?>" class="date_input start"<?= !empty(Utils::$context['event']->special_rrule) ? ' disabled data-force-disabled' : '' ?>>
+								<input type="time" name="start_time" id="start_time" value="<?= Utils::$context['event']->selected_occurrence->start->format('H:i') ?>" class="time_input start"<?= !empty(Utils::$context['event']->allday) || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '' ?><?= !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '' ?>>
+							</dd>
+
+							<dt class="clear">
+								<label><?= Lang::getTxt('end', file: 'General') ?></label>
+							</dt>
+							<dd>
+								<input type="date" name="end_date" id="end_date" value="<?= Utils::$context['event']->selected_occurrence->end->format('Y-m-d') ?>" class="date_input end"<?= Config::$modSettings['cal_maxspan'] == 1 || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '' ?><?= !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '' ?>>
+								<input type="time" name="end_time" id="end_time" value="<?= Utils::$context['event']->selected_occurrence->end->format('H:i') ?>" class="time_input end"<?= !empty(Utils::$context['event']->allday) || !empty(Utils::$context['event']->special_rrule) ? ' disabled' : '' ?><?= !empty(Utils::$context['event']->special_rrule) ? ' data-force-disabled' : '' ?>>
+							</dd>
+
+							<dt id="tz_dt" class="clear">
+								<label><?= Lang::getTxt('calendar_timezone', file: 'Calendar') ?></label>
+							</dt>
+							<dd id="tz_dd"><?php $this->subTemplate('timezone_select', ['name' => 'tz', 'selection' => Utils::$context['event']->selected_occurrence->tzid, 'disabled' => !empty(Utils::$context['event']->special_rrule) ? 2 : (int) Utils::$context['event']->allday]); ?>
+							</dd>
+						</dl><?php /* If this is a new event or the first occurrence of an existing event, show the RRULE stuff. */ ?><?php if (Utils::$context['event']->new || Utils::$context['event']->selected_occurrence->is_first): ?><?php $this->subTemplate('rrule'); ?><?php else: ?><?php $this->subTemplate('occurrence_options'); ?><?php endif; ?>
+					</div>
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/event_options.php b/Themes/default/templates/EventEditor/event_options.php
new file mode 100644
index 00000000000..502119264f7
--- /dev/null
+++ b/Themes/default/templates/EventEditor/event_options.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Calendar\Event;
+use SMF\Lang;
+use SMF\Topic;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for the event options fieldset that is used when creating an event.
+ *
+ * Used by Calendar.template.php and Post.template.php
+ */
+?>
+				<fieldset id="event_options">
+					<legend><?= Lang::getTxt('calendar_event_options', file: 'Calendar') ?></legend>
+					<input type="hidden" name="calendar" value="1">
+					<input type="hidden" name="eventid" value="<?= Utils::$context['event']->id ?>">
+					<input type="hidden" name="recurrenceid" value="<?= Utils::$context['event']->selected_occurrence->id ?>"><?php /* Allow the user to link events to topics. */ ?><?php
+if (
+		Utils::$context['event']->type === Event::TYPE_EVENT
+		&& (
+			Utils::$context['event']->new
+			|| Utils::$context['event']->selected_occurrence->is_first
+		)
+	):
+?><?php if (empty(Utils::$context['event']->topic)): ?><?php $this->subTemplate('event_board'); ?><?php elseif (Utils::$context['event']->topic === (Topic::$topic_id ?? NAN)): ?><?php $this->subTemplate('event_unlink'); ?><?php elseif (Utils::$context['event']->new): ?><?php $this->subTemplate('event_link_to'); ?><?php endif; ?><?php endif; ?><?php $this->subTemplate('event_new'); ?>
+				</fieldset>
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/event_unlink.php b/Themes/default/templates/EventEditor/event_unlink.php
new file mode 100644
index 00000000000..77a1a2f1066
--- /dev/null
+++ b/Themes/default/templates/EventEditor/event_unlink.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for unlinking a topic and an event.
+ */
+?><?php if (empty(Utils::$context['event']->topic) || empty(Config::$modSettings['cal_allow_unlinked'])): ?><?php return; ?><?php endif; ?>
+					<dl>
+						<dt class="clear">
+							<?= Lang::getTxt('calendar_unlink', file: 'Calendar') ?>
+						</dt>
+						<dd>
+							<input type="checkbox" name="unlink">
+						</dd>
+					</dl>
+					<hr class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/index.php b/Themes/default/templates/EventEditor/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/EventEditor/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/EventEditor/linked_events.php b/Themes/default/templates/EventEditor/linked_events.php
new file mode 100644
index 00000000000..8ba0cb1731f
--- /dev/null
+++ b/Themes/default/templates/EventEditor/linked_events.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Calendar\Event;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template to show linked events.
+ */
+?><?php if (empty(Utils::$context['linked_calendar_events'])): ?><?php return; ?><?php endif; ?>
+				<div class="information events">
+					<ul><?php foreach (Utils::$context['linked_calendar_events'] as $event): ?>
+						<li>
+							<strong class="event_title"><a href="<?= Config::$scripturl ?>?action=calendar;event=<?= $event->id ?><?= (!$event->is_first ? ';start_date=' . $event->start->date : '') ?>"><?= $event->title ?></a></strong><?php if ($event->can_edit): ?> <a href="<?= $event->modify_href ?>"><span class="main_icons calendar_modify" title="<?= Lang::getTxt('calendar_edit', file: 'Calendar') ?>"></span></a><?php endif; ?><?php if ($event->can_export): ?> <a href="<?= $event->export_href ?>"><span class="main_icons calendar_export" title="<?= Lang::getTxt('calendar_export', file: 'Calendar') ?>"></span></a><?php endif; ?>
+							<br><?php if (!empty($event->allday)): ?><time datetime="<?= $event->start->iso_gmdate ?>"><?= trim($event->start->date_local) ?></time><?= ($event->start->date != $event->end->date) ? ' &ndash; <time datetime="' . $event->end->iso_gmdate . '">' . trim($event->end->date_local) . '</time>' : '' ?><?php else: ?><?php /* Display event info relative to user's local timezone */ ?><time datetime="<?= $event->start->iso_gmdate ?>"><?= trim($event->start->date_local) ?>, <?= trim($event->start->time_local) ?></time> &ndash; <time datetime="<?= $event->end->iso_gmdate ?>"><?php if ($event->start->date_local != $event->end->date_local): ?><?= trim($event->end->date_local) ?>, <?php endif; ?><?= trim($event->end->time_local) ?><?php /* Display event info relative to original timezone */ ?><?php if ($event->start->date_local . $event->start->time_local != $event->start->date_orig . $event->start->time_orig): ?></time> (<time datetime="<?= $event->start->iso_gmdate ?>"><?php if ($event->start->date_orig != $event->start->date_local || $event->end->date_orig != $event->end->date_local || $event->start->date_orig != $event->end->date_orig): ?><?= trim($event->start->date_orig) ?>, <?php endif; ?><?= trim($event->start->time_orig) ?></time> &ndash; <time datetime="<?= $event->end->iso_gmdate ?>"><?php if ($event->start->date_orig != $event->end->date_orig): ?><?= trim($event->end->date_orig) ?>, <?php endif; ?><?= trim($event->end->time_orig) ?> <?= $event->start->tz_abbrev ?></time>)<?php /* Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion */ ?><?php else: ?> <?= $event->start->tz_abbrev ?></time><?php endif; ?><?php endif; ?><?php if (!empty($event->location)): ?>
+							<br><?= $event->location ?><?php endif; ?><?php $rrule_description = $event->getParentEvent()->recurrence_iterator->getRRule()->getDescription($event); ?><?php if (!empty($rrule_description)): ?>
+							<br><?= $rrule_description ?><?php endif; ?>
+						</li><?php endforeach; ?>
+					</ul>
+				</div>
\ No newline at end of file
diff --git a/Themes/default/templates/EventEditor/occurrence_options.php b/Themes/default/templates/EventEditor/occurrence_options.php
new file mode 100644
index 00000000000..8848aa1c802
--- /dev/null
+++ b/Themes/default/templates/EventEditor/occurrence_options.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template used when editing a single occurrence of an event.
+ */
+?><?php if (Utils::$context['event']->selected_occurrence->can_affect_future): ?>
+						<dl id="occurrence_options">
+							<dt class="clear">
+								<?= Lang::getTxt('calendar_repeat_adjustment_label', file: 'Calendar') ?>
+							</dt>
+							<dd>
+								<label>
+									<input type="radio" name="affects_future" value="0" required checked>
+									<span><?= Lang::getTxt('calendar_repeat_adjustment_this_only', file: 'Calendar') ?></span>
+								</label>
+								<br>
+								<label>
+									<input type="radio" name="affects_future" value="1" required class="you_sure" data-confirm="<?= Lang::getTxt('calendar_repeat_adjustment_confirm', file: 'Calendar') ?>">
+									<span><?= Lang::getTxt('calendar_repeat_adjustment_this_and_future', file: 'Calendar') ?></span>
+								</label>
+							</dd>
+						</dl><?php endif; ?>
diff --git a/Themes/default/templates/EventEditor/rrule.php b/Themes/default/templates/EventEditor/rrule.php
new file mode 100644
index 00000000000..5d428878116
--- /dev/null
+++ b/Themes/default/templates/EventEditor/rrule.php
@@ -0,0 +1,266 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Calendar\Event;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for the recurrence rule options for events.
+ */
+?>
+
+<?php /* Recurring event options. */ ?>
+						<dl id="rrule_options">
+<?php /* RRULE presets. */ ?>
+							<dt class="clear">
+								<label><?= Lang::getTxt('calendar_repeat_recurrence_label', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<select name="RRULE" id="rrule" class="rrule_input">
+<?php foreach (Utils::$context['event']->rrule_presets as $rrule => $description): ?>
+<?php if (is_array($description)): ?>
+									<optgroup label="<?= $rrule ?>">
+<?php foreach ($description as $special_rrule => $special_rrule_description): ?>
+											<option value="<?= $special_rrule ?>"<?= $special_rrule === Utils::$context['event']->rrule_preset || $special_rrule === 'custom' && !isset(Utils::$context['event']->rrule_presets[Utils::$context['event']->rrule_preset]) ? ' selected' : '' ?>><?= $special_rrule_description ?></option>
+<?php endforeach; ?>
+									</optgroup>
+<?php else: ?>
+									<option value="<?= $rrule ?>"<?= $rrule === Utils::$context['event']->rrule_preset || $rrule === 'custom' && !isset(Utils::$context['event']->rrule_presets[Utils::$context['event']->rrule_preset]) ? ' selected' : '' ?>><?= $description ?></option>
+<?php endif; ?>
+<?php endforeach; ?>
+								</select>
+<?php /* When to end the recurrence. */ ?>
+<?php if (empty(Utils::$context['event']->special_rrule)): ?>
+								<span id="rrule_end" class="rrule_input_wrapper">
+									<select id="end_option" class="rrule_input">
+										<option value="forever"><?= Lang::getTxt(['calendar_repeat_until_options', 'forever'], file: 'Calendar') ?></option>
+										<option value="until"<?= !empty(Utils::$context['event']->recurrence_iterator->getRRule()->until) ? ' selected' : '' ?>><?= Lang::getTxt(['calendar_repeat_until_options', 'until'], file: 'Calendar') ?></option>
+										<option value="count"<?= (Utils::$context['event']->recurrence_iterator->getRRule()->count ?? 0) > 1 ? ' selected' : '' ?>><?= Lang::getTxt(['calendar_repeat_until_options', 'count'], file: 'Calendar') ?></option>
+									</select>
+									<input type="date" name="UNTIL" id="until" class="rrule_input"<?= !empty(Utils::$context['event']->recurrence_iterator->getRRule()->until) ? ' value="' . Utils::$context['event']->recurrence_iterator->getRRule()->until->format('Y-m-d') . '"' : ' disabled' ?>>
+									<input type="number" name="COUNT" id="count" class="rrule_input" min="1"<?= (Utils::$context['event']->recurrence_iterator->getRRule()->count ?? 0) > 1 ? ' value="' . Utils::$context['event']->recurrence_iterator->getRRule()->count . '"' : ' value="1" disabled' ?>>
+								</span>
+<?php endif; ?>
+							</dd>
+						</dl>
+<?php if (!empty(Utils::$context['event']->special_rrule) || (Utils::$context['event']->new && Utils::$context['event']->type === Event::TYPE_HOLIDAY)): ?>
+						<dl id="special_rrule_options">
+							<dt class="clear">
+								<a id="special_rrule_modifier_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=special_rrule_modifier" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="Help"></span></a>
+								<label><?= Lang::getTxt('calendar_repeat_special_rrule_modifier', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<input type="text" name="special_rrule_modifier" id="special_rrule_modifier" placeholder="<?= Lang::getTxt('calendar_repeat_offset_examples', file: 'Calendar') ?>" value="<?= (Utils::$context['event']->special_rrule['modifier'] ?? '') ?>">
+							</dd>
+						</dl>
+<?php endif; ?>
+<?php if (empty(Utils::$context['event']->special_rrule)): ?>
+<?php /* Custom frequency and interval (e.g. "every 2 weeks") */ ?>
+						<dl id="freq_interval_options" class="rrule_input_wrapper">
+							<dt class="clear">
+								<label><?= Lang::getTxt('calendar_repeat_interval_label', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<input type="number" name="INTERVAL" value="<?= Utils::$context['event']->recurrence_iterator->getRRule()->interval ?>" min="1" class="rrule_input" disabled>
+								<select name="FREQ" id="freq" class="rrule_input">
+<?php foreach (Utils::$context['event']->frequency_units as $freq => $unit): ?>
+									<option value="<?= $freq ?>"<?= Utils::$context['event']->recurrence_iterator->getRRule()->freq === $freq ? ' selected' : '' ?>><?= $unit ?></option>
+<?php endforeach; ?>
+								</select>
+							</dd>
+						</dl>
+<?php /* Custom yearly options. */ ?>
+						<dl id="yearly_options" class="rrule_input_wrapper">
+							<dt class="clear">
+								<label><?= Lang::getTxt('calendar_repeat_bymonth_label', file: 'Calendar') ?></label>
+							</dt>
+							<dd>
+								<div class="rrule_input_row">
+<?php for ($i = 1; $i <= 12; $i++): ?>
+									<label class="bymonth_label">
+										<input type="checkbox" name="BYMONTH[]" value="<?= $i ?>" id="bymonth_<?= $i ?>" class="rrule_input" disabled>
+										<span><?= Lang::getTxt(['months_short', $i], file: 'General') ?></span>
+									</label>
+<?php if ($i % 6 === 0): ?>
+								</div>
+								<div class="rrule_input_row">
+<?php endif; ?>
+<?php endfor; ?>
+								</div>
+							</dd>
+						</dl>
+<?php /* Custom monthly options. */ ?>
+						<dl id="monthly_options" class="rrule_input_wrapper">
+<?php /* Custom monthly: by day of month. */ ?>
+							<dt class="clear" id="dt_monthly_option_type_bymonthday">
+								<label>
+									<?= Lang::getTxt('calendar_repeat_bymonthday_label', file: 'Calendar') ?>
+									<input type="radio" name="monthly_option_type" id="monthly_option_type_bymonthday"<?= !empty(Utils::$context['event']->recurrence_iterator->getRRule()->bymonthday) ? ' checked' : '' ?>>
+								</label>
+							</dt>
+							<dd id="dd_monthly_option_type_bymonthday">
+								<div id="month_bymonthday_options" class="rrule_input">
+									<div class="rrule_input inline_block">
+										<div class="rrule_input_row">
+<?php for ($i = 1; $i <= 31; $i++): ?>
+											<label class="bymonthday_label">
+												<input type="checkbox" name="BYMONTHDAY[]" id="bymonthday_<?= $i ?>" value="<?= $i ?>"  class="rrule_input" disabled> <span><?= $i ?></span>
+											</label>
+<?php if ($i % 7 === 0): ?>
+										</div>
+										<div class="rrule_input_row">
+<?php endif; ?>
+<?php endfor; ?>
+										</div>
+									</div>
+								</div>
+							</dd>
+<?php /* Custom monthly: by weekday and offset (e.g. "the second Tuesday") */ ?>
+							<dt class="clear">
+								<label>
+									<?= Lang::getTxt('calendar_repeat_byday_label', file: 'Calendar') ?>
+									<input type="radio" name="monthly_option_type" id="monthly_option_type_byday"<?= !empty(Utils::$context['event']->recurrence_iterator->getRRule()->byday) ? ' checked' : '' ?>>
+								</label>
+							</dt>
+							<dd id="month_byday_options">
+								<div class="rrule_input clear">
+<?php foreach (Utils::$context['event']->byday_items as $byday_item_key => $byday_item): ?>
+									<div>
+										<select id="byday_num_select_<?= $byday_item_key ?>" name="BYDAY_num[<?= $byday_item_key ?>]" class="rrule_input byday_num_select" disabled>
+<?php foreach (Utils::$context['event']->byday_num_options as $num => $ordinal): ?>
+<?php if (isset($prev_num) && ($num < 0) !== ($prev_num < 0)): ?>
+											<option disabled>------</option>
+<?php endif; ?>
+											<option value="<?= $num ?>" class="byday_num_<?= ($num < 0 ? 'neg' : '') ?><?= abs($num) ?>"<?= $num == $byday_item['num'] ? ' selected' : '' ?>><?= $ordinal ?></option>
+<?php $prev_num = $num; ?>
+<?php endforeach; ?>
+<?php unset($prev_num); ?>
+										</select>
+										<select id="byday_name_select_<?= $byday_item_key ?>" name="BYDAY_name[<?= $byday_item_key ?>]" class="rrule_input byday_name_select" disabled>
+<?php foreach (Utils::$context['event']->sorted_weekdays as $weekday): ?>
+											<option value="<?= $weekday['abbrev'] ?>" class="byday_name_<?= $weekday['abbrev'] ?>"<?= $weekday['abbrev'] == $byday_item['name'] ? ' selected' : '' ?>><?= $weekday['long'] ?></option>
+<?php endforeach; ?>
+											<option disabled>------</option>
+											<option value="MO,TU,WE,TH,FR"><?= Lang::getTxt('calendar_repeat_weekday', file: 'Calendar') ?></option>
+											<option value="SA,SU"><?= Lang::getTxt('calendar_repeat_weekend_day', file: 'Calendar') ?></option>
+										</select>
+									</div>
+<?php endforeach; ?>
+								</div>
+								<div>
+									<a id="event_add_byday" class="rrule_input button floatnone"><?= Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar') ?></a>
+								</div>
+								<template id="byday_template">
+									<div>
+										<select name="BYDAY_num[-1]" class="rrule_input byday_num_select">
+<?php foreach (Utils::$context['event']->byday_num_options as $num => $ordinal): ?>
+<?php if (isset($prev_num) && ($num < 0) !== ($prev_num < 0)): ?>
+											<option disabled>------</option>
+<?php endif; ?>
+											<option value="<?= $num ?>" class="byday_num_<?= ($num < 0 ? 'neg' : '') ?><?= abs($num) ?>"><?= $ordinal ?></option>
+<?php $prev_num = $num; ?>
+<?php endforeach; ?>
+<?php unset($prev_num); ?>
+										</select>
+										<select name="BYDAY_name[-1]" class="rrule_input byday_name_select">
+<?php foreach (Utils::$context['event']->sorted_weekdays as $weekday): ?>
+											<option value="<?= $weekday['abbrev'] ?>" class="byday_name_<?= $weekday['abbrev'] ?>"><?= $weekday['long'] ?></option>
+<?php endforeach; ?>
+											<option disabled>------</option>
+											<option value="MO,TU,WE,TH,FR"><?= Lang::getTxt('calendar_repeat_weekday', file: 'Calendar') ?></option>
+											<option value="SA,SU"><?= Lang::getTxt('calendar_repeat_weekend_day', file: 'Calendar') ?></option>
+										</select>
+									</div>
+								</template>
+							</dd>
+						</dl>
+<?php /* Custom weekly options. */ ?>
+						<dl id="weekly_options" class="rrule_input_wrapper">
+							<dt class="clear">
+								<label><?= Lang::getTxt('calendar_repeat_byday_label', file: 'Calendar') ?></label>
+							</dt>
+							<dd class="rrule_input_row">
+<?php foreach (Utils::$context['event']->sorted_weekdays as $weekday): ?>
+									<label class="byday_label">
+										<input type="checkbox" name="BYDAY[]" id="byday_<?= $weekday['abbrev'] ?>" value="<?= $weekday['abbrev'] ?>"  class="rrule_input"<?= in_array($weekday['abbrev'], Utils::$context['event']->recurrence_iterator->getRRule()->byday ?? []) ? ' checked' : '' ?> disabled>
+										<span><?= $weekday['short'] ?></span>
+									</label>
+<?php endforeach; ?>
+							</dd>
+						</dl>
+<?php endif; ?>
+<?php /* Advanced options. */ ?>
+						<details id="advanced_options" class="rrule_input_wrapper"<?= (!empty(Utils::$context['event']->recurrence_iterator->getRDates()) || !empty(Utils::$context['event']->recurrence_iterator->getEXDates()) ? ' open' : '') ?>>
+							<summary><?= Lang::getTxt('calendar_repeat_advanced_options_label', file: 'Calendar') ?></summary>
+<?php /* Arbitrary dates to add to the recurrence set. */ ?>
+							<dl id="rdates">
+								<dt class="clear">
+									<label><?= Lang::getTxt('calendar_repeat_rdates_label', file: 'Calendar') ?></label>
+								</dt>
+								<dd>
+									<div id="rdate_list">
+<?php foreach (Utils::$context['event']->recurrence_iterator->getRDates() as $key => $rdate): ?>
+<?php
+$rdate = new SMF\Time($rdate);
+$rdate->setTimezone(Utils::$context['event']->start->getTimezone());
+?>
+										<div>
+											<input type="date" name="RDATE_date[<?= $key ?>]" value="<?= $rdate->format('Y-m-d') ?>" class="date_input">
+											<input type="time" name="RDATE_time[<?= $key ?>]" value="<?= $rdate->format('H:i') ?>" class="time_input">
+											<a class="main_icons delete"></a>
+										</div>
+<?php endforeach; ?>
+									</div>
+									<div>
+										<a id="event_add_rdate" data-container="rdate_list" data-inputname="RDATE" class="button floatnone"><?= Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar') ?></a>
+									</div>
+								</dd>
+							</dl>
+<?php /* Dates to exclude from the recurrence set. */ ?>
+							<dl id="exdates">
+								<dt class="clear">
+									<label><?= Lang::getTxt('calendar_repeat_exdates_label', file: 'Calendar') ?></label>
+								</dt>
+								<dd>
+									<div id="exdate_list">
+<?php foreach (Utils::$context['event']->recurrence_iterator->getExDates() as $key => $exdate): ?>
+<?php
+$exdate = new SMF\Time($exdate);
+$exdate->setTimezone(Utils::$context['event']->start->getTimezone());
+?>
+										<div>
+											<input type="date" name="EXDATE_date[<?= $key ?>]" value="<?= $exdate->format('Y-m-d') ?>" class="date_input">
+											<input type="time" name="EXDATE_time[<?= $key ?>]" value="<?= $exdate->format('H:i') ?>" class="time_input">
+											<a class="main_icons delete"></a>
+										</div>
+<?php endforeach; ?>
+									</div>
+									<div>
+										<a id="event_add_exdate" data-container="exdate_list" data-inputname="EXDATE" class="button floatnone"><?= Lang::getTxt('calendar_repeat_add_condition', file: 'Calendar') ?></a>
+									</div>
+									<template id="additional_dates_template">
+										<div>
+											<input type="date" name="" value="" class="date_input">
+											<input type="time" name="" value="" class="time_input">
+											<a class="main_icons delete"></a>
+										</div>
+									</template>
+								</dd>
+							</dl>
+						</details>
\ No newline at end of file
diff --git a/Themes/default/templates/GenericControls/control_richedit.php b/Themes/default/templates/GenericControls/control_richedit.php
new file mode 100644
index 00000000000..cdf7d5f4b4a
--- /dev/null
+++ b/Themes/default/templates/GenericControls/control_richedit.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Editor;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Renders a rich-text editor, including BBC buttons and smileys if enabled.
+ *
+ * This function sets up a textarea as a rich-text editor using SCEditor.
+ * The `$smiley_container` and `$bbc_container` parameters control the visibility
+ * and source of smiley and BBC containers, respectively.
+ *
+ * @param string $editor_id The unique ID of the editor.
+ * @param null|bool|string $smiley_container Controls the smiley container:
+ *   - `null`: Hides the smiley section.
+ *   - `true`: Generates the container dynamically using JavaScript.
+ *   - `string`: Specifies the HTML element ID for the smiley container.
+ * @param null|bool|string $bbc_container Controls the BBC container:
+ *   - `null`: Hides the BBC buttons.
+ *   - `true`: Generates the container dynamically using JavaScript.
+ *   - `string`: Specifies the HTML element ID for the BBC container.
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['smiley_container' => null, 'bbc_container' => null], EXTR_SKIP);
+?>
+
+<?php $editor_context = Editor::$loaded[$editor_id]; ?>
+		<textarea class="editor" name="<?= $editor_id ?>" id="<?= $editor_id ?>" cols="600" style="width: <?= $editor_context['width'] ?>; height: <?= $editor_context['height'] ?>;<?= isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? 'border: 1px solid red;' : '' ?>"<?= !empty(Utils::$context['editor']['required']) ? ' required' : '' ?>><?= $editor_context['value'] ?></textarea>
+		<input type="hidden" name="<?= $editor_id ?>_mode" id="<?= $editor_id ?>_mode" value="0">
+		<script>
+			document.addEventListener("DOMContentLoaded", function () {
+				var textarea = document.getElementById("<?= $editor_id ?>"), options = <?= json_encode($editor_context['sce_options'], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) ?>;
+				sceditor.create(textarea, options, <?= Utils::escapeJavaScript($bbc_container) ?>, <?= Utils::escapeJavaScript($smiley_container) ?>);
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/GenericControls/control_richedit_buttons.php b/Themes/default/templates/GenericControls/control_richedit_buttons.php
new file mode 100644
index 00000000000..9c7743d28a7
--- /dev/null
+++ b/Themes/default/templates/GenericControls/control_richedit_buttons.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Editor;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Renders the buttons section below a rich-text editor.
+ *
+ * Displays form buttons such as "Post" or "Preview" and integrates
+ * functionality like auto-saving drafts if enabled.
+ *
+ * @param string $editor_id The unique ID of the editor for which buttons are displayed.
+ */
+?><?php $editor_context = Editor::$loaded[$editor_id]; ?>
+		<span class="smalltext">
+			<?= Utils::$context['shortcuts_text'] ?>
+		</span>
+		<span class="post_button_container"><?php foreach (Utils::$context['richedit_buttons'] as $name => $button): ?><?php if ($name == 'preview'): ?><?php
+$button['value'] = $editor_context['labels']['preview_button'] ?? $button['value'];
+$button['show'] = $editor_context['preview_type'];
+?><?php endif; ?><?php if ($button['show']): ?>
+		<input type="<?= $button['type'] ?>"<?= $button['type'] == 'hidden' ? ' id="' . $name . '"' : '' ?> name="<?= $name ?>" value="<?= $button['value'] ?>"<?= !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '' ?><?= !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '' ?><?= $button['type'] != 'hidden' ? ' class="button"' : '' ?>><?php endif; ?><?php endforeach; ?>
+		<input type="submit" value="<?= $editor_context['labels']['post_button'] ?? Lang::getTxt('post', file: 'General') ?>" name="post" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+		</span><?php /* Include auto-save feature if drafts are enabled. */ ?><?php if (!empty(Utils::$context['drafts_save']) && !empty(Utils::$context['drafts_autosave'])): ?>
+		<span class="righttext padding" style="display: block">
+			<span id="throbber" style="display:none"><img src="<?= Theme::$current->settings['images_url'] ?>/loading_sm.gif" alt="" class="centericon"></span>
+			<span id="draft_lastautosave"></span>
+		</span><?php endif; ?>
diff --git a/Themes/default/templates/GenericControls/control_verification.php b/Themes/default/templates/GenericControls/control_verification.php
new file mode 100644
index 00000000000..125bc56149d
--- /dev/null
+++ b/Themes/default/templates/GenericControls/control_verification.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+use SMF\Verifier;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a verification form with CAPTCHA or question-based challenges.
+ *
+ * Used to validate user input for forms, supporting various verification
+ * mechanisms such as CAPTCHA images, reCAPTCHA, and custom questions.
+ *
+ * @param int|string $verify_id The unique identifier for the verification control.
+ * @param string $display_type Determines how to display items:
+ *   - `'single'`: Displays one item at a time (e.g., in a loop).
+ *   - `'all'`: Displays all items together.
+ * @param bool $reset Whether to reset the internal tracking counter.
+ *
+ * @return ?bool Returns `false` if no items are left to display, `true` if displaying a single item, and `null` otherwise.
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['display_type' => 'all', 'reset' => false], EXTR_SKIP);
+?><?php
+$verify_context = Verifier::$loaded[$verify_id];
+// Reset tracking if necessary.
+?><?php if (empty($verify_context->tracking) || $reset): ?><?php $verify_context->tracking = 0; ?><?php endif; ?><?php
+$total_items = count($verify_context->questions) + ($verify_context->show_visual || $verify_context->can_recaptcha ? 1 : 0);
+// Stop if all items are processed.
+?><?php if ($verify_context->tracking > $total_items): ?><?php return false; ?><?php endif; ?><?php /* Loop through each item to show them. */ ?><?php for ($i = 0; $i < $total_items; $i++): ?><?php /* If we're after a single item only show it if we're in the right place. */ ?><?php if ($display_type == 'single' && $verify_context->tracking != $i): ?><?php continue; ?><?php endif; ?><?php if ($display_type != 'single'): ?>
+			<div id="verification_control_<?= $i ?>" class="verification_control"><?php endif; ?><?php /* Display empty field, but only if we have one, and it's the first time. */ ?><?php if ($verify_context->empty_field && empty($i)): ?>
+				<div class="smalltext vv_special">
+					<?= Lang::getTxt('visual_verification_hidden', file: 'General') ?>
+					<input type="text" name="<?= $_SESSION[$verify_id . '_vv']['empty_field'] ?>" autocomplete="off" size="30" value="">
+				</div><?php endif; ?><?php /* Do the actual stuff */ ?><?php if ($i == 0 && ($verify_context->show_visual || $verify_context->can_recaptcha)): ?><?php if ($verify_context->show_visual): ?><?php if (Utils::$context['use_graphic_library']): ?>
+				<img src="<?= $verify_context->image_href ?>" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>"><?php else: ?>
+				<img src="<?= $verify_context->image_href ?>;letter=1" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_1">
+				<img src="<?= $verify_context->image_href ?>;letter=2" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_2">
+				<img src="<?= $verify_context->image_href ?>;letter=3" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_3">
+				<img src="<?= $verify_context->image_href ?>;letter=4" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_4">
+				<img src="<?= $verify_context->image_href ?>;letter=5" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_5">
+				<img src="<?= $verify_context->image_href ?>;letter=6" alt="<?= Lang::getTxt('visual_verification_description', file: 'General') ?>" id="verification_image_<?= $verify_id ?>_6"><?php endif; ?>
+				<div class="smalltext" style="margin: 4px 0 8px 0;">
+					<a href="<?= $verify_context->image_href ?>;sound" id="visual_verification_<?= $verify_id ?>_sound" rel="nofollow"><?= Lang::getTxt('visual_verification_sound', file: 'General') ?></a> / <a href="#visual_verification_<?= $verify_id ?>_refresh" id="visual_verification_<?= $verify_id ?>_refresh"><?= Lang::getTxt('visual_verification_request_new', file: 'General') ?></a><?= $display_type != 'quick_reply' ? '<br>' : '' ?><br>
+					<?= Lang::getTxt('visual_verification_description', file: 'General') ?><?= $display_type != 'quick_reply' ? '<br>' : '' ?>
+					<input type="text" name="<?= $verify_id ?>_vv[code]" value="" size="30" autocomplete="off" required>
+				</div><?php endif; ?><?php if ($verify_context->can_recaptcha): ?><?php $lang = Lang::getTxt(Lang::txtExists('lang_recaptcha', file: 'General') ? 'lang_recaptcha' : 'lang_dictionary', file: 'General'); ?>
+				<div class="g-recaptcha centertext" data-sitekey="<?= $verify_context->recaptcha_site_key ?>" data-theme="<?= $verify_context->recaptcha_theme ?>"></div>
+				<br>
+				<script type="text/javascript" src="https://www.google.com/recaptcha/api.js?hl=<?= $lang ?>"></script><?php endif; ?><?php else: ?><?php
+// Where in the question array is this question?
+$qIndex = $verify_context->show_visual || $verify_context->can_recaptcha ? $i - 1 : $i;
+?><?php if (isset($verify_context->questions[$qIndex])): ?>
+				<div class="smalltext">
+					<?= $verify_context->questions[$qIndex]['q'] ?>:<br>
+					<input type="text" name="<?= $verify_id ?>_vv[q][<?= $verify_context->questions[$qIndex]['id'] ?>]" size="30" value="<?= $verify_context->questions[$qIndex]['a'] ?>" <?= $verify_context->questions[$qIndex]['is_error'] ? 'style="border: 1px red solid;"' : '' ?> required>
+				</div><?php endif; ?><?php endif; ?><?php if ($display_type != 'single'): ?>
+			</div><!-- #verification_control_[i] --><?php endif; ?><?php /* If we were displaying just one and we did it, break. */ ?><?php if ($display_type == 'single' && $verify_context->tracking == $i): ?><?php break; ?><?php endif; ?><?php endfor; ?><?php
+// Assume we found something, always.
+$verify_context->tracking++;
+// Tell something displaying piecemeal to keep going.
+?><?php if ($display_type == 'single'): ?><?php return true; ?><?php endif; ?><?php return; ?>
diff --git a/Themes/default/templates/GenericControls/index.php b/Themes/default/templates/GenericControls/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/GenericControls/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/GenericList/additional_rows.php b/Themes/default/templates/GenericList/additional_rows.php
new file mode 100644
index 00000000000..66680c6020e
--- /dev/null
+++ b/Themes/default/templates/GenericList/additional_rows.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template displays additional rows above or below the list.
+ *
+ * @param string $row_position The position ('top', 'bottom', etc.)
+ * @param array $cur_list An array with the data for the current list
+ */
+?><?php foreach ($cur_list['additional_rows'][$row_position] as $row): ?>
+			<div class="additional_row<?= empty($row['class']) ? '' : ' ' . $row['class'] ?>"<?= empty($row['style']) ? '' : ' style="' . $row['style'] . '"' ?>>
+				<?= $row['value'] ?>
+			</div><?php endforeach; ?>
diff --git a/Themes/default/templates/GenericList/index.php b/Themes/default/templates/GenericList/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/GenericList/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/GenericList/show_list.php b/Themes/default/templates/GenericList/show_list.php
new file mode 100644
index 00000000000..2b5c5248bad
--- /dev/null
+++ b/Themes/default/templates/GenericList/show_list.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template handles displaying a list
+ *
+ * @param string $list_id The list ID. If null, uses Utils::$context['default_list'].
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['list_id' => null], EXTR_SKIP);
+?><?php
+// Get a shortcut to the current list.
+$list_id = $list_id === null ? (!empty(Utils::$context['default_list']) ? Utils::$context['default_list'] : '') : $list_id;
+?><?php if (empty($list_id) || empty(Utils::$context[$list_id])): ?><?php return; ?><?php endif; ?><?php $cur_list = &Utils::$context[$list_id]; ?><?php if (isset($cur_list['form'])): ?>
+	<form action="<?= $cur_list['form']['href'] ?>" method="post"<?= empty($cur_list['form']['name']) ? '' : ' name="' . $cur_list['form']['name'] . '" id="' . $cur_list['form']['name'] . '"' ?> accept-charset="UTF-8"><?php endif; ?><?php /* Show the title of the table (if any). */ ?><?php if (!empty($cur_list['title'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= $cur_list['title'] ?>
+			</h3>
+		</div><?php endif; ?><?php if (isset($cur_list['additional_rows']['after_title'])): ?>
+		<div class="information flow_hidden"><?php $this->subTemplate('additional_rows', ['row_position' => 'after_title', 'cur_list' => $cur_list]); ?>
+		</div><?php endif; ?><?php if (isset($cur_list['additional_rows']['top_of_list'])): ?><?php $this->subTemplate('additional_rows', ['row_position' => 'top_of_list', 'cur_list' => $cur_list]); ?><?php endif; ?><?php if ((!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) || isset($cur_list['additional_rows']['above_column_headers'])): ?><?php /* Show the page index (if this list doesn't intend to show all items). */ ?><?php if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])): ?>
+		<div class="pagesection floatleft">
+			<div class="pagelinks"><?= $cur_list['page_index'] ?></div>
+		</div><?php endif; ?><?php if (isset($cur_list['additional_rows']['above_column_headers'])): ?><?php $this->subTemplate('additional_rows', ['row_position' => 'above_column_headers', 'cur_list' => $cur_list]); ?><?php endif; ?><?php endif; ?>
+		<table class="table_grid" <?= !empty($list_id) ? 'id="' . $list_id . '"' : '' ?> <?= !empty($cur_list['width']) ? ' style="width:' . $cur_list['width'] . '"' : '' ?>><?php
+// Show the column headers.
+$header_count = count($cur_list['headers']);
+?><?php if (!($header_count < 2 && empty($cur_list['headers'][0]['label']))): ?>
+			<thead>
+				<tr class="title_bar"><?php /* Loop through each column and add a table header. */ ?><?php foreach ($cur_list['headers'] as $col_header): ?>
+					<th scope="col" id="header_<?= $list_id ?>_<?= $col_header['id'] ?>" class="<?= $col_header['id'] ?><?= empty($col_header['class']) ? '' : ' ' . $col_header['class'] ?>"<?= empty($col_header['style']) ? '' : ' style="' . $col_header['style'] . '"' ?><?= empty($col_header['colspan']) ? '' : ' colspan="' . $col_header['colspan'] . '"' ?>>
+						<?= empty($col_header['href']) ? '' : '<a href="' . $col_header['href'] . '" rel="nofollow">' ?><?= empty($col_header['label']) ? '' : $col_header['label'] ?><?= empty($col_header['href']) ? '' : (empty($col_header['sort_image']) ? '</a>' : ' <span class="main_icons sort_' . $col_header['sort_image'] . '"></span></a>') ?>
+					</th><?php endforeach; ?>
+				</tr>
+			</thead><?php endif; ?>
+			<tbody><?php /* Show a nice message informing there are no items in this list. */ ?><?php if (empty($cur_list['rows']) && !empty($cur_list['no_items_label'])): ?>
+				<tr class="windowbg">
+					<td colspan="<?= $cur_list['num_columns'] ?>" class="<?= !empty($cur_list['no_items_align']) ? $cur_list['no_items_align'] : 'centertext' ?>">
+						<?= $cur_list['no_items_label'] ?>
+					</td>
+				</tr><?php /* Show the list rows. */ ?><?php elseif (!empty($cur_list['rows'])): ?><?php foreach ($cur_list['rows'] as $id => $row): ?>
+				<tr class="<?= empty($row['class']) ? 'windowbg' : $row['class'] ?>"<?= empty($row['style']) ? '' : ' style="' . $row['style'] . '"' ?> id="list_<?= $list_id ?>_<?= $id ?>"><?php if (!empty($row['data'])): ?><?php foreach ($row['data'] as $row_id => $row_data): ?>
+					<td class="<?= $row_id ?><?= empty($row_data['class']) ? '' : ' ' . $row_data['class'] . '' ?>"<?= empty($row_data['style']) ? '' : ' style="' . $row_data['style'] . '"' ?>>
+						<?= Utils::adjustHeadingLevels($row_data['value'], 3) ?>
+					</td><?php endforeach; ?><?php endif; ?>
+				</tr><?php endforeach; ?><?php endif; ?>
+			</tbody>
+		</table><?php if ((!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])) || isset($cur_list['additional_rows']['below_table_data'])): ?>
+		<div class="flow_auto"><?php /* Show the page index (if this list doesn't intend to show all items). */ ?><?php if (!empty($cur_list['items_per_page']) && !empty($cur_list['page_index'])): ?>
+			<div class="pagesection floatleft">
+				<div class="pagelinks"><?= $cur_list['page_index'] ?></div>
+			</div><?php endif; ?><?php if (isset($cur_list['additional_rows']['below_table_data'])): ?><?php $this->subTemplate('additional_rows', ['row_position' => 'below_table_data', 'cur_list' => $cur_list]); ?><?php endif; ?>
+		</div><?php endif; ?><?php if (isset($cur_list['additional_rows']['bottom_of_list'])): ?><?php $this->subTemplate('additional_rows', ['row_position' => 'bottom_of_list', 'cur_list' => $cur_list]); ?><?php endif; ?><?php if (isset($cur_list['form'])): ?><?php foreach ($cur_list['form']['hidden_fields'] as $name => $value): ?>
+		<input type="hidden" name="<?= $name ?>" value="<?= $value ?>"><?php endforeach; ?><?php if (isset($cur_list['form']['token'])): ?>
+		<input type="hidden" name="<?= Utils::$context[$cur_list['form']['token'] . '_token_var'] ?>" value="<?= Utils::$context[$cur_list['form']['token'] . '_token'] ?>"><?php endif; ?>
+	</form><?php endif; ?><?php if (isset($cur_list['javascript'])): ?>
+	<script>
+		<?= $cur_list['javascript'] ?>
+
+	</script><?php endif; ?>
diff --git a/Themes/default/templates/GenericMenu/generic_menu.php b/Themes/default/templates/GenericMenu/generic_menu.php
new file mode 100644
index 00000000000..2b613e627de
--- /dev/null
+++ b/Themes/default/templates/GenericMenu/generic_menu.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for displaying a menu
+ *
+ * @param array $menu_context An array of menu information
+ */
+?>
+				<div class="generic_menu">
+					<ul class="dropmenu dropdown_menu_<?= Utils::$context['cur_menu_id'] ?>">
+<?php /* Main areas first. */ ?>
+<?php foreach ($menu_context['sections'] as $section): ?>
+						<li <?= !empty($section['areas']) ? 'class="subsections"' : '' ?>><a class="<?= !empty($section['selected']) ? 'active ' : '' ?>" href="<?= $section['url'] ?><?= $menu_context['extra_parameters'] ?>"><?= $section['title'] ?><?= !empty($section['amt']) ? ' <span class="amt">' . $section['amt'] . '</span>' : '' ?></a>
+							<ul>
+<?php
+// For every area of this section show a link to that area (bold if it's currently selected.)
+// @todo Code for additional_items class was deprecated and has been removed. Suggest following up in Sources if required.
+?>
+<?php foreach ($section['areas'] as $i => $area): ?>
+<?php /* Not supposed to be printed? */ ?>
+<?php if (empty($area['label'])): ?>
+<?php continue; ?>
+<?php endif; ?>
+								<li<?= !empty($area['subsections']) && empty($area['hide_subsections']) ? ' class="subsections"' : '' ?>>
+									<a class="<?= $area['icon_class'] ?><?= !empty($area['selected']) ? ' chosen ' : '' ?>" href="<?= ($area['url'] ?? $menu_context['base_url'] . ';area=' . $i) ?><?= $menu_context['extra_parameters'] ?>"><?= $area['icon'] ?><?= $area['label'] ?><?= !empty($area['amt']) ? ' <span class="amt">' . $area['amt'] . '</span>' : '' ?></a>
+<?php /* Is this the current area, or just some area? */ ?>
+<?php if (!empty($area['selected']) && empty(Utils::$context['tabs'])): ?>
+<?php Utils::$context['tabs'] = $area['subsections'] ?? []; ?>
+<?php endif; ?>
+<?php /* Are there any subsections? */ ?>
+<?php if (!empty($area['subsections']) && empty($area['hide_subsections'])): ?>
+									<ul>
+<?php foreach ($area['subsections'] as $sa => $sub): ?>
+<?php if (!empty($sub['disabled'])): ?>
+<?php continue; ?>
+<?php endif; ?>
+<?php $url = $sub['url'] ?? ($area['url'] ?? $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa; ?>
+										<li>
+											<a <?= !empty($sub['selected']) ? 'class="chosen" ' : '' ?> href="<?= $url ?><?= $menu_context['extra_parameters'] ?>"><?= $sub['label'] ?><?= !empty($sub['amt']) ? ' <span class="amt">' . $sub['amt'] . '</span>' : '' ?></a>
+										</li>
+<?php endforeach; ?>
+									</ul>
+<?php endif; ?>
+								</li>
+<?php endforeach; ?>
+							</ul>
+						</li>
+<?php endforeach; ?>
+					</ul><!-- .dropmenu -->
+				</div><!-- .generic_menu -->
\ No newline at end of file
diff --git a/Themes/default/templates/GenericMenu/generic_menu_dropdown_above.php b/Themes/default/templates/GenericMenu/generic_menu_dropdown_above.php
new file mode 100644
index 00000000000..6c2ec2ecafd
--- /dev/null
+++ b/Themes/default/templates/GenericMenu/generic_menu_dropdown_above.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This contains the HTML for the menu bar at the top of the admin center.
+ */
+?><?php
+// Which menu are we rendering?
+Utils::$context['cur_menu_id'] = isset(Utils::$context['cur_menu_id']) ? Utils::$context['cur_menu_id'] + 1 : 1;
+$menu_context = &Utils::$context['menu_data_' . Utils::$context['cur_menu_id']];
+$menu_label = isset(Utils::$context['admin_menu_name']) ? Lang::getTxt('admin_center', file: 'General') : (isset(Utils::$context['moderation_menu_name']) ? Lang::getTxt('moderation_center', file: 'ModerationCenter') : '');
+// Load the menu
+// Add mobile menu as well
+?>
+	<nav id="genericmenu" aria-label="<?= Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General') ?>">
+		<a class="mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>">
+			<span class="menu_icon"></span>
+			<span class="text_menu"><?= Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General') ?></span>
+		</a>
+		<div id="mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>" class="popup_container">
+			<div class="popup_window description">
+				<div class="popup_heading">
+					<?= Lang::getTxt('mobile_generic_menu', ['label' => $menu_label], file: 'General') ?>
+					<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+				</div>
+				<?php $this->subTemplate('generic_menu', ['menu_context' => $menu_context]); ?>
+			</div>
+		</div>
+	</nav>
+	<script>
+		$( ".mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>" ).click(function() {
+			$( "#mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>" ).show();
+			});
+		$( ".hide_popup" ).click(function() {
+			$( "#mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>" ).hide();
+		});
+	</script><?php /* This is the main table - we need it so we can keep the content to the right of it. */ ?>
+				<div id="admin_content"><?php
+// It's possible that some pages have their own tabs they wanna force...
+// 	if (!empty(Utils::$context['tabs']))
+?><?php $this->subTemplate('generic_menu_tabs', ['menu_context' => $menu_context]); ?>
diff --git a/Themes/default/templates/GenericMenu/generic_menu_dropdown_below.php b/Themes/default/templates/GenericMenu/generic_menu_dropdown_below.php
new file mode 100644
index 00000000000..fd287ab44f7
--- /dev/null
+++ b/Themes/default/templates/GenericMenu/generic_menu_dropdown_below.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Part of the admin layer - used with generic_menu_dropdown_above to close the admin content div.
+ */
+?>
+				</div><!-- #admin_content -->
\ No newline at end of file
diff --git a/Themes/default/templates/GenericMenu/generic_menu_tabs.php b/Themes/default/templates/GenericMenu/generic_menu_tabs.php
new file mode 100644
index 00000000000..a1a25a42190
--- /dev/null
+++ b/Themes/default/templates/GenericMenu/generic_menu_tabs.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The code for displaying the menu
+ *
+ * @param array $menu_context An array of menu context data
+ */
+?><?php
+// Handy shortcut.
+$tab_context = $menu_context['tab_data'];
+?><?php if (!empty($tab_context['title'])): ?>
+					<div class="cat_bar">
+						<h3 class="catbg"><?php /* Exactly how many tabs do we have? */ ?><?php if (!empty(Utils::$context['tabs'])): ?><?php foreach (Utils::$context['tabs'] as $id => $tab): ?><?php /* Can this not be accessed? */ ?><?php if (!empty($tab['disabled'])): ?><?php
+$tab_context['tabs'][$id]['disabled'] = true;
+continue;
+?><?php endif; ?><?php /* Did this not even exist - or do we not have a label? */ ?><?php if (!isset($tab_context['tabs'][$id])): ?><?php $tab_context['tabs'][$id] = ['label' => $tab['label']]; ?><?php elseif (!isset($tab_context['tabs'][$id]['label'])): ?><?php $tab_context['tabs'][$id]['label'] = $tab['label']; ?><?php endif; ?><?php /* Has a custom URL defined in the main admin structure? */ ?><?php if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])): ?><?php $tab_context['tabs'][$id]['url'] = $tab['url']; ?><?php endif; ?><?php /* Any additional parameters for the url? */ ?><?php if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])): ?><?php $tab_context['tabs'][$id]['add_params'] = $tab['add_params']; ?><?php endif; ?><?php /* Has it been deemed selected? */ ?><?php if (!empty($tab['is_selected'])): ?><?php $tab_context['tabs'][$id]['is_selected'] = true; ?><?php endif; ?><?php /* Does it have its own help? */ ?><?php if (!empty($tab['help'])): ?><?php $tab_context['tabs'][$id]['help'] = $tab['help']; ?><?php endif; ?><?php /* Is this the last one? */ ?><?php if (!empty($tab['is_last']) && !isset($tab_context['override_last'])): ?><?php $tab_context['tabs'][$id]['is_last'] = true; ?><?php endif; ?><?php endforeach; ?><?php /* Find the selected tab */ ?><?php foreach ($tab_context['tabs'] as $sa => $tab): ?><?php if (!empty($tab['is_selected']) || (isset($menu_context['current_subsection']) && $menu_context['current_subsection'] == $sa)): ?><?php
+$selected_tab = $tab;
+$tab_context['tabs'][$sa]['is_selected'] = true;
+?><?php endif; ?><?php endforeach; ?><?php endif; ?><?php /* Show an icon and/or a help item? */ ?><?php if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']) || !empty($selected_tab['icon']) || !empty($tab_context['icon']) || !empty($selected_tab['help']) || !empty($tab_context['help'])): ?><?php if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])): ?>
+								<span class="<?= !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'] ?> icon"></span><?php elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])): ?>
+								<img src="<?= Theme::$current->settings['images_url'] ?>/icons/<?= !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'] ?>" alt="" class="icon"><?php endif; ?><?php if (!empty($selected_tab['help']) || !empty($tab_context['help'])): ?>
+								<a href="<?= Config::$scripturl ?>?action=helpadmin;help=<?= !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'] ?>" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a><?php endif; ?><?= $tab_context['title'] ?><?php else: ?>
+								<?= $tab_context['title'] ?><?php endif; ?>
+						</h3><?php
+// The function is in Admin.template.php, but since this template is used
+// elsewhere too better check if the function is available. It goes after
+// the heading: .cat_bar is a flex row, so the search box lands at the end
+// of it by being last, not by floating.
+?><?php if ($this->hasSubTemplate('admin_quick_search')): ?><?php $this->subTemplate('admin_quick_search'); ?><?php endif; ?>
+					</div><!-- .cat_bar --><?php endif; ?><?php /* Shall we use the tabs? Yes, it's the only known way! */ ?><?php if (!empty($selected_tab['description']) || !empty($tab_context['description'])): ?>
+					<p class="information">
+						<?= !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'] ?>
+					</p><?php endif; ?><?php /* Print out all the items in this tab (if any). */ ?><?php
+// What gets drawn below is $tab_context['tabs'], and that is only assembled
+// above when this menu has a title of its own. Utils::$context['tabs'] is
+// set as a side effect of drawing the menu, so it can be full while this
+// one is still empty, which produced an empty menu on those pages.
+// Labels arrive from the loop above, and it only runs over the areas the
+// menu itself knows about, so a page that forces tabs of its own can leave
+// some without one. Those cannot be drawn, so they do not count towards
+// having anything to draw either. Same treatment the areas above get.
+$drawable_tabs = array_filter(
+	$tab_context['tabs'] ?? [],
+	fn($tab) => empty($tab['disabled']) && !empty($tab['label']),
+);
+?><?php if (!empty($drawable_tabs)): ?><?php /* The admin tabs. */ ?>
+					<a class="mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs">
+						<span class="menu_icon"></span>
+						<span class="text_menu"><?= Lang::getTxt('mobile_generic_menu', ['label' => $tab_context['title'] ?? ''], file: 'General') ?></span>
+					</a>
+					<div id="adm_submenus">
+						<div id="mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs" class="popup_container">
+							<div class="popup_window description">
+								<div class="popup_heading">
+									<?= Lang::getTxt('mobile_generic_menu', ['label' => $tab_context['title'] ?? ''], file: 'General') ?>
+									<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+								</div>
+								<div class="generic_menu">
+									<ul class="dropmenu dropdown_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs"><?php foreach ($drawable_tabs as $sa => $tab): ?><?php if (!empty($tab['is_selected'])): ?>
+										<li>
+											<a class="active" href="<?= $tab['url'] ?? $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa ?><?= $menu_context['extra_parameters'] ?><?= $tab['add_params'] ?? '' ?>"><?= $tab['label'] ?></a>
+										</li><?php else: ?>
+										<li>
+											<a href="<?= $tab['url'] ?? $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa ?><?= $menu_context['extra_parameters'] ?><?= $tab['add_params'] ?? '' ?>"><?= $tab['label'] ?></a>
+										</li><?php endif; ?><?php endforeach; ?><?php /* The end of tabs */ ?>
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div><!-- #adm_submenus -->
+					<script>
+						$( ".mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs" ).click(function() {
+							$( "#mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs" ).show();
+							});
+						$( ".hide_popup" ).click(function() {
+							$( "#mobile_generic_menu_<?= Utils::$context['cur_menu_id'] ?>_tabs" ).hide();
+						});
+					</script><?php endif; ?>
diff --git a/Themes/default/templates/GenericMenu/index.php b/Themes/default/templates/GenericMenu/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/GenericMenu/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Help/index.php b/Themes/default/templates/Help/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Help/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Help/manual.php b/Themes/default/templates/Help/manual.php
new file mode 100644
index 00000000000..7cbd00371e2
--- /dev/null
+++ b/Themes/default/templates/Help/manual.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main help page
+ */
+?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('manual_smf_user_help', file: 'Manual') ?></h3>
+			</div>
+			<div id="help_container">
+				<div id="helpmain" class="windowbg">
+					<p><?= Lang::getTxt('manual_welcome', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'Manual') ?></p>
+					<p><?= Lang::getTxt('manual_introduction', file: 'Manual') ?></p>
+					<ul>
+<?php foreach (Utils::$context['manual_sections'] as $section_id => $wiki_id): ?>
+						<li><a href="<?= Utils::$context['wiki_url'] ?>/<?= Utils::$context['wiki_prefix'] ?><?= $wiki_id ?><?= (Lang::getTxt('lang_dictionary', file: 'General') != 'en' ? '/' . Lang::getTxt('lang_dictionary', file: 'General') : '') ?>" target="_blank" rel="noopener"><?= Lang::getTxt('manual_section_' . $section_id . '_title', file: 'Manual') ?></a> - <?= Lang::getTxt('manual_section_' . $section_id . '_desc', file: 'Manual') ?></li>
+<?php endforeach; ?>
+					</ul>
+					<p><?= Lang::getTxt('manual_docs_and_credits', ['wiki_url' => Utils::$context['wiki_url'], 'credits_url' => Config::$scripturl . '?action=credits'], file: 'Manual') ?></p>
+				</div><!-- #helpmain -->
+			</div><!-- #help_container -->
\ No newline at end of file
diff --git a/Themes/default/templates/Help/popup.php b/Themes/default/templates/Help/popup.php
new file mode 100644
index 00000000000..f73f25a5e3b
--- /dev/null
+++ b/Themes/default/templates/Help/popup.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This displays a help popup thingy
+ */
+?><?php
+// reqOverlayDiv() asks for this with ';ajax' on the end and shows whatever
+// comes back inside an overlay on the page it was called from. There is no
+// window to close in that case, and no use for a document of its own.
+?><?php if (isset($_REQUEST['ajax'])): ?>
+		<div class="windowbg description">
+			<?= Utils::$context['help_text'] ?>
+		</div><?php return; ?><?php endif; ?><?php /* Otherwise this really is a window of its own, so it needs the html. */ ?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="robots" content="noindex">
+		<title><?= Utils::$context['page_title'] ?></title>
+		<?= Theme::template_css() ?>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/script.js<?= Utils::$context['browser_cache'] ?>"></script>
+	</head>
+	<body id="help_popup">
+		<div class="windowbg description">
+			<?= Utils::$context['help_text'] ?><br>
+			<br>
+			<a href="javascript:self.close();"><?= Lang::getTxt('close_window', file: 'Help') ?></a>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Likes/generic.php b/Themes/default/templates/Likes/generic.php
new file mode 100644
index 00000000000..bd5caa1b060
--- /dev/null
+++ b/Themes/default/templates/Likes/generic.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A generic template that outputs any data passed to it...
+ */
+?><?= Utils::$context['data'] ?>
diff --git a/Themes/default/templates/Likes/index.php b/Themes/default/templates/Likes/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Likes/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Likes/like.php b/Themes/default/templates/Likes/like.php
new file mode 100644
index 00000000000..ace1745fee4
--- /dev/null
+++ b/Themes/default/templates/Likes/like.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Display a like button and info about how many people liked something
+ */
+?>
+	<ul class="floatleft">
+<?php if (!empty(Utils::$context['data']['can_like'])): ?>
+		<li class="smflikebutton" id="<?= Utils::$context['data']['type'] ?>_<?= Utils::$context['data']['id_content'] ?>_likes">
+			<a href="<?= Config::$scripturl ?>?action=likes;ltype=<?= Utils::$context['data']['type'] ?>;sa=like;like=<?= Utils::$context['data']['id_content'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="<?= Utils::$context['data']['type'] ?>_like"><span class="main_icons <?= Utils::$context['data']['already_liked'] ? 'unlike' : 'like' ?>"></span> <?= Lang::getTxt(Utils::$context['data']['already_liked'] ? 'unlike' : 'like', file: 'General') ?></a>
+		</li>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['data']['count'])): ?>
+<?php
+Utils::$context['some_likes'] = true;
+$count = Utils::$context['data']['count'];
+$base = 'likes_count';
+?>
+<?php if (Utils::$context['data']['already_liked']): ?>
+<?php
+$base = 'you_' . $base;
+$count--;
+?>
+<?php endif; ?>
+		<li class="like_count smalltext"><?= Lang::getTxt($base, ['url' => Config::$scripturl . '?action=likes;sa=view;ltype=' . Utils::$context['data']['type'] . ';js=1;like=' . Utils::$context['data']['id_content'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'num' => $count], file: 'General') ?></li>
+<?php endif; ?>
+	</ul>
\ No newline at end of file
diff --git a/Themes/default/templates/Likes/popup.php b/Themes/default/templates/Likes/popup.php
new file mode 100644
index 00000000000..87631cbff9b
--- /dev/null
+++ b/Themes/default/templates/Likes/popup.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This shows the popup that shows who likes a particular post.
+ */
+?><?php /* Since this is a popup of its own we need to start the html, etc. */ ?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="robots" content="noindex">
+		<title><?= Utils::$context['page_title'] ?></title>
+		<?= Theme::template_css() ?>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/script.js<?= Utils::$context['browser_cache'] ?>"></script>
+	</head>
+	<body id="likes_popup">
+		<div class="windowbg">
+			<ul id="likes"><?php foreach (Utils::$context['likers'] as $liker => $like_details): ?>
+				<li>
+					<?= $like_details['profile']['avatar']['image'] ?>
+					<span class="like_profile">
+						<?= $like_details['profile']['link_color'] ?>
+						<span class="description"><?= $like_details['profile']['group'] ?></span>
+					</span>
+					<span class="floatright like_time"><?= $like_details['time'] ?></span>
+				</li><?php endforeach; ?>
+			</ul>
+			<br class="clear">
+			<a href="javascript:self.close();"><?= Lang::getTxt('close_window', file: 'Help') ?></a>
+		</div><!-- .windowbg -->
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/admin_login.php b/Themes/default/templates/Login/admin_login.php
new file mode 100644
index 00000000000..27f8c75c109
--- /dev/null
+++ b/Themes/default/templates/Login/admin_login.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is for the security stuff - makes administrators login every so often.
+ */
+?><?php /* Since this should redirect to whatever they were doing, send all the get data. */ ?>
+	<form action="<?= !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl ?><?= Utils::$context['get_data'] ?>" method="post" accept-charset="UTF-8" name="frmLogin" id="frmLogin">
+		<div class="login" id="admin_login">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="main_icons login"></span> <?= Lang::getTxt('login', file: 'General') ?>
+				</h3>
+			</div>
+			<div class="roundframe centertext"><?php if (!empty(Utils::$context['incorrect_password'])): ?>
+				<div class="error"><?= Lang::getTxt('admin_incorrect_password', file: 'Admin') ?></div><?php endif; ?>
+				<strong><?= Lang::getTxt('password', file: 'General') ?></strong>
+				<input type="password" name="<?= Utils::$context['sessionCheckType'] ?>_pass" size="24">
+				<a href="<?= Config::$scripturl ?>?action=helpadmin;help=securityDisable_why" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a><br>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-login_token_var'] ?>" value="<?= Utils::$context['admin-login_token'] ?>">
+				<input type="submit" value="<?= Lang::getTxt('login', file: 'General') ?>" class="button"><?php /* Make sure to output all the old post data. */ ?><?= Utils::$context['post_data'] ?>
+			</div><!-- .roundframe -->
+		</div><!-- #admin_login -->
+		<input type="hidden" name="<?= Utils::$context['sessionCheckType'] ?>_hash_pass" value="">
+	</form><?php /* Focus on the password box. */ ?>
+	<script>
+		document.forms.frmLogin.<?= Utils::$context['sessionCheckType'] ?>_pass.focus();
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/index.php b/Themes/default/templates/Login/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Login/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Login/kick_guest.php b/Themes/default/templates/Login/kick_guest.php
new file mode 100644
index 00000000000..ad50f77d878
--- /dev/null
+++ b/Themes/default/templates/Login/kick_guest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Tell a guest to get lost or login!
+ */
+?><?php /* This isn't that much... just like normal login but with a message at the top. */ ?>
+	<form action="<?= Utils::$context['login_url'] ?>" method="post" accept-charset="UTF-8" name="frmLogin" id="frmLogin">
+		<div class="login">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('warning', file: 'Login') ?></h3>
+			</div><?php /* Show the message or default message. */ ?>
+			<p class="information centertext">
+				<?= empty(Utils::$context['kick_message']) ? Lang::getTxt('only_members_can_access', file: 'Login') : Utils::$context['kick_message'] ?><br><?php if (Utils::$context['can_register']): ?><?= Lang::getTxt('login_below_or_register', ['url' => Config::$scripturl . '?action=signup', 'forum_name' => Utils::$context['forum_name_html_safe']], file: 'Login') ?><?php else: ?><?= Lang::getTxt('login_below', file: 'Login') ?><?php endif; ?><?php /* And now the login information. */ ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="main_icons login"></span> <?= Lang::getTxt('login', file: 'General') ?>
+				</h3>
+			</div>
+			<div class="roundframe">
+				<dl>
+					<dt><?= Lang::getTxt('username', file: 'General') ?></dt>
+					<dd><input type="text" name="user" size="20"></dd>
+					<dt><?= Lang::getTxt('password', file: 'General') ?></dt>
+					<dd><input type="password" name="passwrd" size="20"></dd>
+					<dt></dt>
+					<dd>
+						<label>
+							<input type="checkbox" name="cookieneverexp"<?= !empty(Utils::$context['never_expire']) ? ' checked' : '' ?>>
+							<?= Lang::getTxt('remember_me', file: 'General') ?>
+						</label>
+					</dd>
+				</dl>
+				<p class="centertext">
+					<input type="submit" value="<?= Lang::getTxt('login', file: 'General') ?>" class="button">
+				</p>
+				<p class="centertext smalltext">
+					<a href="<?= Config::$scripturl ?>?action=reminder"><?= Lang::getTxt('forgot_your_password', file: 'General') ?></a>
+				</p>
+			</div>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['login_token_var'] ?>" value="<?= Utils::$context['login_token'] ?>">
+		</div><!-- .login -->
+	</form><?php /* Do the focus thing... */ ?>
+	<script>
+		document.forms.frmLogin.user.focus();
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/login.php b/Themes/default/templates/Login/login.php
new file mode 100644
index 00000000000..4d92257e718
--- /dev/null
+++ b/Themes/default/templates/Login/login.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is just the basic "login" form.
+ */
+?>
+		<div class="login">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="main_icons login"></span> <?= Lang::getTxt('login', file: 'General') ?>
+				</h3>
+			</div>
+			<div class="roundframe">
+				<form class="login" action="<?= Utils::$context['login_url'] ?>" name="frmLogin" id="frmLogin" method="post" accept-charset="UTF-8"<?php
+// A plain submit is enough when the response is going to come back to the
+// page it was sent from. Anywhere else, login.js has to take the form over,
+// and this attribute is how it knows to.
+?><?php if (!empty(Utils::$context['from_ajax']) && (empty(Config::$modSettings['allow_cors']) || empty(Config::$modSettings['allow_cors_credentials']) || empty(Utils::$context['valid_cors_found']) || !in_array(Utils::$context['valid_cors_found'], ['same', 'subdomain']))): ?> data-ajax-login="<?= Utils::$context['valid_cors_found'] ?? '' ?>"<?php endif; ?>><?php /* Did they make a mistake last time? */ ?><?php if (!empty(Utils::$context['login_errors'])): ?>
+					<div class="errorbox"><?= implode('<br>', Utils::$context['login_errors']) ?></div>
+					<br><?php endif; ?><?php /* Or perhaps there's some special description for this time? */ ?><?php if (isset(Utils::$context['description'])): ?>
+					<div class="information"><?= Utils::$context['description'] ?></div><?php endif; ?><?php /* Now just get the basic information - username, password, etc. */ ?>
+					<dl>
+						<dt><?= Lang::getTxt('username', file: 'General') ?></dt>
+						<dd>
+							<input type="text" id="<?= !empty(Utils::$context['from_ajax']) ? 'ajax_' : '' ?>loginuser" name="user" size="20" value="<?= Utils::$context['default_username'] ?>" required>
+						</dd>
+						<dt><?= Lang::getTxt('password', file: 'General') ?></dt>
+						<dd>
+							<input type="password" id="<?= !empty(Utils::$context['from_ajax']) ? 'ajax_' : '' ?>loginpass" name="passwrd" value="<?= Utils::$context['default_password'] ?>" size="20" required>
+						</dd>
+					</dl>
+					<dl>
+						<dt></dt>
+						<dd>
+							<label>
+								<input type="checkbox" name="cookieneverexp"<?= !empty(Utils::$context['never_expire']) ? ' checked' : '' ?>>
+								<?= Lang::getTxt('remember_me', file: 'General') ?>
+							</label>
+						</dd><?php /* If they have deleted their account, give them a chance to change their mind. */ ?><?php if (isset(Utils::$context['login_show_undelete'])): ?>
+						<dt class="alert"><?= Lang::getTxt('undelete_account', file: 'Login') ?></dt>
+						<dd><input type="checkbox" name="undelete"></dd><?php endif; ?>
+					</dl>
+					<p>
+						<input type="submit" value="<?= Lang::getTxt('login', file: 'General') ?>" class="button">
+					</p>
+					<p class="smalltext">
+						<a href="<?= Config::$scripturl ?>?action=reminder"><?= Lang::getTxt('forgot_your_password', file: 'General') ?></a>
+					</p><?php if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1): ?>
+					<p class="smalltext">
+						<?= Lang::getTxt('welcome_guest_activate', ['scripturl' => Config::$scripturl], file: 'General') ?>
+					</p><?php endif; ?>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['login_token_var'] ?>" value="<?= Utils::$context['login_token'] ?>">
+					<script>
+						setTimeout(function() {
+							document.getElementById("<?= !empty(Utils::$context['from_ajax']) ? 'ajax_' : '' ?><?= isset(Utils::$context['default_username']) && Utils::$context['default_username'] != '' ? 'loginpass' : 'loginuser' ?>").focus();
+						}, 150);
+					</script>
+				</form><?php if (!empty(Utils::$context['can_register'])): ?>
+				<hr>
+				<div class="centertext">
+					<?= Lang::getTxt('register_prompt', ['scripturl' => Config::$scripturl], file: 'General') ?>
+				</div><?php endif; ?><?php /* It is a long story as to why we have this when we're clearly not going to use it. */ ?><?php if (!empty(Utils::$context['from_ajax'])): ?>
+				<br>
+				<a href="javascript:self.close();"></a><?php endif; ?>
+			</div><!-- .roundframe -->
+		</div><!-- .login -->
\ No newline at end of file
diff --git a/Themes/default/templates/Login/login_tfa.php b/Themes/default/templates/Login/login_tfa.php
new file mode 100644
index 00000000000..9c4b0dbee6a
--- /dev/null
+++ b/Themes/default/templates/Login/login_tfa.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * TFA authentication form
+ */
+?>
+		<div class="login">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('tfa_profile_label', file: 'Profile') ?>
+				</h3>
+			</div>
+			<div class="roundframe">
+<?php if (!empty(Utils::$context['tfa_error']) || !empty(Utils::$context['tfa_backup_error'])): ?>
+				<div class="error">
+					<?= Lang::getTxt('tfa_' . (!empty(Utils::$context['tfa_error']) ? 'code_' : 'backup_') . 'invalid', file: 'Profile') ?>
+				</div>
+<?php endif; ?>
+				<form action="<?= Utils::$context['tfa_url'] ?>" method="post" id="frmTfa">
+					<div id="tfaCode">
+						<p style="margin-bottom: 0.5em"><?= Lang::getTxt('tfa_login_desc', file: 'Profile') ?></p>
+						<div class="centertext">
+							<strong><?= Lang::getTxt('tfa_code', file: 'Profile') ?></strong>
+							<input type="text" name="tfa_code" value="<?= !empty(Utils::$context['tfa_value']) ? Utils::$context['tfa_value'] : '' ?>">
+							<input type="submit" class="button" name="submit" value="<?= Lang::getTxt('login', file: 'General') ?>">
+						</div>
+						<hr>
+						<div class="centertext">
+							<input type="button" class="button" name="backup" value="<?= Lang::getTxt('tfa_backup', file: 'Profile') ?>">
+						</div>
+					</div>
+					<div id="tfaBackup" style="display: none;">
+						<p style="margin-bottom: 0.5em"><?= Lang::getTxt('tfa_backup_desc', file: 'Profile') ?></p>
+						<div class="centertext">
+							<strong><?= Lang::getTxt('tfa_backup_code', file: 'Profile') ?></strong>
+							<input type="text" name="tfa_backup" value="<?= !empty(Utils::$context['tfa_backup']) ? Utils::$context['tfa_backup'] : '' ?>">
+							<input type="submit" class="button" name="submit" value="<?= Lang::getTxt('login', file: 'General') ?>">
+						</div>
+					</div>
+				</form>
+				<script>
+					form = $("#frmTfa");
+<?php if (!empty(Utils::$context['from_ajax'])): ?>
+					form.submit(function(e) {
+						// If we are submitting backup code, let normal workflow follow since it redirects a couple times into a different page
+						if (form.find("input[name=tfa_backup]:first").val().length > 0)
+							return true;
+
+						e.preventDefault();
+						e.stopPropagation();
+
+						$.ajax({
+							url: form.prop("action") + (form.prop("action").indexOf("?") !== -1 ? ";" : "?") + "ajax",
+							method: "POST",
+							headers: {
+								"X-SMF-AJAX": 1
+							},
+							xhrFields: {
+								withCredentials: typeof allow_xhjr_credentials !== "undefined" ? allow_xhjr_credentials : false
+							},
+							data: form.serialize(),
+							success: function(data) {
+								if (data.indexOf("<bo" + "dy") > -1) {
+<?php if (empty(Utils::$context['valid_cors_found']) || Utils::$context['valid_cors_found'] == 'same'): ?>
+									document.location = <?= Utils::escapeJavaScript(!empty($_SESSION['login_url']) ? $_SESSION['login_url'] : Config::$scripturl) ?>;
+<?php else: ?>
+									window.location.reload();
+<?php endif; ?>
+								}
+								else {
+									window.location.reload();
+								}
+							},
+							error: function(xhr) {
+								var data = xhr.responseText;
+								if (data.indexOf("<bo" + "dy") > -1) {
+									document.open();
+									document.write(data);
+									document.close();
+								}
+								else
+									form.parent().html($(data).filter("#fatal_error").html());
+							}
+						});
+
+						return false;
+					});
+<?php endif; ?>
+					form.find("input[name=backup]").click(function(e) {
+						$("#tfaBackup").show();
+						$("#tfaCode").hide();
+					});
+				</script>
+			</div><!-- .roundframe -->
+		</div><!-- .login -->
\ No newline at end of file
diff --git a/Themes/default/templates/Login/logout.php b/Themes/default/templates/Login/logout.php
new file mode 100644
index 00000000000..db491db3843
--- /dev/null
+++ b/Themes/default/templates/Login/logout.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Confirm a logout.
+ */
+?>
+
+<?php /* This isn't that much... just like normal login but with a message at the top. */ ?>
+	<form action="<?= Config::$scripturl ?>?action=logout;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8" name="frmLogout" id="frmLogout">
+		<div class="logout">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('logout_confirm', file: 'Login') ?></h3>
+			</div>
+			<div class="roundframe">
+				<p class="information centertext">
+					<?= Lang::getTxt('logout_notice', file: 'Login') ?>
+				</p>
+
+				<p class="centertext">
+					<input type="submit" value="<?= Lang::getTxt('logout', file: 'General') ?>" class="button">
+					<input type="submit" name="cancel" value="<?= Lang::getTxt('logout_return', file: 'Login') ?>" class="button">
+				</p>
+			</div>
+		</div><!-- .logout -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/maintenance.php b/Themes/default/templates/Login/maintenance.php
new file mode 100644
index 00000000000..2d5aaa53205
--- /dev/null
+++ b/Themes/default/templates/Login/maintenance.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is for maintenance mode.
+ */
+?>
+
+<?php /* Display the administrator's message at the top. */ ?>
+	<form action="<?= Utils::$context['login_url'] ?>" method="post" accept-charset="UTF-8">
+		<div class="login" id="maintenance_mode">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['title'] ?></h3>
+			</div>
+			<div class="information">
+				<img class="floatleft" src="<?= Theme::$current->settings['images_url'] ?>/construction.png" width="40" height="40" alt="<?= Lang::getTxt('in_maintain_mode', file: 'Login') ?>">
+				<?= Utils::$context['description'] ?><br class="clear">
+			</div>
+			<div class="title_bar">
+				<h4 class="titlebg"><?= Lang::getTxt('admin_login', file: 'General') ?></h4>
+			</div>
+			<div class="roundframe">
+				<dl>
+					<dt><?= Lang::getTxt('username', file: 'General') ?></dt>
+					<dd><input type="text" name="user" size="20"></dd>
+					<dt><?= Lang::getTxt('password', file: 'General') ?></dt>
+					<dd><input type="password" name="passwrd" size="20"></dd>
+					<dt></dt>
+					<dd>
+						<label>
+							<input type="checkbox" name="cookieneverexp"<?= !empty(Utils::$context['never_expire']) ? ' checked' : '' ?>>
+							<?= Lang::getTxt('remember_me', file: 'General') ?>
+						</label>
+					</dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('login', file: 'General') ?>" class="button">
+				<br class="clear">
+			</div>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['login_token_var'] ?>" value="<?= Utils::$context['login_token'] ?>">
+		</div><!-- #maintenance_mode -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/resend.php b/Themes/default/templates/Login/resend.php
new file mode 100644
index 00000000000..a564a57b60c
--- /dev/null
+++ b/Themes/default/templates/Login/resend.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for resending the activation code.
+ */
+?>
+
+<?php /* Just ask them for their code so they can try it again... */ ?>
+		<form action="<?= Config::$scripturl ?>?action=activate;sa=resend" method="post" accept-charset="UTF-8">
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="roundframe">
+				<dl>
+					<dt><?= Lang::getTxt('invalid_activation_username', file: 'Login') ?></dt>
+					<dd><input type="text" name="user" size="40" value="<?= Utils::$context['default_username'] ?>"></dd>
+				</dl>
+				<p><?= Lang::getTxt('invalid_activation_new', file: 'Login') ?></p>
+				<dl>
+					<dt><?= Lang::getTxt('invalid_activation_new_email', file: 'Login') ?></dt>
+					<dd><input type="text" name="new_email" size="40"></dd>
+					<dt><?= Lang::getTxt('invalid_activation_password', file: 'Login') ?></dt>
+					<dd><input type="password" name="passwd" size="30"></dd>
+				</dl>
+<?php if (Utils::$context['can_activate']): ?>
+				<p><?= Lang::getTxt('invalid_activation_known', file: 'Login') ?></p>
+				<dl>
+					<dt><?= Lang::getTxt('invalid_activation_retry', file: 'Login') ?></dt>
+					<dd><input type="text" name="code" size="30"></dd>
+				</dl>
+<?php endif; ?>
+				<p><input type="submit" value="<?= Lang::getTxt('invalid_activation_resend', file: 'Login') ?>" class="button"></p>
+			</div><!-- .roundframe -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Login/retry_activate.php b/Themes/default/templates/Login/retry_activate.php
new file mode 100644
index 00000000000..dbbba1a5a74
--- /dev/null
+++ b/Themes/default/templates/Login/retry_activate.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Activate your account manually?
+ */
+?>
+
+<?php /* Just ask them for their code so they can try it again... */ ?>
+		<form action="<?= Config::$scripturl ?>?action=activate;u=<?= Utils::$context['member_id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="roundframe">
+				<dl>
+<?php /* You didn't even have an ID? */ ?>
+<?php if (empty(Utils::$context['member_id'])): ?>
+					<dt><?= Lang::getTxt('invalid_activation_username', file: 'Login') ?></dt>
+					<dd><input type="text" name="user" size="30"></dd>
+<?php endif; ?>
+					<dt><?= Lang::getTxt('invalid_activation_retry', file: 'Login') ?></dt>
+					<dd><input type="text" name="code" size="30"></dd>
+				</dl>
+				<p><input type="submit" value="<?= Lang::getTxt('invalid_activation_submit', file: 'Login') ?>" class="button"></p>
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageAttachments/attachment_paths.php b/Themes/default/templates/ManageAttachments/attachment_paths.php
new file mode 100644
index 00000000000..cee93cc297a
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/attachment_paths.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page that handles managing attachment paths.
+ */
+?><?php if (!empty(Config::$modSettings['attachment_basedirectories'])): ?><?php $this->subTemplate('show_list', ['list_id' => 'base_paths']); ?><?php endif; ?><?php $this->subTemplate('show_list', ['list_id' => 'attach_paths']); ?>
diff --git a/Themes/default/templates/ManageAttachments/attachment_repair.php b/Themes/default/templates/ManageAttachments/attachment_repair.php
new file mode 100644
index 00000000000..fc592cdf173
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/attachment_repair.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The file repair page
+ */
+?><?php /* If we've completed just let them know! */ ?><?php if (Utils::$context['completed']): ?>
+	<div id="manage_attachments">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('repair_attachments_complete', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= Lang::getTxt('repair_attachments_complete_desc', file: 'Admin') ?>
+		</div>
+	</div><?php /* What about if no errors were even found? */ ?><?php elseif (!Utils::$context['errors_found']): ?>
+	<div id="manage_attachments">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('repair_attachments_complete', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= Lang::getTxt('repair_attachments_no_errors', file: 'Admin') ?>
+		</div>
+	</div><?php /* Otherwise, I'm sad to say, we have a problem! */ ?><?php else: ?>
+	<div id="manage_attachments">
+		<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('repair_attachments', file: 'Admin') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Lang::getTxt('repair_attachments_error_desc', file: 'Admin') ?></p><?php /* Loop through each error reporting the status */ ?><?php foreach (Utils::$context['repair_errors'] as $error => $number): ?><?php if (!empty($number)): ?>
+				<input type="checkbox" name="to_fix[]" id="<?= $error ?>" value="<?= $error ?>">
+				<label for="<?= $error ?>"><?= Lang::getTxt('attach_repair_' . $error, [$number], file: 'Admin') ?></label><br><?php endif; ?><?php endforeach; ?>
+				<br>
+				<input type="submit" value="<?= Lang::getTxt('repair_attachments_continue', file: 'Admin') ?>" class="button">
+				<input type="submit" name="cancel" value="<?= Lang::getTxt('repair_attachments_cancel', file: 'Admin') ?>" class="button">
+			</div>
+		</form>
+	</div><!-- #manage_attachments --><?php endif; ?>
diff --git a/Themes/default/templates/ManageAttachments/avatar_settings_above.php b/Themes/default/templates/ManageAttachments/avatar_settings_above.php
new file mode 100644
index 00000000000..c576a5aab3a
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/avatar_settings_above.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template wraps around the simple settings page to add javascript functionality.
+ */
diff --git a/Themes/default/templates/ManageAttachments/avatar_settings_below.php b/Themes/default/templates/ManageAttachments/avatar_settings_below.php
new file mode 100644
index 00000000000..958537ea7c3
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/avatar_settings_below.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * JavaScript to be output below the simple settings page
+ */
+?>
+	<script>
+		var fUpdateStatus = function ()
+		{
+			document.getElementById("avatar_max_width_external").disabled = document.getElementById("avatar_download_external").checked;
+			document.getElementById("avatar_max_height_external").disabled = document.getElementById("avatar_download_external").checked;
+			document.getElementById("avatar_action_too_large").disabled = document.getElementById("avatar_download_external").checked;
+		}
+		addLoadEvent(fUpdateStatus);
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageAttachments/index.php b/Themes/default/templates/ManageAttachments/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageAttachments/maintenance.php b/Themes/default/templates/ManageAttachments/maintenance.php
new file mode 100644
index 00000000000..8438c28524c
--- /dev/null
+++ b/Themes/default/templates/ManageAttachments/maintenance.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The attachment maintenance page
+ */
+?>
+	<div id="manage_attachments">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('attachment_stats', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt><strong><?= Lang::getTxt('attachment_total', file: 'Admin') ?></strong></dt>
+				<dd><?= Utils::$context['num_attachments'] ?></dd>
+				<dt><strong><?= Lang::getTxt('attachment_manager_total_avatars', file: 'Admin') ?></strong></dt>
+				<dd><?= Utils::$context['num_avatars'] ?></dd>
+				<dt><strong><?= Lang::getTxt('attachmentdir_size', file: 'Admin') ?></strong></dt>
+				<dd><?= Lang::getTxt('size_kilobyte', [Utils::$context['attachment_total_size']], file: 'General') ?></dd>
+				<dt><strong><?= Lang::getTxt('attach_current_dir', file: 'Admin') ?></strong></dt>
+				<dd class="word_break"><?= Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']] ?></dd>
+				<dt><strong><?= Lang::getTxt('attachmentdir_size_current', file: 'Admin') ?></strong></dt>
+				<dd><?= Lang::getTxt('size_kilobyte', [Utils::$context['attachment_current_size']], file: 'General') ?></dd>
+				<dt><strong><?= Lang::getTxt('attachment_space', file: 'Admin') ?></strong></dt>
+				<dd><?= isset(Utils::$context['attachment_space']) ? Lang::getTxt('size_kilobyte', [Utils::$context['attachment_space']], file: 'General') : Lang::getTxt('attachmentdir_size_not_set', file: 'Admin') ?></dd>
+				<dt><strong><?= Lang::getTxt('attachmentdir_files_current', file: 'Admin') ?></strong></dt>
+				<dd><?= Utils::$context['attachment_current_files'] ?></dd>
+				<dt><strong><?= Lang::getTxt('attachment_files', file: 'Admin') ?></strong></dt>
+				<dd><?= Utils::$context['attachment_files'] ?? Lang::getTxt('attachmentdir_files_not_set', file: 'Admin') ?></dd>
+			</dl>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('attachment_integrity_check', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=manageattachments;sa=repair;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+				<p><?= Lang::getTxt('attachment_integrity_check_desc', file: 'Admin') ?></p>
+				<input type="submit" name="repair" value="<?= Lang::getTxt('attachment_check_now', file: 'Admin') ?>" class="button">
+			</form>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('attachment_pruning', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm('<?= Lang::getTxt('attachment_pruning_warning', file: 'Admin') ?>');">
+				<dl class="settings">
+					<dt><?= Lang::getTxt('attachment_remove_old', file: 'Admin') ?></dt>
+					<dd><input type="number" name="age" value="25" size="4"> <?= str_replace('25', '', Lang::getTxt('number_of_days', [25], file: 'General')) ?></dd>
+					<dt><?= Lang::getTxt('attachment_pruning_message', file: 'Admin') ?></dt>
+					<dd><input type="text" name="notice" value="<?= Lang::getTxt('attachment_delete_admin', file: 'Admin') ?>" size="40"></dd>
+					<input type="submit" name="remove" value="<?= Lang::getTxt('remove', file: 'General') ?>" class="button">
+					<input type="hidden" name="type" value="attachments">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="sa" value="byage">
+				</dl>
+			</form>
+			<form action="<?= Config::$scripturl ?>?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm('<?= Lang::getTxt('attachment_pruning_warning', file: 'Admin') ?>');">
+				<dl class="settings">
+					<dt><?= Lang::getTxt('attachment_remove_size', file: 'Admin') ?></dt>
+					<dd><input type="number" name="size" id="size" value="100" size="4"> <?= Lang::getTxt('kilobyte', file: 'General') ?></dd>
+					<dt><?= Lang::getTxt('attachment_pruning_message', file: 'Admin') ?></dt>
+					<dd><input type="text" name="notice" value="<?= Lang::getTxt('attachment_delete_admin', file: 'Admin') ?>" size="40"></dd>
+					<input type="submit" name="remove" value="<?= Lang::getTxt('remove', file: 'General') ?>" class="button">
+					<input type="hidden" name="type" value="attachments">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="sa" value="bysize">
+				</dl>
+			</form>
+			<form action="<?= Config::$scripturl ?>?action=admin;area=manageattachments" method="post" accept-charset="UTF-8" onsubmit="return confirm('<?= Lang::getTxt('attachment_pruning_warning', file: 'Admin') ?>');">
+				<dl class="settings">
+					<dt><?= Lang::getTxt('attachment_manager_avatars_older', file: 'Admin') ?></dt>
+					<dd><input type="number" name="age" value="45" size="4"> <?= str_replace('45', '', Lang::getTxt('number_of_days', [45], file: 'General')) ?></dd>
+					<input type="submit" name="remove" value="<?= Lang::getTxt('remove', file: 'General') ?>" class="button">
+					<input type="hidden" name="type" value="avatars">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="sa" value="byage">
+				</dl>
+			</form>
+		</div><!-- .windowbg -->
+	</div><!-- #manage_attachments -->
+<?php if (!empty(Utils::$context['results'])): ?>
+	<div class="noticebox"><?= Utils::$context['results'] ?></div>
+<?php endif; ?>
+	<div id="transfer" class="cat_bar">
+		<h3 class="catbg"><?= Lang::getTxt('attachment_transfer', file: 'Admin') ?></h3>
+	</div>
+	<div class="windowbg">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=manageattachments;sa=transfer" method="post" accept-charset="UTF-8">
+			<p><?= Lang::getTxt('attachment_transfer_desc', file: 'Admin') ?></p>
+			<dl class="settings">
+				<dt><?= Lang::getTxt('attachment_transfer_from', file: 'Admin') ?></dt>
+				<dd>
+					<select name="from">
+						<option value="0"><?= Lang::getTxt('attachment_transfer_select', file: 'Admin') ?></option>
+<?php foreach (Utils::$context['attach_dirs'] as $id => $dir): ?>
+						<option value="<?= $id ?>"><?= $dir ?></option>
+<?php endforeach; ?>
+					</select>
+				</dd>
+				<dt><?= Lang::getTxt('attachment_transfer_auto', file: 'Admin') ?></dt>
+				<dd>
+					<select name="auto">
+						<option value="0"><?= Lang::getTxt('attachment_transfer_auto_select', file: 'Admin') ?></option>
+						<option value="-1"><?= Lang::getTxt('attachment_transfer_forum_root', file: 'Admin') ?></option>
+<?php if (!empty(Utils::$context['base_dirs'])): ?>
+<?php foreach (Utils::$context['base_dirs'] as $id => $dir): ?>
+						<option value="<?= $id ?>"><?= $dir ?></option>
+<?php endforeach; ?>
+<?php else: ?>
+						<option value="0" disabled><?= Lang::getTxt('attachment_transfer_no_base', file: 'Admin') ?></option>
+<?php endif; ?>
+					</select>
+				</dd>
+				<dt><?= Lang::getTxt('attachment_transfer_to', file: 'Admin') ?></dt>
+				<dd>
+					<select name="to">
+						<option value="0"><?= Lang::getTxt('attachment_transfer_select', file: 'Admin') ?></option>
+<?php foreach (Utils::$context['attach_dirs'] as $id => $dir): ?>
+						<option value="<?= $id ?>"><?= $dir ?></option>
+<?php endforeach; ?>
+					</select>
+				</dd>
+<?php if (!empty(Config::$modSettings['attachmentDirFileLimit'])): ?>
+				<dt><?= Lang::getTxt('attachment_transfer_empty', file: 'Admin') ?></dt>
+				<dd><input type="checkbox" name="empty_it"<?= Utils::$context['checked'] ? ' checked' : '' ?>></dd>
+<?php endif; ?>
+			</dl>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="submit" onclick="start_progress()" name="transfer" value="<?= Lang::getTxt('attachment_transfer_now', file: 'Admin') ?>" class="button">
+			<div id="progress_msg"></div>
+			<div id="show_progress" class="padding"></div>
+		</form>
+		<script>
+			function start_progress() {
+				setTimeout(show_msg, 1000);
+			}
+
+			function show_msg() {
+				$('#progress_msg').html('<div><img src="<?= Theme::$current->settings['actual_images_url'] ?>/loading_sm.gif" alt="<?= Lang::getTxt('ajax_in_progress', file: 'General') ?>" width="35" height="35"> <?= Lang::getTxt('attachment_transfer_progress', file: 'Admin') ?><\/div>');
+				show_progress();
+			}
+
+			function show_progress() {
+				$('#show_progress').on("load", "progress.php");
+				setTimeout(show_progress, 1500);
+			}
+
+		</script>
+	</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBans/ban_edit.php b/Themes/default/templates/ManageBans/ban_edit.php
new file mode 100644
index 00000000000..86df6dd4baf
--- /dev/null
+++ b/Themes/default/templates/ManageBans/ban_edit.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add or edit a ban
+ */
+?>
+	<div id="manage_bans">
+		<form id="admin_form_wrapper" action="<?= Utils::$context['form_url'] ?>" method="post" accept-charset="UTF-8" onsubmit="return confirmBan(this);"><?php /* If there were errors creating the ban, show them. */ ?><?php if (!empty(Utils::$context['error_messages'])): ?>
+			<div class="errorbox">
+				<strong><?= Lang::getTxt('ban_errors_detected', file: 'Admin') ?></strong>
+				<ul><?php foreach (Utils::$context['error_messages'] as $error): ?>
+					<li class="error"><?= $error ?></li><?php endforeach; ?>
+				</ul>
+			</div><?php endif; ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Utils::$context['ban']['is_new'] ? Lang::getTxt('ban_add_new', file: 'Admin') : Lang::getTxt('ban_edit', Utils::$context['ban'], file: 'Admin') ?>
+				</h3>
+			</div><?php if (Utils::$context['ban']['is_new']): ?>
+			<div class="information noup"><?= Lang::getTxt('ban_add_notes', file: 'Admin') ?></div><?php endif; ?>
+			<div class="windowbg noup">
+				<dl class="settings">
+					<dt id="ban_name_label">
+						<strong><?= Lang::getTxt('ban_name', file: 'Admin') ?>:</strong>
+					</dt>
+					<dd>
+						<input type="text" id="ban_name" name="ban_name" value="<?= Utils::$context['ban']['name'] ?>" size="45" maxlength="60">
+					</dd><?php if (isset(Utils::$context['ban']['reason'])): ?>
+					<dt>
+						<strong><label for="reason"><?= Lang::getTxt('ban_reason', file: 'General') ?></label></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('ban_reason_desc', file: 'Admin') ?></span>
+					</dt>
+					<dd>
+						<textarea name="reason" id="reason" cols="40" rows="3"><?= Utils::$context['ban']['reason'] ?></textarea>
+					</dd><?php endif; ?><?php if (isset(Utils::$context['ban']['notes'])): ?>
+					<dt>
+						<strong><label for="ban_notes"><?= Lang::getTxt('ban_notes', file: 'Admin') ?></label></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('ban_notes_desc', file: 'Admin') ?></span>
+					</dt>
+					<dd>
+						<textarea name="notes" id="ban_notes" cols="40" rows="3"><?= Utils::$context['ban']['notes'] ?></textarea>
+					</dd><?php endif; ?>
+				</dl>
+				<fieldset class="ban_settings floatleft">
+					<legend>
+						<?= Lang::getTxt('ban_expiration', file: 'Admin') ?>
+					</legend>
+					<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"<?= Utils::$context['ban']['expiration']['status'] == 'never' ? ' checked' : '' ?>> <label for="never_expires"><?= Lang::getTxt('never', file: 'General') ?></label><br>
+					<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"<?= Utils::$context['ban']['expiration']['status'] == 'one_day' ? ' checked' : '' ?>> <label for="expires_one_day"><?= Lang::getTxt('ban_will_expire_within', file: 'Admin') ?></label> <input type="number" name="expire_date" id="expire_date" size="3" value="<?= Utils::$context['ban']['expiration']['days'] ?>"> <?= str_replace(Utils::$context['ban']['expiration']['days'], '', Lang::getTxt('number_of_days', [Utils::$context['ban']['expiration']['days']], file: 'General')) ?><br>
+					<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"<?= Utils::$context['ban']['expiration']['status'] == 'expired' ? ' checked' : '' ?>> <label for="already_expired"><?= Lang::getTxt('ban_expired', file: 'Admin') ?></label>
+				</fieldset>
+				<fieldset class="ban_settings floatright">
+					<legend>
+						<?= Lang::getTxt('ban_restriction', file: 'Admin') ?>
+					</legend>
+					<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"<?= Utils::$context['ban']['cannot']['access'] ? ' checked' : '' ?>> <label for="full_ban"><?= Lang::getTxt('ban_full_ban', file: 'Admin') ?></label><br>
+					<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"<?= !Utils::$context['ban']['cannot']['access'] ? ' checked' : '' ?>> <label for="partial_ban"><?= Lang::getTxt('ban_partial_ban', file: 'Admin') ?></label><br>
+					<input type="checkbox" name="cannot_post" id="cannot_post" value="1"<?= Utils::$context['ban']['cannot']['post'] ? ' checked' : '' ?> class="ban_restriction"> <label for="cannot_post"><?= Lang::getTxt('ban_cannot_post', file: 'Admin') ?></label> (<a href="<?= Config::$scripturl ?>?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br>
+					<input type="checkbox" name="cannot_register" id="cannot_register" value="1"<?= Utils::$context['ban']['cannot']['register'] ? ' checked' : '' ?> class="ban_restriction"> <label for="cannot_register"><?= Lang::getTxt('ban_cannot_register', file: 'Admin') ?></label><br>
+					<input type="checkbox" name="cannot_login" id="cannot_login" value="1"<?= Utils::$context['ban']['cannot']['login'] ? ' checked' : '' ?> class="ban_restriction"> <label for="cannot_login"><?= Lang::getTxt('ban_cannot_login', file: 'Admin') ?></label><br>
+				</fieldset>
+				<br class="clear_right"><?php if (!empty(Utils::$context['ban_suggestions'])): ?>
+				<fieldset>
+					<legend>
+						<input type="checkbox" onclick="invertAll(this, this.form, 'ban_suggestion');"> <?= Lang::getTxt('ban_triggers', file: 'Admin') ?>
+					</legend>
+					<dl class="settings">
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="main_ip_check" value="main_ip"<?= !empty(Utils::$context['ban_suggestions']['main_ip']) ? ' checked' : '' ?>>
+							<label for="main_ip_check"><?= Lang::getTxt('ban_on_ip', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="main_ip" value="<?= Utils::$context['ban_suggestions']['main_ip'] ?>" size="44" onfocus="document.getElementById('main_ip_check').checked = true;">
+						</dd><?php if (empty(Config::$modSettings['disableHostnameLookup'])): ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"<?= !empty(Utils::$context['ban_suggestions']['hostname']) ? ' checked' : '' ?>>
+							<label for="hostname_check"><?= Lang::getTxt('ban_on_hostname', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="hostname" value="<?= Utils::$context['ban_suggestions']['hostname'] ?>" size="44" onfocus="document.getElementById('hostname_check').checked = true;">
+						</dd><?php endif; ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="email_check" value="email"<?= !empty(Utils::$context['ban_suggestions']['email']) ? ' checked' : '' ?>>
+							<label for="email_check"><?= Lang::getTxt('ban_on_email', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="email" value="<?= Utils::$context['ban_suggestions']['email'] ?>" size="44" onfocus="document.getElementById('email_check').checked = true;">
+						</dd>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user"<?= !empty(Utils::$context['ban_suggestions']['user']) || isset(Utils::$context['ban']['from_user']) ? ' checked' : '' ?>>
+							<label for="user_check"><?= Lang::getTxt('ban_on_username', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" <?= isset(Utils::$context['ban']['from_user']) ? 'readonly value="' . Utils::$context['ban_suggestions']['member']['name'] . '"' : ' value=""' ?> name="user" id="user" size="44">
+						</dd>
+					</dl><?php if (!empty(Utils::$context['ban_suggestions']['other_ips'])): ?><?php foreach (Utils::$context['ban_suggestions']['other_ips'] as $key => $ban_ips): ?><?php if (!empty($ban_ips)): ?>
+					<div><?= Lang::getTxt($key, file: 'Profile') ?></div>
+					<dl class="settings"><?php $count = 0; ?><?php foreach ($ban_ips as $ip): ?>
+						<dt>
+							<input type="checkbox" id="suggestions_<?= $key ?>_<?= $count ?>" name="ban_suggestions[<?= $key ?>][]"<?= !empty(Utils::$context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, Utils::$context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '' ?> value="<?= $ip ?>">
+						</dt>
+						<dd>
+							<label for="suggestions_<?= $key ?>_<?= $count++ ?>"><?= $ip ?></label>
+						</dd><?php endforeach; ?>
+					</dl><?php endif; ?><?php endforeach; ?><?php endif; ?>
+				</fieldset><?php endif; ?>
+				<input type="submit" name="<?= Utils::$context['ban']['is_new'] ? 'add_ban' : 'modify_ban' ?>" value="<?= Lang::getTxt(Utils::$context['ban']['is_new'] ? 'ban_add' : 'ban_modify', file: 'Admin') ?>" class="button">
+				<input type="hidden" name="old_expire" value="<?= Utils::$context['ban']['expiration']['days'] ?>">
+				<input type="hidden" name="bg" value="<?= Utils::$context['ban']['id'] ?>"><?= isset(Utils::$context['ban']['from_user']) ? '
+				<input type="hidden" name="u" value="' . Utils::$context['ban_suggestions']['member']['id'] . '">' : '' ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-bet_token_var'] ?>" value="<?= Utils::$context['admin-bet_token'] ?>">
+			</div><!-- .windowbg -->
+		</form><?php if (!Utils::$context['ban']['is_new'] && empty(Utils::$context['ban_suggestions'])): ?>
+		<br><?php $this->subTemplate('show_list', ['list_id' => 'ban_items']); ?><?php endif; ?>
+	</div><!-- #manage_bans -->
+	<script>
+		var fUpdateStatus = function ()
+		{
+			document.getElementById("expire_date").disabled = !document.getElementById("expires_one_day").checked;
+			document.getElementById("cannot_post").disabled = document.getElementById("full_ban").checked;
+			document.getElementById("cannot_register").disabled = document.getElementById("full_ban").checked;
+			document.getElementById("cannot_login").disabled = document.getElementById("full_ban").checked;
+		}
+		addLoadEvent(fUpdateStatus);<?php /* Auto suggest only needed for adding new bans, not editing */ ?><?php if (Utils::$context['ban']['is_new'] && empty($_REQUEST['u'])): ?>
+
+		var oAddMemberSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'user',
+			sControlId: 'user',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+		});
+
+		function confirmBan(aForm)
+		{
+			if (aForm.ban_name.value == '')
+			{
+				alert('<?= Lang::getTxt('ban_name_empty', file: 'Errors') ?>');
+				return false;
+			}
+
+			if (aForm.partial_ban.checked && !(aForm.cannot_post.checked || aForm.cannot_register.checked || aForm.cannot_login.checked))
+			{
+				alert('<?= Lang::getTxt('ban_restriction_empty', file: 'Admin') ?>');
+				return false;
+			}
+		}
+	</script><?php endif; ?>
diff --git a/Themes/default/templates/ManageBans/ban_edit_trigger.php b/Themes/default/templates/ManageBans/ban_edit_trigger.php
new file mode 100644
index 00000000000..471fa3f2bcd
--- /dev/null
+++ b/Themes/default/templates/ManageBans/ban_edit_trigger.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add or edit a ban trigger
+ */
+?>
+	<div id="manage_bans">
+		<form id="admin_form_wrapper" action="<?= Utils::$context['form_url'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt(Utils::$context['ban_trigger']['is_new'] ? 'ban_add_trigger' : 'ban_edit_trigger_title', file: 'Admin') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<fieldset>
+<?php if (Utils::$context['ban_trigger']['is_new']): ?>
+					<legend>
+						<input type="checkbox" onclick="invertAll(this, this.form, 'ban_suggestion');"> <?= Lang::getTxt('ban_triggers', file: 'Admin') ?>
+					</legend>
+<?php endif; ?>
+					<dl class="settings">
+<?php if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['ip']['selected']): ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="main_ip_check" value="main_ip"<?= Utils::$context['ban_trigger']['ip']['selected'] ? ' checked' : '' ?>>
+							<label for="main_ip_check"><?= Lang::getTxt('ban_on_ip', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="main_ip" value="<?= Utils::$context['ban_trigger']['ip']['value'] ?>" size="44" onfocus="document.getElementById('main_ip_check').checked = true;">
+						</dd>
+<?php endif; ?>
+<?php if (empty(Config::$modSettings['disableHostnameLookup']) && (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['hostname']['selected'])): ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"<?= Utils::$context['ban_trigger']['hostname']['selected'] ? ' checked' : '' ?>>
+							<label for="hostname_check"><?= Lang::getTxt('ban_on_hostname', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="text" name="hostname" value="<?= Utils::$context['ban_trigger']['hostname']['value'] ?>" size="44" onfocus="document.getElementById('hostname_check').checked = true;">
+						</dd>
+<?php endif; ?>
+<?php if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['email']['selected']): ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="email_check" value="email"<?= Utils::$context['ban_trigger']['email']['selected'] ? ' checked' : '' ?>>
+							<label for="email_check"><?= Lang::getTxt('ban_on_email', file: 'Admin') ?></label>
+						</dt>
+						<dd>
+							<input type="email" name="email" value="<?= Utils::$context['ban_trigger']['email']['value'] ?>" size="44" onfocus="document.getElementById('email_check').checked = true;">
+						</dd>
+<?php endif; ?>
+<?php if (Utils::$context['ban_trigger']['is_new'] || Utils::$context['ban_trigger']['banneduser']['selected']): ?>
+						<dt>
+							<input type="checkbox" name="ban_suggestions[]" id="user_check" value="user"<?= Utils::$context['ban_trigger']['banneduser']['selected'] ? ' checked' : '' ?>>
+							<label for="user_check"><?= Lang::getTxt('ban_on_username', file: 'Admin') ?></label>:
+						</dt>
+						<dd>
+							<input type="text" value="<?= Utils::$context['ban_trigger']['banneduser']['value'] ?>" name="user" id="user" size="44"  onfocus="document.getElementById('user_check').checked = true;">
+						</dd>
+<?php endif; ?>
+					</dl>
+				</fieldset>
+				<input type="submit" name="<?= Utils::$context['ban_trigger']['is_new'] ? 'add_new_trigger' : 'edit_trigger' ?>" value="<?= Lang::getTxt(Utils::$context['ban_trigger']['is_new'] ? 'ban_add_trigger_submit' : 'ban_edit_trigger_submit', file: 'Admin') ?>" class="button">
+			</div><!-- .windowbg -->
+			<input type="hidden" name="bi" value="<?= Utils::$context['ban_trigger']['id'] ?>">
+			<input type="hidden" name="bg" value="<?= Utils::$context['ban_trigger']['group'] ?>">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-bet_token_var'] ?>" value="<?= Utils::$context['admin-bet_token'] ?>">
+		</form>
+	</div><!-- #manage_bans -->
+	<script>
+		var oAddMemberSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'username',
+			sControlId: 'user',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+		});
+
+		function onUpdateName(oAutoSuggest)
+		{
+			document.getElementById('user_check').checked = true;
+			return true;
+		}
+		oAddMemberSuggest.registerCallback('onBeforeUpdate', 'onUpdateName');
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBans/index.php b/Themes/default/templates/ManageBans/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageBans/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageBoards/confirm_board_delete.php b/Themes/default/templates/ManageBoards/confirm_board_delete.php
new file mode 100644
index 00000000000..da1d0537513
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/confirm_board_delete.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A template used when a user is deleting a board with child boards in it - to see what they want to do with them.
+ */
+?><?php /* Print table header. */ ?>
+	<div id="manage_boards" class="roundframe">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=board2" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="boardid" value="<?= Utils::$context['board']['id'] ?>">
+
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mboards_delete_board', file: 'ManageBoards') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Lang::getTxt('mboards_delete_board_contains', file: 'ManageBoards') ?></p>
+				<ul><?php foreach (Utils::$context['children'] as $child): ?>
+					<li><?= $child['node']['name'] ?></li><?php endforeach; ?>
+				</ul>
+			</div>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mboards_delete_what_do', file: 'ManageBoards') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p>
+					<label for="delete_action0"><input type="radio" id="delete_action0" name="delete_action" value="0" checked><?= Lang::getTxt('mboards_delete_board_option1', file: 'ManageBoards') ?></label><br>
+					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"<?= empty(Utils::$context['can_move_children']) ? ' disabled' : '' ?>><?= Lang::getTxt('mboards_delete_board_option2', file: 'ManageBoards') ?></label>:
+					<select name="board_to"<?= empty(Utils::$context['can_move_children']) ? ' disabled' : '' ?>><?php foreach (Utils::$context['board_order'] as $board): ?><?php if ($board['id'] != Utils::$context['board']['id'] && empty($board['is_child'])): ?>
+						<option value="<?= $board['id'] ?>"><?= $board['name'] ?></option><?php endif; ?><?php endforeach; ?>
+					</select>
+				</p>
+				<input type="submit" name="delete" value="<?= Lang::getTxt('mboards_delete_confirm', file: 'ManageBoards') ?>" class="button">
+				<input type="submit" name="cancel" value="<?= Lang::getTxt('mboards_delete_cancel', file: 'ManageBoards') ?>" class="button">
+				<input type="hidden" name="confirmation" value="1">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token_var'] ?>" value="<?= Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #manage_boards -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBoards/confirm_category_delete.php b/Themes/default/templates/ManageBoards/confirm_category_delete.php
new file mode 100644
index 00000000000..fc92ad43e89
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/confirm_category_delete.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A template to confirm if a user wishes to delete a category - and whether they want to save the boards.
+ */
+?><?php /* Print table header. */ ?>
+	<div id="manage_boards" class="roundframe">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=cat2" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="cat" value="<?= Utils::$context['category']['id'] ?>">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mboards_delete_cat', file: 'ManageBoards') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Lang::getTxt('mboards_delete_cat_contains', file: 'ManageBoards') ?></p>
+				<ul><?php foreach (Utils::$context['category']['children'] as $child): ?>
+					<li><?= $child ?></li><?php endforeach; ?>
+				</ul>
+			</div>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mboards_delete_what_do', file: 'ManageBoards') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p>
+					<label for="delete_action0"><input type="radio" id="delete_action0" name="delete_action" value="0" checked><?= Lang::getTxt('mboards_delete_option1', file: 'ManageBoards') ?></label><br>
+					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"<?= count(Utils::$context['category_order']) == 1 ? ' disabled' : '' ?>><?= Lang::getTxt('mboards_delete_option2', file: 'ManageBoards') ?></label>
+					<select name="cat_to"<?= count(Utils::$context['category_order']) == 1 ? ' disabled' : '' ?>><?php foreach (Utils::$context['category_order'] as $cat): ?><?php if ($cat['id'] != 0): ?>
+						<option value="<?= $cat['id'] ?>"><?= $cat['true_name'] ?></option><?php endif; ?><?php endforeach; ?>
+					</select>
+				</p>
+				<input type="submit" name="delete" value="<?= Lang::getTxt('mboards_delete_confirm', file: 'ManageBoards') ?>" class="button">
+				<input type="submit" name="cancel" value="<?= Lang::getTxt('mboards_delete_cancel', file: 'ManageBoards') ?>" class="button">
+				<input type="hidden" name="confirmation" value="1">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #manage_boards -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBoards/index.php b/Themes/default/templates/ManageBoards/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageBoards/main.php b/Themes/default/templates/ManageBoards/main.php
new file mode 100644
index 00000000000..c21f1f38e9d
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/main.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for listing all the current categories and boards.
+ */
+?>
+
+<?php /* Table header. */ ?>
+	<div id="manage_boards">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('boards_edit', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+<?php if (!empty(Utils::$context['move_board'])): ?>
+			<div class="noticebox">
+				<?= Utils::$context['move_title'] ?> [<a href="<?= Config::$scripturl ?>?action=admin;area=manageboards"><?= Lang::getTxt('mboards_cancel_moving', file: 'ManageBoards') ?></a>]
+			</div>
+<?php endif; ?>
+<?php /* No categories so show a label. */ ?>
+<?php if (empty(Utils::$context['categories'])): ?>
+			<div class="windowbg centertext">
+				<?= Lang::getTxt('mboards_no_cats', file: 'ManageBoards') ?>
+			</div>
+<?php endif; ?>
+<?php /* Loop through every category, listing the boards in each as we go. */ ?>
+<?php foreach (Utils::$context['categories'] as $category): ?>
+<?php /* Link to modify the category. */ ?>
+			<div class="sub_bar">
+				<h3 class="subbg">
+					<a href="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=cat;cat=<?= $category['id'] ?>"><?= $category['name'] ?></a> <a href="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=cat;cat=<?= $category['id'] ?>"><?= Lang::getTxt('cat_modify', file: 'ManageBoards') ?></a>
+				</h3>
+			</div>
+<?php /* Boards table header. */ ?>
+			<form action="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=newboard;cat=<?= $category['id'] ?>" method="post" accept-charset="UTF-8">
+				<ul id="category_<?= $category['id'] ?>" class="nolist">
+<?php if (!empty($category['move_link'])): ?>
+					<li><a href="<?= $category['move_link']['href'] ?>" title="<?= $category['move_link']['label'] ?>"><span class="main_icons select_above"></span></a></li>
+<?php endif; ?>
+<?php
+$recycle_board = '<a href="' . Config::$scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . Theme::$current->settings['images_url'] . '/post/recycled.png" alt="' . Lang::getTxt('recycle_board', file: 'ManageBoards') . '" title="' . Lang::getTxt('recycle_board', file: 'ManageBoards') . '"></a>';
+$redirect_board = '<img src="' . Theme::$current->settings['images_url'] . '/new_redirect.png" alt="' . Lang::getTxt('redirect_board_desc', file: 'ManageBoards') . '" title="' . Lang::getTxt('redirect_board_desc', file: 'ManageBoards') . '">';
+// List through every board in the category, printing its name and link to modify the board.
+?>
+<?php foreach ($category['boards'] as $board): ?>
+					<li<?= !empty(Config::$modSettings['recycle_board']) && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $board['id'] ? ' id="recycle_board"' : ' ' ?> class="windowbg<?= $board['is_redirect'] ? ' redirect_board' : '' ?>" style="padding-inline-start: <?= 5 + 30 * $board['child_level'] ?>px;">
+						<span class="floatleft"><a<?= $board['move'] ? ' class="red"' : '' ?> href="<?= Config::$scripturl ?>?board=<?= $board['id'] ?>.0"><?= $board['name'] ?></a><?= !empty(Config::$modSettings['recycle_board']) && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $board['id'] ? $recycle_board : '' ?><?= $board['is_redirect'] ? $redirect_board : '' ?></span>
+						<span class="floatright">
+							<?= Utils::$context['can_manage_permissions'] ? '<a href="' . Config::$scripturl . '?action=admin;area=permissions;sa=index;pid=' . $board['permission_profile'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" class="button">' . Lang::getTxt('mboards_permissions', file: 'ManageBoards') . '</a>' : '' ?>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=manageboards;move=<?= $board['id'] ?>" class="button"><?= Lang::getTxt('mboards_move', file: 'ManageBoards') ?></a>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=board;boardid=<?= $board['id'] ?>" class="button"><?= Lang::getTxt('mboards_modify', file: 'ManageBoards') ?></a>
+						</span><br style="clear: right;">
+					</li>
+<?php if (!empty($board['move_links'])): ?>
+					<li class="windowbg" style="padding-inline-start: <?= 5 + 30 * $board['move_links'][0]['child_level'] ?>px;">
+<?php foreach ($board['move_links'] as $link): ?>
+						<a href="<?= $link['href'] ?>" class="move_links" title="<?= $link['label'] ?>"><span class="main_icons select_<?= $link['class'] ?>" title="<?= $link['label'] ?>"></span></a>
+<?php endforeach; ?>
+					</li>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php /* Button to add a new board. */ ?>
+				</ul>
+				<input type="submit" value="<?= Lang::getTxt('mboards_new_board', file: 'ManageBoards') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+<?php endforeach; ?>
+		</div><!-- .windowbg -->
+	</div><!-- #manage_boards -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBoards/modify_board.php b/Themes/default/templates/ManageBoards/modify_board.php
new file mode 100644
index 00000000000..2ba7366448f
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/modify_board.php
@@ -0,0 +1,405 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Below is the template for adding/editing a board on the forum.
+ */
+?>
+
+<?php /* The main table header. */ ?>
+	<div id="manage_boards">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=board2" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="boardid" value="<?= Utils::$context['board']['id'] ?>">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= isset(Utils::$context['board']['is_new']) ? Lang::getTxt('mboards_new_board_name', file: 'ManageBoards') : Lang::getTxt('boards_edit', file: 'Admin') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+<?php /* Option for choosing the category the board lives in. */ ?>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_category', file: 'ManageBoards') ?></strong>
+					</dt>
+					<dd>
+						<select name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == '';}">
+<?php foreach (Utils::$context['categories'] as $category): ?>
+							<option<?= $category['selected'] ? ' selected' : '' ?> value="<?= $category['id'] ?>"><?= $category['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+					</dd>
+<?php /* If this isn't the only board in this category let the user choose where the board is to live. */ ?>
+<?php if ((isset(Utils::$context['board']['is_new']) && count(Utils::$context['board_order']) > 0) || count(Utils::$context['board_order']) > 1): ?>
+					<dt>
+						<strong><?= Lang::getTxt('order', file: 'ManageBoards') ?></strong>
+					</dt>
+					<dd>
+<?php /* The first select box gives the user the option to position it before, after or as a child of another board. */ ?>
+						<select id="order" name="placement" onchange="this.form.board_order.disabled = this.options[this.selectedIndex].value == '';">
+							<?= !isset(Utils::$context['board']['is_new']) ? '<option value="">(' . Lang::getTxt('mboards_unchanged', file: 'ManageBoards') . ')</option>' : '' ?>
+							<option value="after"><?= Lang::getTxt('mboards_order_after', ['name' => '...'], file: 'ManageBoards') ?></option>
+							<option value="child"><?= Lang::getTxt('mboards_order_child_of', ['name' => '...'], file: 'ManageBoards') ?></option>
+							<option value="before"><?= Lang::getTxt('mboards_order_before', ['name' => '...'], file: 'ManageBoards') ?></option>
+						</select>
+<?php /* The second select box lists all the boards in the category. */ ?>
+						<select id="board_order" name="board_order"<?= !isset(Utils::$context['board']['is_new']) ? ' disabled' : '' ?>>
+							<?= !isset(Utils::$context['board']['is_new']) ? '<option value="">(' . Lang::getTxt('mboards_unchanged', file: 'ManageBoards') . ')</option>' : '' ?>
+
+<?php foreach (Utils::$context['board_order'] as $order): ?>
+							<option<?= $order['selected'] ? ' selected' : '' ?> value="<?= $order['id'] ?>"><?= $order['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+					</dd>
+<?php endif; ?>
+<?php /* Options for board name and description. */ ?>
+					<dt>
+						<strong><?= Lang::getTxt('full_name', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('name_on_display', file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+						<input type="text" name="board_name" value="<?= Utils::$context['board']['name'] ?>" size="30">
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_description', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mboards_description_desc', ['allowed_tags' => implode(', ', Utils::$context['description_allowed_tags'])], file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+						<textarea name="desc" rows="3" cols="35"><?= Utils::$context['board']['description'] ?></textarea>
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('permission_profile', file: 'ManagePermissions') ?></strong><br>
+						<span class="smalltext"><?= Utils::$context['can_manage_permissions'] ? Lang::getTxt('permission_profile_desc', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']], file: 'ManagePermissions') : strip_tags(Lang::getTxt('permission_profile_desc', file: 'ManagePermissions')) ?></span>
+					</dt>
+					<dd>
+						<select name="profile">
+<?php if (isset(Utils::$context['board']['is_new'])): ?>
+							<option value="-1">[<?= Lang::getTxt('permission_profile_inherit', file: 'ManagePermissions') ?>]</option>
+<?php endif; ?>
+<?php foreach (Utils::$context['profiles'] as $id => $profile): ?>
+							<option value="<?= $id ?>"<?= $id == Utils::$context['board']['profile'] ? ' selected' : '' ?>><?= $profile['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_groups', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt(empty(Config::$modSettings['deny_boards_access']) ? 'mboards_groups_desc' : 'boardsaccess_option_desc', file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+<?php if (!empty(Config::$modSettings['deny_boards_access'])): ?>
+						<table>
+							<tr>
+								<td></td>
+								<th><?= Lang::getTxt('permissions_option_on', file: 'ManagePermissions') ?></th>
+								<th><?= Lang::getTxt('permissions_option_off', file: 'ManagePermissions') ?></th>
+								<th><?= Lang::getTxt('permissions_option_deny', file: 'ManagePermissions') ?></th>
+							</tr>
+<?php endif; ?>
+<?php /* List all the membergroups so the user can choose who may access this board. */ ?>
+<?php foreach (Utils::$context['groups'] as $group): ?>
+<?php if (empty(Config::$modSettings['deny_boards_access'])): ?>
+						<label for="groups_<?= $group['id'] ?>">
+							<input type="checkbox" name="groups[<?= $group['id'] ?>]" value="allow" id="groups_<?= $group['id'] ?>"<?= in_array($group['id'], Utils::$context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : '') ?>>
+							<span<?= $group['is_post_group'] ? ' class="post_group" title="' . Lang::getTxt('mboards_groups_post_group', file: 'ManageBoards') . '"' : ($group['id'] == 0 ? ' class="regular_members" title="' . Lang::getTxt('mboards_groups_regular_members', file: 'ManageBoards') . '"' : '') ?>>
+								<?= $group['name'] ?>
+							</span>
+						</label><br>
+<?php else: ?>
+							<tr>
+								<td>
+									<label for="groups_<?= $group['id'] ?>_a">
+										<span<?= $group['is_post_group'] ? ' class="post_group" title="' . Lang::getTxt('mboards_groups_post_group', file: 'ManageBoards') . '"' : ($group['id'] == 0 ? ' class="regular_members" title="' . Lang::getTxt('mboards_groups_regular_members', file: 'ManageBoards') . '"' : '') ?>>
+											<?= $group['name'] ?>
+										</span>
+									</label>
+								</td>
+								<td>
+									<input type="radio" name="groups[<?= $group['id'] ?>]" value="allow" id="groups_<?= $group['id'] ?>_a"<?= in_array($group['id'], Utils::$context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : '') ?>>
+								</td>
+								<td>
+									<input type="radio" name="groups[<?= $group['id'] ?>]" value="ignore" id="groups_<?= $group['id'] ?>_x"<?= in_array($group['id'], Utils::$context['board_managers']) ? ' disabled' : (!$group['allow'] && !$group['deny'] ? ' checked' : '') ?>>
+								</td>
+								<td>
+									<input type="radio" name="groups[<?= $group['id'] ?>]" value="deny" id="groups_<?= $group['id'] ?>_d"<?= in_array($group['id'], Utils::$context['board_managers']) ? ' disabled' : ($group['deny'] ? ' checked' : '') ?>>
+								</td>
+								<td></td>
+							</tr>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (empty(Config::$modSettings['deny_boards_access'])): ?>
+						<span class="select_all_box">
+							<em><?= Lang::getTxt('check_all', file: 'General') ?></em> <input type="checkbox" onclick="invertAll(this, this.form, 'groups[');">
+						</span>
+						<br><br>
+					</dd>
+<?php else: ?>
+							<tr class="select_all_box">
+								<td>
+								</td>
+								<td>
+									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, 'groups', 'allow');">
+								</td>
+								<td>
+									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, 'groups', 'ignore');">
+								</td>
+								<td>
+									<input type="radio" name="select_all" onclick="selectAllRadio(this, this.form, 'groups', 'deny');">
+								</td>
+								<td>
+									<em><?= Lang::getTxt('check_all', file: 'General') ?></em>
+								</td>
+							</tr>
+						</table>
+					</dd>
+<?php endif; ?>
+<?php /* Options to choose moderators, specify as announcement board and choose whether to count posts here. */ ?>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_moderators', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mboards_moderators_desc', file: 'ManageBoards') ?></span><br>
+					</dt>
+					<dd>
+						<input type="text" name="moderators" id="moderators" value="<?= Utils::$context['board']['moderator_list'] ?>" size="30">
+						<div id="moderator_container"></div>
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_moderator_groups', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mboards_moderator_groups_desc', file: 'ManageBoards') ?></span><br>
+					</dt>
+					<dd>
+						<input type="text" name="moderator_groups" id="moderator_groups" value="<?= Utils::$context['board']['moderator_groups_list'] ?>" size="30">
+						<div id="moderator_group_container"></div>
+					</dd>
+				</dl>
+				<script>
+					$(document).ready(function () {
+						$(".select_all_box").each(function () {
+							$(this).removeClass('select_all_box');
+						});
+					});
+				</script>
+				<hr>
+<?php if (empty(Utils::$context['board']['is_recycle']) && empty(Utils::$context['board']['topics'])): ?>
+				<dl class="settings">
+					<dt>
+						<strong<?= Utils::$context['board']['topics'] ? ' style="color: gray;"' : '' ?>><?= Lang::getTxt('mboards_redirect', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mboards_redirect_desc', file: 'ManageBoards') ?></span><br>
+					</dt>
+					<dd>
+						<input type="checkbox" id="redirect_enable" name="redirect_enable"<?= Utils::$context['board']['redirect'] != '' ? ' checked' : '' ?> onclick="refreshOptions();">
+					</dd>
+				</dl>
+
+				<div id="redirect_address_div">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('mboards_redirect_url', file: 'ManageBoards') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('mboards_redirect_url_desc', file: 'ManageBoards') ?></span><br>
+						</dt>
+						<dd>
+							<input type="text" name="redirect_address" value="<?= Utils::$context['board']['redirect'] ?>" size="40">
+						</dd>
+					</dl>
+				</div>
+<?php if (Utils::$context['board']['redirect']): ?>
+				<div id="reset_redirect_div">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('mboards_redirect_reset', file: 'ManageBoards') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('mboards_redirect_reset_desc', file: 'ManageBoards') ?></span><br>
+						</dt>
+						<dd>
+							<input type="checkbox" name="reset_redirect">
+							<em>(<?= Lang::getTxt('mboards_current_redirects', [Utils::$context['board']['posts']], file: 'ManageBoards') ?>)</em>
+						</dd>
+					</dl>
+				</div>
+<?php endif; ?>
+<?php endif; ?>
+				<div id="count_posts_div">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('mboards_count_posts', file: 'ManageBoards') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('mboards_count_posts_desc', file: 'ManageBoards') ?></span><br>
+						</dt>
+						<dd>
+							<input type="checkbox" name="count"<?= Utils::$context['board']['posts_count'] ? ' checked' : '' ?>>
+						</dd>
+					</dl>
+				</div>
+<?php /* Here the user can choose to force this board to use a theme other than the default theme for the forum. */ ?>
+				<div id="board_theme_div">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('mboards_theme', file: 'ManageBoards') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('mboards_theme_desc', file: 'ManageBoards') ?></span><br>
+						</dt>
+						<dd>
+							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
+								<option value="0"<?= Utils::$context['board']['theme'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('mboards_theme_default', file: 'ManageBoards') ?></option>
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+									<option value="<?= $theme['id'] ?>"<?= Utils::$context['board']['theme'] == $theme['id'] ? ' selected' : '' ?>><?= $theme['name'] ?></option>
+<?php endforeach; ?>
+							</select>
+						</dd>
+					</dl>
+				</div><!-- #board_theme_div -->
+				<div id="override_theme_div">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('mboards_override_theme', file: 'ManageBoards') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('mboards_override_theme_desc', file: 'ManageBoards') ?></span><br>
+						</dt>
+						<dd>
+							<input type="checkbox" name="override_theme"<?= Utils::$context['board']['override_theme'] ? ' checked' : '' ?>>
+						</dd>
+					</dl>
+				</div>
+<?php /* Show any board settings added by mods using the 'integrate_edit_board' hook. */ ?>
+<?php if (!empty(Utils::$context['custom_board_settings']) && is_array(Utils::$context['custom_board_settings'])): ?>
+				<hr>
+				<div id="custom_board_settings">
+					<dl class="settings">
+<?php foreach (Utils::$context['custom_board_settings'] as $cbs_id => $cbs): ?>
+<?php if (!empty($cbs['dt']) && !empty($cbs['dd'])): ?>
+						<dt class="clear<?= !is_numeric($cbs_id) ? ' cbs_' . $cbs_id : '' ?>">
+							<?= $cbs['dt'] ?>
+						</dt>
+						<dd<?= !is_numeric($cbs_id) ? ' class="cbs_' . $cbs_id . '"' : '' ?>>
+							<?= $cbs['dd'] ?>
+						</dd>
+<?php endif; ?>
+<?php endforeach; ?>
+					</dl>
+				</div>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['board']['is_recycle'])): ?>
+				<div class="noticebox"><?= Lang::getTxt('mboards_recycle_disabled_delete', file: 'ManageBoards') ?></div>
+<?php endif; ?>
+				<input type="hidden" name="rid" value="<?= Utils::$context['redirect_location'] ?>">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token_var'] ?>" value="<?= Utils::$context['admin-be-' . Utils::$context['board']['id'] . '_token'] ?>">
+<?php /* If this board has no children don't bother with the next confirmation screen. */ ?>
+<?php if (Utils::$context['board']['no_children']): ?>
+				<input type="hidden" name="no_children" value="1">
+<?php endif; ?>
+<?php if (isset(Utils::$context['board']['is_new'])): ?>
+				<input type="hidden" name="cur_cat" value="<?= Utils::$context['board']['category'] ?>">
+				<input type="submit" name="add" value="<?= Lang::getTxt('mboards_new_board', file: 'ManageBoards') ?>" onclick="return !isEmptyText(this.form.board_name);" class="button">
+<?php else: ?>
+				<input type="submit" name="edit" value="<?= Lang::getTxt('modify', file: 'General') ?>" onclick="return !isEmptyText(this.form.board_name);" class="button">
+<?php endif; ?>
+<?php if (!isset(Utils::$context['board']['is_new']) && empty(Utils::$context['board']['is_recycle'])): ?>
+				<input type="submit" name="delete" value="<?= Lang::getTxt('mboards_delete_board', file: 'ManageBoards') ?>" data-confirm="<?= Lang::getTxt('board_delete_confirm', file: 'ManageBoards') ?>" class="button you_sure">
+<?php endif; ?>
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #manage_boards -->
+
+	<script>
+		var oModeratorSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'moderators',
+			sControlId: 'moderators',
+			sSearchType: 'member',
+			bItemList: true,
+			sPostName: 'moderator_list',
+			sURLMask: 'action=profile;u=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			sItemListContainerId: 'moderator_container',
+			aListItems: [
+<?php foreach (Utils::$context['board']['moderators'] as $id_member => $member_name): ?>
+				{
+					sItemId: <?= Utils::escapeJavaScript($id_member) ?>,
+					sItemName: <?= Utils::escapeJavaScript($member_name) ?>
+
+				}<?= $id_member == Utils::$context['board']['last_moderator_id'] ? '' : ',' ?>
+
+<?php endforeach; ?>
+			]
+		});
+
+		var oModeratorGroupSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'moderator_groups',
+			sControlId: 'moderator_groups',
+			sSearchType: 'membergroups',
+			bItemList: true,
+			sPostName: 'moderator_group_list',
+			sURLMask: 'action=groups;sa=members;group=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			sItemListContainerId: 'moderator_group_container',
+			aListItems: [
+<?php foreach (Utils::$context['board']['moderator_groups'] as $id_group => $group_name): ?>
+				{
+					sItemId: <?= Utils::escapeJavaScript($id_group) ?>,
+					sItemName: <?= Utils::escapeJavaScript($group_name) ?>
+
+				}<?= $id_group == Utils::$context['board']['last_moderator_group_id'] ? '' : ',' ?>
+
+<?php endforeach; ?>
+			]
+		});
+	</script>
+<?php /* Javascript for deciding what to show. */ ?>
+	<script>
+		function refreshOptions()
+		{
+			var redirect = document.getElementById("redirect_enable");
+			var redirectEnabled = redirect ? redirect.checked : false;
+			var nonDefaultTheme = document.getElementById("boardtheme").value == 0 ? false : true;
+
+			// What to show?
+
+			if(redirectEnabled || !nonDefaultTheme)
+				document.getElementById("override_theme_div").classList.add('hidden');
+			else
+				document.getElementById("override_theme_div").classList.remove('hidden');
+
+			if(redirectEnabled) {
+				document.getElementById("board_theme_div").classList.add('hidden');
+				document.getElementById("count_posts_div").classList.add('hidden');
+			} else {
+				document.getElementById("board_theme_div").classList.remove('hidden');
+				document.getElementById("count_posts_div").classList.remove('hidden');
+			}
+<?php if (!Utils::$context['board']['topics'] && empty(Utils::$context['board']['is_recycle'])): ?>
+			if(redirectEnabled)
+				document.getElementById("redirect_address_div").classList.remove('hidden');
+			else
+				document.getElementById("redirect_address_div").classList.add('hidden');
+<?php if (Utils::$context['board']['redirect']): ?>
+			if(redirectEnabled)
+				document.getElementById("reset_redirect_div").classList.remove('hidden');
+			else
+				document.getElementById("reset_redirect_div").classList.add('hidden');
+<?php endif; ?>
+<?php endif; ?>
+<?php /* Include any JavaScript added by mods using the 'integrate_edit_board' hook. */ ?>
+<?php if (!empty(Utils::$context['custom_refreshOptions']) && is_array(Utils::$context['custom_refreshOptions'])): ?>
+<?php foreach (Utils::$context['custom_refreshOptions'] as $refreshOption): ?>
+			<?= $refreshOption ?>
+
+<?php endforeach; ?>
+<?php endif; ?>
+		}
+		refreshOptions();
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageBoards/modify_category.php b/Themes/default/templates/ManageBoards/modify_category.php
new file mode 100644
index 00000000000..22c498b0379
--- /dev/null
+++ b/Themes/default/templates/ManageBoards/modify_category.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for editing/adding a category on the forum.
+ */
+?><?php /* Print table header. */ ?>
+	<div id="manage_boards">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=cat2" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="cat" value="<?= Utils::$context['category']['id'] ?>">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt(isset(Utils::$context['category']['is_new']) ? 'mboards_new_cat_name' : 'cat_edit', file: 'ManageBoards') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings"><?php /* If this isn't the only category, let the user choose where this category should be positioned down the board index. */ ?><?php if (count(Utils::$context['category_order']) > 1): ?>
+					<dt><strong><?= Lang::getTxt('order', file: 'ManageBoards') ?></strong></dt>
+					<dd>
+						<select name="cat_order"><?php /* Print every existing category into a select box. */ ?><?php foreach (Utils::$context['category_order'] as $order): ?>
+							<option<?= $order['selected'] ? ' selected' : '' ?> value="<?= $order['id'] ?>"><?= $order['name'] ?></option><?php endforeach; ?>
+						</select>
+					</dd><?php endif; ?><?php /* Allow the user to edit the category name and/or choose whether you can collapse the category. */ ?>
+					<dt>
+						<strong><?= Lang::getTxt('full_name', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('name_on_display', file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+						<input type="text" name="cat_name" value="<?= Utils::$context['category']['editable_name'] ?>" size="30">
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('mboards_description', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mboards_cat_description_desc', ['allowed_tags' => implode(', ', Utils::$context['description_allowed_tags'])], file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+						<textarea name="cat_desc" rows="3" cols="35"><?= Utils::$context['category']['description'] ?></textarea>
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('collapse_enable', file: 'ManageBoards') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('collapse_desc', file: 'ManageBoards') ?></span>
+					</dt>
+					<dd>
+						<input type="checkbox" name="collapse"<?= Utils::$context['category']['can_collapse'] ? ' checked' : '' ?>>
+					</dd><?php /* Show any category settings added by mods using the 'integrate_edit_category' hook. */ ?><?php if (!empty(Utils::$context['custom_category_settings']) && is_array(Utils::$context['custom_category_settings'])): ?><?php foreach (Utils::$context['custom_category_settings'] as $catset_id => $catset): ?><?php if (!empty($catset['dt']) && !empty($catset['dd'])): ?>
+					<dt class="clear<?= !is_numeric($catset_id) ? ' catset_' . $catset_id : '' ?>">
+						<?= $catset['dt'] ?>
+					</dt>
+					<dd<?= !is_numeric($catset_id) ? ' class="catset_' . $catset_id . '"' : '' ?>>
+						<?= $catset['dd'] ?>
+					</dd><?php endif; ?><?php endforeach; ?><?php endif; ?><?php /* Table footer. */ ?>
+				</dl><?php if (isset(Utils::$context['category']['is_new'])): ?>
+				<input type="submit" name="add" value="<?= Lang::getTxt('mboards_add_cat_button', file: 'ManageBoards') ?>" onclick="return !isEmptyText(this.form.cat_name);" class="button"><?php else: ?>
+				<input type="submit" name="edit" value="<?= Lang::getTxt('modify', file: 'General') ?>" onclick="return !isEmptyText(this.form.cat_name);" class="button">
+				<input type="submit" name="delete" value="<?= Lang::getTxt('mboards_delete_cat', file: 'ManageBoards') ?>" data-confirm="<?= Lang::getTxt('cat_delete_confirm', file: 'ManageBoards') ?>" class="button you_sure"><?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?php /* If this category is empty we don't bother with the next confirmation screen. */ ?><?php if (Utils::$context['category']['is_empty']): ?>
+				<input type="hidden" name="empty" value="1"><?php endif; ?>
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #manage_boards -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageCalendar/edit_holiday.php b/Themes/default/templates/ManageCalendar/edit_holiday.php
new file mode 100644
index 00000000000..a95bd49985e
--- /dev/null
+++ b/Themes/default/templates/ManageCalendar/edit_holiday.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Editing or adding holidays.
+ */
+?>
+
+<?php /* Show a form for all the holiday information. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=managecalendar;sa=editholiday" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="windowbg"><?php $this->subTemplate('event_options'); ?>
+
+<?php if (Utils::$context['is_new']): ?>
+				<input type="submit" value="<?= Lang::getTxt('holidays_button_add', file: 'ManageCalendar') ?>" class="button">
+<?php else: ?>
+				<input type="submit" name="edit" value="<?= Lang::getTxt('holidays_button_edit', file: 'ManageCalendar') ?>" class="button">
+				<input type="submit" name="delete" value="<?= Lang::getTxt('holidays_button_remove', file: 'ManageCalendar') ?>" class="button">
+				<input type="hidden" name="holiday" value="<?= Utils::$context['event']['id'] ?>">
+<?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-eh_token_var'] ?>" value="<?= Utils::$context['admin-eh_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageCalendar/import.php b/Themes/default/templates/ManageCalendar/import.php
new file mode 100644
index 00000000000..2b56e29dac0
--- /dev/null
+++ b/Themes/default/templates/ManageCalendar/import.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Importing iCalendar data.
+ */
+?><?php /* Show a form for all the holiday information. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=managecalendar;sa=import" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for=""><?= Lang::getTxt('calendar_import_url', file: 'ManageCalendar') ?></label>
+						<br>
+						<span class="smalltext"><?= Lang::getTxt('calendar_import_url_desc', file: 'ManageCalendar') ?></span>
+					</dt>
+					<dd>
+						<input type="url" name="ics_url" id="ics_url">
+					</dd>
+					<dt>
+						<label><?= Lang::getTxt('calendar_import_type', file: 'ManageCalendar') ?></label>
+					</dt>
+					<dd>
+						<label>
+							<input type="radio" name="type" value="holiday" checked>
+							<?= Lang::getTxt('calendar_import_type_holiday', file: 'ManageCalendar') ?>
+						</label>
+						<label>
+							<input type="radio" name="type" value="event">
+							<?= Lang::getTxt('calendar_import_type_event', file: 'ManageCalendar') ?>
+						</label>
+					</dd>
+					<dt>
+						<label><?= Lang::getTxt('calendar_import_subscribe', file: 'ManageCalendar') ?></label>
+						<br>
+						<span class="smalltext"><?= Lang::getTxt('calendar_import_subscribe_desc', file: 'ManageCalendar') ?></span>
+					</dt>
+					<dd>
+						<input type="checkbox" name="subscribe" id="subscribe">
+					</dd>
+				</dl>
+				<input type="submit" name="import" value="<?= Lang::getTxt('calendar_import_button', file: 'ManageCalendar') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-calendarimport_token_var'] ?>" value="<?= Utils::$context['admin-calendarimport_token'] ?>">
+			</div><!-- .windowbg -->
+		</form><?php if (!empty(Utils::$context['calendar_subscriptions'])): ?><?php $this->subTemplate('show_list', ['list_id' => 'calendar_subscriptions']); ?><?php endif; ?>
diff --git a/Themes/default/templates/ManageCalendar/index.php b/Themes/default/templates/ManageCalendar/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageCalendar/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageLanguages/add_language.php b/Themes/default/templates/ManageLanguages/add_language.php
new file mode 100644
index 00000000000..a47c3b7f56b
--- /dev/null
+++ b/Themes/default/templates/ManageLanguages/add_language.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\BrowserDetector;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add a new language
+ *
+ */
+?>
+		<form id="admin_form_wrapper"action="<?= Config::$scripturl ?>?action=admin;area=languages;sa=add;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('add_language', file: 'ManageSettings') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<fieldset>
+					<legend><?= Lang::getTxt('add_language_smf', file: 'ManageSettings') ?></legend>
+					<label class="smalltext"><?= Lang::getTxt('add_language_smf_browse', file: 'ManageSettings') ?></label>
+					<input type="text" name="smf_add" size="40" value="<?= !empty(Utils::$context['smf_search_term']) ? Utils::$context['smf_search_term'] : '' ?>">
+<?php /* Do we have some errors? Too bad. Display a little error box. */ ?>
+<?php if (!empty(Utils::$context['smf_error'])): ?>
+					<div>
+						<br>
+						<p class="errorbox"><?= Lang::getTxt('add_language_error_' . Utils::$context['smf_error'], file: 'ManageSettings') ?></p>
+					</div>
+<?php endif; ?>
+				</fieldset>
+				<?= BrowserDetector::isBrowser('is_ie') ? '<input type="text" name="ie_fix" style="display: none;"> ' : '' ?>
+				<input type="submit" name="smf_add_sub" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button">
+				<br>
+			</div><!-- .windowbg -->
+<?php /* Had some results? */ ?>
+<?php if (!empty(Utils::$context['smf_languages']['rows'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('add_language_found_title', file: 'ManageSettings') ?></h3>
+			</div>
+			<div class="information"><?= Lang::getTxt('add_language_smf_found', file: 'ManageSettings') ?></div><?php $this->subTemplate('show_list', ['list_id' => 'smf_languages']); ?>
+
+<?php endif; ?>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageLanguages/download_language.php b/Themes/default/templates/ManageLanguages/download_language.php
new file mode 100644
index 00000000000..446e4da889c
--- /dev/null
+++ b/Themes/default/templates/ManageLanguages/download_language.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Download a new language file.
+ */
+?><?php /* Actually finished? */ ?><?php if (!empty(Utils::$context['install_complete'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('languages_download_complete', file: 'ManageSettings') ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<?= Utils::$context['install_complete'] ?>
+		</div><?php return; ?><?php endif; ?><?php /* An error? */ ?><?php if (!empty(Utils::$context['error_message'])): ?>
+	<div class="errorbox">
+		<?= Utils::$context['error_message'] ?>
+	</div><?php endif; ?><?php /* Provide something of an introduction... */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=languages;sa=downloadlang;did=<?= Utils::$context['download_id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('languages_download', file: 'ManageSettings') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<p>
+					<?= Lang::getTxt('languages_download_note', file: 'ManageSettings') ?>
+				</p>
+				<div class="smalltext">
+					<?= Lang::getTxt('languages_download_info', file: 'ManageSettings') ?>
+				</div>
+			</div><?php /* Show the main files. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'lang_main_files_list']); ?><?php
+// Do we want some FTP baby?
+// If the files are not writable, we might!
+?><?php if (!empty(Utils::$context['still_not_writable'])): ?><?php if (!empty(Utils::$context['package_ftp']['error'])): ?>
+			<div class="errorbox">
+				<?= Utils::$context['package_ftp']['error'] ?>
+			</div><?php endif; ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('package_ftp_necessary', file: 'Packages') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Lang::getTxt('package_ftp_why', file: 'Packages') ?></p>
+				<dl class="settings">
+					<dt
+						<label for="ftp_server"><?= Lang::getTxt('package_ftp_server', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<div class="floatright">
+							<label for="ftp_port">
+								<?= Lang::getTxt('package_ftp_port', file: 'Packages') ?>
+							</label>
+							<input type="text" size="3" name="ftp_port" id="ftp_port" value="<?= Utils::$context['package_ftp']['port'] ?? (Config::$modSettings['package_port'] ?? '21') ?>">
+						</div>
+						<input type="text" size="30" name="ftp_server" id="ftp_server" value="<?= Utils::$context['package_ftp']['server'] ?? (Config::$modSettings['package_server'] ?? 'localhost') ?>" style="width: 70%;">
+					</dd>
+
+					<dt>
+						<label for="ftp_username"><?= Lang::getTxt('package_ftp_username', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<input type="text" size="50" name="ftp_username" id="ftp_username" value="<?= Utils::$context['package_ftp']['username'] ?? (Config::$modSettings['package_username'] ?? '') ?>">
+					</dd>
+
+					<dt>
+						<label for="ftp_password"><?= Lang::getTxt('package_ftp_password', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<input type="password" size="50" name="ftp_password" id="ftp_password">
+					</dd>
+
+					<dt>
+						<label for="ftp_path"><?= Lang::getTxt('package_ftp_path', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<input type="text" size="50" name="ftp_path" id="ftp_path" value="<?= Utils::$context['package_ftp']['path'] ?>">
+					</dd>
+				</dl>
+			</div><!-- .windowbg --><?php endif; ?><?php /* Install? */ ?>
+			<div class="righttext padding">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-dlang_token_var'] ?>" value="<?= Utils::$context['admin-dlang_token'] ?>">
+				<input type="submit" name="do_install" value="<?= Lang::getTxt('add_language_smf_install', file: 'ManageSettings') ?>" class="button">
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageLanguages/index.php b/Themes/default/templates/ManageLanguages/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageLanguages/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageLanguages/modify_language_entries.php b/Themes/default/templates/ManageLanguages/modify_language_entries.php
new file mode 100644
index 00000000000..0d0cfb1a111
--- /dev/null
+++ b/Themes/default/templates/ManageLanguages/modify_language_entries.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Edit language entries. Note that this doesn't always work because of PHP's max_post_vars setting.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=languages;sa=editlang;lid=<?= Utils::$context['lang_id'] ?>" id="primary_settings" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('edit_languages', file: 'ManageSettings') ?>
+				</h3>
+			</div>
+			<div id="editlang_desc" class="information">
+				<?= Lang::getTxt('edit_language_entries_primary', file: 'ManageSettings') ?>
+			</div>
+<?php /* Not writable? Oops, show an error for ya. */ ?>
+<?php if (!empty(Utils::$context['lang_file_not_writable_message'])): ?>
+			<div class="errorbox">
+				<?= Utils::$context['lang_file_not_writable_message'] ?>
+			</div>
+<?php endif; ?>
+<?php /* Show the language entries */ ?>
+			<div class="windowbg">
+				<fieldset>
+					<legend><?= Utils::$context['primary_settings']['native_name']['value'] ?></legend>
+					<dl class="settings">
+<?php foreach (Utils::$context['primary_settings'] as $setting => $setting_info): ?>
+<?php if ($setting != 'name'): ?>
+						<dt>
+							<a id="settings_<?= $setting ?>_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=languages_<?= $setting_info['label'] ?>" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+							<label for="<?= $setting ?>"><?= Lang::getTxt('languages_' . $setting_info['label'], file: 'ManageSettings') ?>:</label>
+						</dt>
+						<dd>
+							<input type="<?= (is_bool($setting_info['value']) ? 'checkbox' : 'text') ?>" name="<?= $setting ?>" id="<?= $setting_info['label'] ?>" size="20"<?= (is_bool($setting_info['value']) ? (!empty($setting_info['value']) ? ' checked' : '') : ' value="' . $setting_info['value'] . '"') ?><?= (!empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : '') ?> data-orig="<?= (is_bool($setting_info['value']) ? (!empty($setting_info['value']) ? 'true' : 'false') : $setting_info['value']) ?>">
+						</dd>
+<?php endif; ?>
+<?php endforeach; ?>
+					</dl>
+				</fieldset>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-mlang_token_var'] ?>" value="<?= Utils::$context['admin-mlang_token'] ?>">
+				<input type="submit" name="save_main" value="<?= Lang::getTxt('save', file: 'General') ?>"<?= !empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : '' ?> class="button">
+				<input type="reset" id="reset_main" value="<?= Lang::getTxt('reset', file: 'General') ?>" class="button">
+<?php /* Allow deleting entries. The default language and en_US can't go. */ ?>
+<?php if (Utils::$context['can_delete_language']): ?>
+				<input type="submit" name="delete_main" value="<?= Lang::getTxt('delete', file: 'General') ?>"<?= !empty(Utils::$context['lang_file_not_writable_message']) ? ' disabled' : '' ?> data-confirm="<?= Lang::getTxt('languages_delete_confirm', file: 'ManageSettings') ?>" class="button you_sure">
+<?php endif; ?>
+			</div><!-- .windowbg -->
+		</form>
+
+		<form action="<?= Config::$scripturl ?>?action=admin;area=languages;sa=editlang;lid=<?= Utils::$context['lang_id'] ?>;entries" id="entry_form" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('edit_language_entries', file: 'ManageSettings') ?>
+				</h3>
+			</div>
+			<div class="information">
+				<div>
+					<?= Lang::getTxt('edit_language_entries_desc', file: 'ManageSettings') ?>
+				</div>
+				<br>
+				<div id="taskpad" class="floatright">
+					<?= Lang::getTxt('edit_language_entries_file', file: 'ManageSettings') ?>
+					<select name="tfid" onchange="if (this.value != -1) document.forms.entry_form.submit();">
+						<option value="-1">&nbsp;</option>
+<?php foreach (Utils::$context['possible_files'] as $id_theme => $theme): ?>
+						<optgroup label="<?= $theme['name'] ?>">
+<?php foreach ($theme['files'] as $file): ?>
+							<option value="<?= $id_theme ?>+<?= $file['id'] ?>"<?= $file['selected'] ? ' selected' : '' ?>><?= $file['name'] ?></option>
+<?php endforeach; ?>
+						</optgroup>
+<?php endforeach; ?>
+					</select>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['admin-mlang_token_var'] ?>" value="<?= Utils::$context['admin-mlang_token'] ?>">
+					<input type="submit" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button" style="float: none">
+				</div><!-- #taskpad -->
+			</div><!-- .information -->
+<?php /* Is it not writable? Show an error. */ ?>
+<?php if (!empty(Utils::$context['entries_not_writable_message'])): ?>
+			<div class="errorbox">
+				<?= Utils::$context['entries_not_writable_message'] ?>
+			</div>
+<?php endif; ?>
+<?php /* Already have some file entries? */ ?>
+<?php if (!empty(Utils::$context['file_entries'])): ?>
+			<div id="entry_fields" class="windowbg">
+<?php $entry_num = 0; ?>
+<?php foreach (Utils::$context['file_entries'] as $group => $entries): ?>
+				<fieldset>
+					<legend>
+						<a id="settings_language_<?= $group ?>_help" href="<?= Config::$scripturl ?>?action=helpadmin;help=languages_<?= $group ?>" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+						<span><?= Lang::getTxt('languages_' . $group, file: 'ManageSettings') ?></span>
+					</legend>
+					<dl class="settings" id="language_<?= $group ?>">
+<?php foreach ($entries as $entry): ?>
+<?php ++$entry_num; ?>
+						<dt>
+							<span><?= $entry['key'] ?><?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?></span>
+						</dt>
+						<dd id="entry_<?= $entry_num ?>">
+<?php if ($entry['can_remove']): ?>
+							<span style="margin-right: 1ch; white-space: nowrap">
+								<input id="entry_<?= $entry_num ?>_none" class="entry_toggle" type="radio" name="edit[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" value="" data-target="#entry_<?= $entry_num ?>" checked>
+								<label for="entry_<?= $entry_num ?>_none"><?= Lang::getTxt('no_change', file: 'General') ?></label>
+							</span>
+							<span style="margin-right: 1ch; white-space: nowrap">
+								<input id="entry_<?= $entry_num ?>_edit" class="entry_toggle" type="radio" name="edit[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" value="edit" data-target="#entry_<?= $entry_num ?>">
+								<label for="entry_<?= $entry_num ?>_edit"><?= Lang::getTxt('edit', file: 'General') ?></label>
+							</span>
+							<span style="margin-right: 1ch; white-space: nowrap">
+								<input id="entry_<?= $entry_num ?>_remove" class="entry_toggle" type="radio" name="edit[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" value="remove" data-target="#entry_<?= $entry_num ?>">
+								<label for="entry_<?= $entry_num ?>_remove"><?= Lang::getTxt('remove', file: 'General') ?></label>
+							</span>
+<?php else: ?>
+							<input id="entry_<?= $entry_num ?>_edit" class="entry_toggle" type="checkbox" name="edit[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" value="edit" data-target="#entry_<?= $entry_num ?>">
+							<label for="entry_<?= $entry_num ?>_edit"><?= Lang::getTxt('edit', file: 'General') ?></label>
+<?php endif; ?>
+							</span>
+							<input type="hidden" class="entry_oldvalue" name="comp[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" value="<?= $entry['value'] ?>">
+							<textarea name="entry[<?= $entry['key'] ?>]<?= isset($entry['subkey']) ? '[' . $entry['subkey'] . ']' : '' ?>" class="entry_textfield" cols="40" rows="<?= $entry['rows'] < 2 ? 2 : ($entry['rows'] > 25 ? 25 : $entry['rows']) ?>" style="width: 96%; margin-bottom: 2em;"><?= $entry['value'] ?></textarea>
+						</dd>
+<?php endforeach; ?>
+					</dl>
+<?php if (!empty(Utils::$context['can_add_lang_entry'][$group])): ?>
+				<span class="add_lang_entry_button" style="display: none;">
+					<a class="button" href="javascript:void(0);" onclick="add_lang_entry('<?= $group ?>'); return false;"><?= Lang::getTxt('edit_language_entries_add', file: 'ManageSettings') ?></a>
+				</span>
+				<script>
+					entry_num = <?= $entry_num ?>;
+				</script>
+<?php endif; ?>
+				</fieldset>
+<?php endforeach; ?>
+				<input type="submit" name="save_entries" value="<?= Lang::getTxt('save', file: 'General') ?>"<?= !empty(Utils::$context['entries_not_writable_message']) ? ' disabled' : '' ?> class="button">
+			</div><!-- .windowbg -->
+<?php endif; ?>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMail/browse.php b/Themes/default/templates/ManageMail/browse.php
new file mode 100644
index 00000000000..522bbff6989
--- /dev/null
+++ b/Themes/default/templates/ManageMail/browse.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for browsing the mail queue.
+ */
+?>
+	<div id="manage_mail">
+		<div id="mailqueue_stats">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mailqueue_stats', file: 'ManageMail') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt><strong><?= Lang::getTxt('mailqueue_size', file: 'ManageMail') ?></strong></dt>
+					<dd><?= Utils::$context['mail_queue_size'] ?></dd>
+					<dt><strong><?= Lang::getTxt('mailqueue_oldest', file: 'ManageMail') ?></strong></dt>
+					<dd><?= Utils::$context['oldest_mail'] ?></dd>
+				</dl>
+			</div>
+		</div><?php $this->subTemplate('show_list', ['list_id' => 'mail_queue']); ?>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMail/index.php b/Themes/default/templates/ManageMail/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageMail/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageMail/mailtest.php b/Themes/default/templates/ManageMail/mailtest.php
new file mode 100644
index 00000000000..aaceec72814
--- /dev/null
+++ b/Themes/default/templates/ManageMail/mailtest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for testing mail send.
+ */
+?><?php /* The results. */ ?><?php if (!empty(Utils::$context['result'])): ?><?php if (Utils::$context['result'] == 'failure'): ?><?php $result_txt = Lang::getTxt('mailtest_result_failure', ['url' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog;desc'], file: 'ManageMail'); ?><?php else: ?><?php $result_txt = Lang::getTxt('mailtest_result_success', file: 'ManageMail'); ?><?php endif; ?>
+					<div class="<?= Utils::$context['result'] == 'success' ? 'infobox' : 'errorbox' ?>"><?= $result_txt ?></div><?php endif; ?>
+	<form id="admin_form_wrapper" action="<?= Utils::$context['post_url'] ?>" method="post">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('mailtest_header', file: 'ManageMail') ?></h3>
+		</div>
+		<div class="windowbg">
+				<dl id="post_header">
+					<dt><label for="subject" id="caption_subject"><?= Lang::getTxt('subject', file: 'General') ?></label></dt>
+					<dd><input type="text" name="subject" id="subject" size="80" maxlength="80"></dd>
+				</dl>
+				<textarea class="editor" name="message" rows="5" cols="200"></textarea>
+				<dl id="post_footer">
+					<dd><input type="submit" value="<?= Lang::getTxt('send_message', file: 'General') ?>" class="button"></dd>
+				</dl>
+		</div>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/convert_entities.php b/Themes/default/templates/ManageMaintenance/convert_entities.php
new file mode 100644
index 00000000000..f610dbf3fed
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/convert_entities.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for converting entities to UTF-8 characters
+ */
+?>
+	<div id="manage_maintenance">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('entity_convert_title', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('entity_convert_introduction', file: 'ManageMaintenance') ?></p>
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=database;activity=convertentities;start=0;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+			<input type="submit" value="<?= Lang::getTxt('entity_convert_proceed', file: 'ManageMaintenance') ?>" class="button">
+			</form>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/index.php b/Themes/default/templates/ManageMaintenance/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageMaintenance/maintain_above.php b/Themes/default/templates/ManageMaintenance/maintain_above.php
new file mode 100644
index 00000000000..5cd7c5f9aba
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/maintain_above.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Wraps every maintenance sub-action.
+ */
+?>
+	<div id="manage_maintenance"><?php /* If maintenance has finished tell the user. */ ?><?php if (!empty(Utils::$context['maintenance_finished'])): ?>
+		<div class="infobox">
+			<?= Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin') ?>
+		</div><?php endif; ?>
diff --git a/Themes/default/templates/ManageMaintenance/maintain_below.php b/Themes/default/templates/ManageMaintenance/maintain_below.php
new file mode 100644
index 00000000000..5738fd8565a
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/maintain_below.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+?>
+	</div><!-- #manage_maintenance -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/maintain_members.php b/Themes/default/templates/ManageMaintenance/maintain_members.php
new file mode 100644
index 00000000000..9d035dd38e8
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/maintain_members.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for the member maintenance tasks.
+ */
+?>
+	<script>
+		var warningMessage = '';
+		var membersSwap = false;
+
+		function swapMembers()
+		{
+			membersSwap = !membersSwap;
+			var membersForm = document.getElementById('membersForm');
+
+			$("#membersPanel").slideToggle(300);
+
+			document.getElementById("membersIcon").src = smf_images_url + (membersSwap ? "/selected_open.png" : "/selected.png");
+			setInnerHTML(document.getElementById("membersText"), membersSwap ? "<?= Lang::getTxt('maintain_members_choose', file: 'ManageMaintenance') ?>" : "<?= Lang::getTxt('maintain_members_all', file: 'ManageMaintenance') ?>");
+
+			for (var i = 0; i < membersForm.length; i++)
+			{
+				if (membersForm.elements[i].type.toLowerCase() == "checkbox")
+					membersForm.elements[i].checked = !membersSwap;
+			}
+		}
+
+		function checkAttributeValidity()
+		{
+			origText = '<?= Lang::getTxt('reattribute_confirm', file: 'ManageMaintenance') ?>';
+			valid = true;
+
+			// Do all the fields!
+			if (!document.getElementById('to').value)
+				valid = false;
+			warningMessage = origText.replace(/%member_to%/, document.getElementById('to').value);
+
+			if (document.getElementById('type_email').checked)
+			{
+				if (!document.getElementById('from_email').value)
+					valid = false;
+				warningMessage = warningMessage.replace(/%type%/, '<?= addcslashes(Lang::getTxt('reattribute_confirm_email', file: 'ManageMaintenance'), "'") ?>').replace(/%find%/, document.getElementById('from_email').value);
+			}
+			else
+			{
+				if (!document.getElementById('from_name').value)
+					valid = false;
+				warningMessage = warningMessage.replace(/%type%/, '<?= addcslashes(Lang::getTxt('reattribute_confirm_username', file: 'ManageMaintenance'), "'") ?>').replace(/%find%/, document.getElementById('from_name').value);
+			}
+
+			document.getElementById('do_attribute').disabled = valid ? '' : 'disabled';
+
+			setTimeout("checkAttributeValidity();", 500);
+			return valid;
+		}
+		setTimeout("checkAttributeValidity();", 500);
+	</script>
+	<div id="manage_maintenance">
+<?php /* If maintenance has finished, tell the user. */ ?>
+<?php if (!empty(Utils::$context['maintenance_finished'])): ?>
+		<div class="infobox">
+			<?= Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin') ?>
+		</div>
+<?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('maintain_reattribute_posts', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=members;activity=reattribute" method="post" accept-charset="UTF-8">
+				<p><strong><?= Lang::getTxt('reattribute_guest_posts', file: 'ManageMaintenance') ?></strong></p>
+				<dl class="settings">
+					<dt>
+						<label for="type_email"><input type="radio" name="type" id="type_email" value="email" checked><?= Lang::getTxt('reattribute_email', file: 'ManageMaintenance') ?></label>
+					</dt>
+					<dd>
+						<input type="text" name="from_email" id="from_email" value="" onclick="document.getElementById('type_email').checked = 'checked'; document.getElementById('from_name').value = '';">
+					</dd>
+					<dt>
+						<label for="type_name"><input type="radio" name="type" id="type_name" value="name"><?= Lang::getTxt('reattribute_username', file: 'ManageMaintenance') ?></label>
+					</dt>
+					<dd>
+						<input type="text" name="from_name" id="from_name" value="" onclick="document.getElementById('type_name').checked = 'checked'; document.getElementById('from_email').value = '';">
+					</dd>
+				</dl>
+				<dl class="settings">
+					<dt>
+						<label for="to"><strong><?= Lang::getTxt('reattribute_current_member', file: 'ManageMaintenance') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="to" id="to" value="">
+					</dd>
+				</dl>
+				<p class="maintain_members">
+					<input type="checkbox" name="posts" id="posts" checked>
+					<label for="posts"><?= Lang::getTxt('reattribute_increase_posts', file: 'ManageMaintenance') ?></label>
+				</p>
+				<input type="submit" id="do_attribute" value="<?= Lang::getTxt('reattribute', file: 'ManageMaintenance') ?>" onclick="if (!checkAttributeValidity()) return false;
+				return confirm(warningMessage);" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+			</form>
+		</div><!-- .windowbg -->
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=helpadmin;help=maintenance_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('maintain_members', file: 'ManageMaintenance') ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=members;activity=purgeinactive" method="post" accept-charset="UTF-8" id="membersForm">
+				<div class="padding">
+					<a id="membersLink"></a><?= Lang::getTxt(
+						'maintain_members_since',
+						[
+							'input_condition' => '<select name="del_type"><option value="activated" selected>' . Lang::getTxt('maintain_members_activated', file: 'ManageMaintenance') . '</option><option value="logged">' . Lang::getTxt('maintain_members_logged_in', file: 'ManageMaintenance') . '</option></select>',
+							'input_number' => '<input type="number" name="maxdays" value="30" size="3">',
+						],
+						file: 'ManageMaintenance',
+					) ?>
+				</div>
+				<div class="padding">
+<?php if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])): ?>
+					<?= Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile') ?>
+
+<?php else: ?>
+					<label for="anonymize">
+						<input type="checkbox" name="anonymize" id="anonymize" value="1"> <?= Lang::getTxt('deleteAccount_anonymize', file: 'Profile') ?>
+					</label>
+<?php endif; ?>
+				</div>
+				<div class="padding">
+					<a href="#membersLink" onclick="swapMembers();"><img src="<?= Theme::$current->settings['images_url'] ?>/selected.png" alt="+" id="membersIcon"></a> <a href="#membersLink" onclick="swapMembers();" id="membersText" style="font-weight: bold;"><?= Lang::getTxt('maintain_members_all', file: 'ManageMaintenance') ?></a>
+				</div>
+				<div style="display: none;" id="membersPanel">
+<?php foreach (Utils::$context['membergroups'] as $group): ?>
+					<label for="groups<?= $group['id'] ?>"><input type="checkbox" name="groups[<?= $group['id'] ?>]" id="groups<?= $group['id'] ?>" checked> <?= $group['name'] ?></label><br>
+<?php endforeach; ?>
+				</div>
+				<input type="submit" value="<?= Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance') ?>" data-confirm="<?= Lang::getTxt('maintain_members_confirm', file: 'ManageMaintenance') ?>" class="button you_sure">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+			</form>
+		</div><!-- .windowbg -->
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('maintain_recountposts', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=members;activity=recountposts" method="post" accept-charset="UTF-8" id="membersRecountForm">
+				<p><?= Lang::getTxt('maintain_recountposts_info', file: 'ManageMaintenance') ?></p>
+				<input type="submit" value="<?= Lang::getTxt('maintain_run_now', file: 'ManageMaintenance') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+			</form>
+		</div>
+	</div><!-- #manage_maintenance -->
+
+	<script>
+		var oAttributeMemberSuggest = new smc_AutoSuggest({
+			sSelf: 'oAttributeMemberSuggest',
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'attributeMember',
+			sControlId: 'to',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			bItemList: false
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/maintain_options.php b/Themes/default/templates/ManageMaintenance/maintain_options.php
new file mode 100644
index 00000000000..4072e14812a
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/maintain_options.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Lists the tasks of a maintenance sub-action as a single pick-one form.
+ *
+ * Utils::$context['options'] is keyed by activity name. A task can override its
+ * label and description with 'title' and 'info', and add markup after the
+ * description with 'after'.
+ */
+?>
+		<form action="<?= Utils::$context['post_url'] ?>" method="post" accept-charset="UTF-8" class="windowbg option_form">
+<?php foreach (Utils::$context['options'] as $activity => $option): ?>
+			<label>
+				<input type="radio" name="activity" value="<?= $activity ?>">
+				<strong><?= $option['title'] ?? Lang::getTxt('maintain_' . $activity, file: 'ManageMaintenance') ?></strong>
+				<p><?= $option['info'] ?? Lang::getTxt('maintain_' . $activity . '_info', file: 'ManageMaintenance') ?><?= $option['after'] ?? '' ?></p>
+			</label>
+<?php endforeach; ?>
+			<input type="submit" value="<?= Lang::getTxt('maintain_run_now', file: 'ManageMaintenance') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/maintain_topics.php b/Themes/default/templates/ManageMaintenance/maintain_topics.php
new file mode 100644
index 00000000000..cd48a0dfc1a
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/maintain_topics.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for the topic maintenance tasks.
+ */
+?><?php /* If maintenance has finished tell the user. */ ?><?php if (!empty(Utils::$context['maintenance_finished'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('maintain_done', ['task' => Utils::$context['maintenance_finished']], file: 'Admin') ?>
+	</div><?php endif; ?><?php /* Bit of javascript for showing which boards to prune in an otherwise hidden list. */ ?>
+	<script>
+		var rotSwap = false;
+		function swapRot()
+		{
+			rotSwap = !rotSwap;
+
+			// Toggle icon
+			document.getElementById("rotIcon").src = smf_images_url + (rotSwap ? "/selected_open.png" : "/selected.png");
+			setInnerHTML(document.getElementById("rotText"), rotSwap ? <?= Utils::escapeJavaScript(Lang::getTxt('maintain_old_choose', file: 'ManageMaintenance')) ?> : <?= Utils::escapeJavaScript(Lang::getTxt('maintain_old_all', file: 'ManageMaintenance')) ?>);
+
+			// Toggle panel
+			$("#rotPanel").slideToggle(300);
+
+			// Toggle checkboxes
+			var rotPanel = document.getElementById('rotPanel');
+			var oBoardCheckBoxes = rotPanel.getElementsByTagName('input');
+			for (var i = 0; i < oBoardCheckBoxes.length; i++)
+			{
+				if (oBoardCheckBoxes[i].type.toLowerCase() == "checkbox")
+					oBoardCheckBoxes[i].checked = !rotSwap;
+			}
+		}
+	</script>
+	<div id="manage_maintenance">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('maintain_old', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<div class="flow_auto">
+				<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=topics;activity=pruneold" method="post" accept-charset="UTF-8"><?php /* The otherwise hidden "choose which boards to prune". */ ?>
+					<p>
+						<a id="rotLink"></a><?= Lang::getTxt('maintain_old_since_days', ['input_number' => '<input type="number" name="maxdays" value="30" size="3">'], file: 'ManageMaintenance') ?>
+					</p>
+					<p>
+						<label for="delete_type_nothing"><input type="radio" name="delete_type" id="delete_type_nothing" value="nothing"> <?= Lang::getTxt('maintain_old_nothing_else', file: 'ManageMaintenance') ?></label><br>
+						<label for="delete_type_moved"><input type="radio" name="delete_type" id="delete_type_moved" value="moved" checked> <?= Lang::getTxt('maintain_old_are_moved', file: 'ManageMaintenance') ?></label><br>
+						<label for="delete_type_locked"><input type="radio" name="delete_type" id="delete_type_locked" value="locked"> <?= Lang::getTxt('maintain_old_are_locked', file: 'ManageMaintenance') ?></label><br>
+					</p>
+					<p>
+						<label for="delete_old_not_sticky"><input type="checkbox" name="delete_old_not_sticky" id="delete_old_not_sticky" checked> <?= Lang::getTxt('maintain_old_are_not_stickied', file: 'ManageMaintenance') ?></label><br>
+					</p>
+					<p>
+						<a href="#rotLink" onclick="swapRot();"><img src="<?= Theme::$current->settings['images_url'] ?>/selected.png" alt="+" id="rotIcon"></a> <a href="#rotLink" onclick="swapRot();" id="rotText" style="font-weight: bold;"><?= Lang::getTxt('maintain_old_all', file: 'ManageMaintenance') ?></a>
+					</p>
+					<div style="display: none;" id="rotPanel" class="flow_hidden">
+						<div class="floatleft" style="width: 49%"><?php
+// This is the "middle" of the list.
+$middle = ceil(count(Utils::$context['categories']) / 2);
+$i = 0;
+?><?php foreach (Utils::$context['categories'] as $category): ?>
+							<fieldset>
+								<legend><?= $category['name'] ?></legend>
+								<ul><?php /* Display a checkbox with every board. */ ?><?php foreach ($category['boards'] as $board): ?>
+									<li style="margin-inline-start: <?= $board['child_level'] * 1.5 ?>em;">
+										<label for="boards_<?= $board['id'] ?>"><input type="checkbox" name="boards[<?= $board['id'] ?>]" id="boards_<?= $board['id'] ?>" checked><?= $board['name'] ?></label>
+									</li><?php endforeach; ?>
+								</ul>
+							</fieldset><?php /* Increase $i, and check if we're at the middle yet. */ ?><?php if (++$i == $middle): ?>
+						</div><!-- .floatleft -->
+						<div class="floatright" style="width: 49%;"><?php endif; ?><?php endforeach; ?>
+						</div>
+					</div><!-- #rotPanel -->
+					<input type="submit" value="<?= Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance') ?>" data-confirm="<?= Lang::getTxt('maintain_old_confirm', file: 'ManageMaintenance') ?>" class="button you_sure">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+				</form>
+			</div><!-- .flow_auto -->
+		</div><!-- .windowbg -->
+
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('maintain_old_drafts', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=topics;activity=olddrafts" method="post" accept-charset="UTF-8">
+				<p>
+					<?= Lang::getTxt('maintain_old_drafts_days', ['input_number' => '<input type="number" name="draftdays" value="' . (!empty(Config::$modSettings['drafts_keep_days']) ? Config::$modSettings['drafts_keep_days'] : 30) . '" size="3">'], file: 'ManageMaintenance') ?>
+				</p>
+				<input type="submit" value="<?= Lang::getTxt('maintain_old_remove', file: 'ManageMaintenance') ?>" data-confirm="<?= Lang::getTxt('maintain_old_drafts_confirm', file: 'ManageMaintenance') ?>" class="button you_sure">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+			</form>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('move_topics_maintenance', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=maintain;sa=topics;activity=massmove" method="post" accept-charset="UTF-8">
+				<p>
+					<?php
+$board_select = [
+	'<option disabled selected>(' . Lang::getTxt('move_topics_select_board', file: 'ManageMaintenance') . ')</option>',
+];
+?><?php foreach (Utils::$context['categories'] as $category): ?><?php $board_select[] = '<optgroup label="' . $category['name'] . '">'; ?><?php foreach ($category['boards'] as $board): ?><?php $board_select[] = "\t" . '<option value="' . $board['id'] . '"> ' . str_repeat('==', $board['child_level']) . '=&gt;&nbsp;' . $board['name'] . '</option>'; ?><?php endforeach; ?><?php $board_select[] = '</optgroup>'; ?><?php endforeach; ?><?= Lang::getTxt(
+	'move_topics_from',
+	[
+		'old' => '
+						<select name="id_board_from" id="id_board_from">
+							' . implode("\n\t\t\t\t\t\t", $board_select) . '
+						</select>',
+		'new' => '
+						<select name="id_board_to" id="id_board_to">
+							' . implode("\n\t\t\t\t\t\t", $board_select) . '
+						</select>',
+	],
+	file: 'ManageMaintenance',
+) ?>
+				</p>
+				<p>
+					<?= Lang::getTxt('move_topics_older_than', ['input_number' => '<input type="number" name="maxdays" value="30" size="3">'], file: 'ManageMaintenance') ?> (<?= Lang::getTxt('move_zero_all', file: 'ManageMaintenance') ?>)
+				</p>
+				<p>
+					<label for="move_type_locked"><input type="checkbox" name="move_type_locked" id="move_type_locked" checked> <?= Lang::getTxt('move_type_locked', file: 'ManageMaintenance') ?></label><br>
+					<label for="move_type_sticky"><input type="checkbox" name="move_type_sticky" id="move_type_sticky"> <?= Lang::getTxt('move_type_sticky', file: 'ManageMaintenance') ?></label><br>
+				</p>
+				<input type="submit" value="<?= Lang::getTxt('move_topics_now', file: 'ManageMaintenance') ?>" onclick="if (document.getElementById('id_board_from').options[document.getElementById('id_board_from').selectedIndex].disabled || document.getElementById('id_board_from').options[document.getElementById('id_board_to').selectedIndex].disabled) return false; var confirmText = '<?= Lang::getTxt('move_topics_confirm', file: 'ManageMaintenance') ?>'; return confirm(confirmText.replace(/%board_from%/, document.getElementById('id_board_from').options[document.getElementById('id_board_from').selectedIndex].text.replace(/^=+&gt;&nbsp;/, '')).replace(/%board_to%/, document.getElementById('id_board_to').options[document.getElementById('id_board_to').selectedIndex].text.replace(/^=+&gt;&nbsp;/, '')));" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-maint_token_var'] ?>" value="<?= Utils::$context['admin-maint_token'] ?>">
+			</form>
+		</div><!-- .windowbg -->
+	</div><!-- #manage_maintenance -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMaintenance/optimize.php b/Themes/default/templates/ManageMaintenance/optimize.php
new file mode 100644
index 00000000000..ddf8dc89335
--- /dev/null
+++ b/Themes/default/templates/ManageMaintenance/optimize.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Simple template for showing results of our optimization...
+ */
+?>
+	<div id="manage_maintenance">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('maintain_optimize', file: 'ManageMaintenance') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p>
+				<?= Utils::$context['database_numb_tables'] ?><br>
+				<?= Lang::getTxt('database_optimize_attempt', file: 'ManageMaintenance') ?><br>
+<?php /* List each table being optimized... */ ?>
+<?php foreach (Utils::$context['optimized_tables'] as $table): ?>
+				<?= Lang::getTxt('database_optimizing', [$table['name'], round($table['data_freed'], 2)], file: 'ManageMaintenance') ?><br>
+<?php endforeach; ?>
+<?php /* How did we go? */ ?>
+				<br>
+				<?= Utils::$context['num_tables_optimized'] == 0 ? Lang::getTxt('database_already_optimized', file: 'ManageMaintenance') : Utils::$context['num_tables_optimized'] . ' ' . Lang::getTxt('database_optimized', file: 'ManageMaintenance') ?>
+			</p>
+			<p><a href="<?= Config::$scripturl ?>?action=admin;area=maintain"><?= Lang::getTxt('maintain_return', file: 'ManageMaintenance') ?></a></p>
+		</div><!-- .windowbg -->
+	</div><!-- #manage_maintenance -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMembergroups/add_edit_group_boards_list.php b/Themes/default/templates/ManageMembergroups/add_edit_group_boards_list.php
new file mode 100644
index 00000000000..f50880646be
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/add_edit_group_boards_list.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for determining which boards a group has access to.
+ *
+ * @param bool $collapse Whether to collapse the list by default
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['collapse' => true, 'form_id' => 'new_group'], EXTR_SKIP);
+?>
+							<fieldset id="visible_boards"<?= !empty(Config::$modSettings['deny_boards_access']) ? ' class="denyboards_layout"' : '' ?>>
+								<legend><?= Lang::getTxt('membergroups_new_board_desc', file: 'ManageMembers') ?></legend>
+								<ul class="padding floatleft"><?php foreach (Utils::$context['categories'] as $category): ?><?php if (empty(Config::$modSettings['deny_boards_access'])): ?>
+									<li class="category">
+										<a href="javascript:void(0);" onclick="selectBoards([<?= implode(', ', $category['child_ids']) ?>], '<?= $form_id ?>'); return false;"><strong><?= $category['name'] ?></strong></a>
+										<ul><?php else: ?>
+									<li class="category clear">
+										<strong><?= $category['name'] ?></strong>
+										<span class="select_all_box floatright">
+											<em class="all_boards_in_cat"><?= Lang::getTxt('all_boards_in_cat', file: 'Admin') ?></em>
+											<select onchange="select_in_category(<?= $category['id'] ?>, this, [<?= implode(',', array_keys($category['boards'])) ?>]);">
+												<option>---</option>
+												<option value="allow"><?= Lang::getTxt('board_perms_allow', file: 'Admin') ?></option>
+												<option value="ignore"><?= Lang::getTxt('board_perms_ignore', file: 'Admin') ?></option>
+												<option value="deny"><?= Lang::getTxt('board_perms_deny', file: 'Admin') ?></option>
+											</select>
+										</span>
+										<ul id="boards_list_<?= $category['id'] ?>"><?php endif; ?><?php foreach ($category['boards'] as $board): ?><?php if (empty(Config::$modSettings['deny_boards_access'])): ?>
+											<li class="board" style="margin-inline-start: <?= $board['child_level'] ?>em;">
+												<input type="checkbox" name="boardaccess[<?= $board['id'] ?>]" id="brd<?= $board['id'] ?>" value="allow"<?= $board['allow'] ? ' checked' : '' ?>> <label for="brd<?= $board['id'] ?>"><?= $board['name'] ?></label>
+											</li><?php else: ?>
+											<li class="board clear">
+												<span style="margin-inline-start: <?= $board['child_level'] ?>em;"><?= $board['name'] ?>: </span>
+												<span class="floatright">
+													<input type="radio" name="boardaccess[<?= $board['id'] ?>]" id="allow_brd<?= $board['id'] ?>" value="allow"<?= $board['allow'] ? ' checked' : '' ?>> <label for="allow_brd<?= $board['id'] ?>"><?= Lang::getTxt('permissions_option_on', file: 'ManagePermissions') ?></label>
+													<input type="radio" name="boardaccess[<?= $board['id'] ?>]" id="ignore_brd<?= $board['id'] ?>" value="ignore"<?= !$board['allow'] && !$board['deny'] ? ' checked' : '' ?>> <label for="ignore_brd<?= $board['id'] ?>"><?= Lang::getTxt('permissions_option_off', file: 'ManagePermissions') ?></label>
+													<input type="radio" name="boardaccess[<?= $board['id'] ?>]" id="deny_brd<?= $board['id'] ?>" value="deny"<?= $board['deny'] ? ' checked' : '' ?>> <label for="deny_brd<?= $board['id'] ?>"><?= Lang::getTxt('permissions_option_deny', file: 'ManagePermissions') ?></label>
+												</span>
+											</li><?php endif; ?><?php endforeach; ?>
+										</ul>
+									</li><?php endforeach; ?>
+								</ul><?php if (empty(Config::$modSettings['deny_boards_access'])): ?>
+								<br class="clear"><br>
+								<input type="checkbox" id="checkall_check" onclick="invertAll(this, this.form, 'boardaccess');">
+								<label for="checkall_check"><em><?= Lang::getTxt('check_all', file: 'General') ?></em></label>
+							</fieldset><?php else: ?>
+								<br class="clear">
+								<span class="select_all_box">
+									<em><?= Lang::getTxt('all', file: 'General') ?></em>
+									<input type="radio" name="select_all" id="allow_all" onclick="selectAllRadio(this, this.form, 'boardaccess', 'allow');"> <label for="allow_all"><?= Lang::getTxt('board_perms_allow', file: 'Admin') ?></label>
+									<input type="radio" name="select_all" id="ignore_all" onclick="selectAllRadio(this, this.form, 'boardaccess', 'ignore');"> <label for="ignore_all"><?= Lang::getTxt('board_perms_ignore', file: 'Admin') ?></label>
+									<input type="radio" name="select_all" id="deny_all" onclick="selectAllRadio(this, this.form, 'boardaccess', 'deny');"> <label for="deny_all"><?= Lang::getTxt('board_perms_deny', file: 'Admin') ?></label>
+								</span>
+							</fieldset>
+							<script>
+								$(document).ready(function () {
+									$(".select_all_box").each(function () {
+										$(this).removeClass('select_all_box');
+									});
+								});
+							</script><?php endif; ?><?php if ($collapse): ?>
+							<a href="javascript:void(0);" onclick="document.getElementById('visible_boards').classList.remove('hidden'); document.getElementById('visible_boards_link').classList.add('hidden'); return false;" id="visible_boards_link" class="hidden">[ <?= Lang::getTxt('membergroups_select_visible_boards', file: 'ManageMembers') ?> ]</a>
+							<script>
+								document.getElementById("visible_boards_link").classList.remove('hidden');
+								document.getElementById("visible_boards").classList.add('hidden');
+							</script><?php endif; ?>
diff --git a/Themes/default/templates/ManageMembergroups/edit_group.php b/Themes/default/templates/ManageMembergroups/edit_group.php
new file mode 100644
index 00000000000..5ffaa2ca22f
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/edit_group.php
@@ -0,0 +1,219 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Edit an existing membergroup.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=membergroups;sa=edit;group=<?= Utils::$context['group']['id'] ?>" method="post" accept-charset="UTF-8" name="groupForm" id="groupForm">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('membergroups_edit_group', ['name' => Utils::$context['group']['name']], file: 'ManageMembers') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for="group_name_input"><strong><?= Lang::getTxt('membergroups_edit_name', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="group_name" id="group_name_input" value="<?= Utils::$context['group']['editable_name'] ?>" size="30">
+					</dd><?php if (Utils::$context['group']['id'] != 3 && Utils::$context['group']['id'] != 4): ?>
+					<dt id="group_desc_text">
+						<label for="group_desc_input"><strong><?= Lang::getTxt('membergroups_edit_desc', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<textarea name="group_desc" id="group_desc_input" rows="4" cols="40"><?= Utils::$context['group']['description'] ?></textarea>
+					</dd><?php endif; ?><?php /* Group type... */ ?><?php if (Utils::$context['group']['can_change_type']): ?>
+					<dt>
+						<label for="group_type"><strong><?= Lang::getTxt('membergroups_edit_group_type', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<fieldset id="group_type">
+							<legend><?= Lang::getTxt('membergroups_edit_select_group_type', file: 'ManageMembers') ?></legend>
+							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0"<?= !Utils::$context['group']['is_post_group'] && Utils::$context['group']['type'] == 0 ? ' checked' : '' ?><?= (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : '') ?>><?= Lang::getTxt('membergroups_group_type_private', file: 'ManageMembers') ?></label><br><?php if (Utils::$context['group']['allow_protected']): ?>
+							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1"<?= Utils::$context['group']['type'] == 1 ? ' checked' : '' ?><?= (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : '') ?>><?= Lang::getTxt('membergroups_group_type_protected', file: 'ManageMembers') ?></label><br><?php endif; ?>
+							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2"<?= Utils::$context['group']['type'] == 2 ? ' checked' : '' ?><?= (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : '') ?>><?= Lang::getTxt('membergroups_group_type_request', file: 'ManageMembers') ?></label><br>
+							<label for="group_type_free"><input type="radio" name="group_type" id="group_type_free" value="3"<?= Utils::$context['group']['type'] == 3 ? ' checked' : '' ?><?= (Utils::$context['group']['allow_post_group'] ? ' onclick="swapPostGroup(0);"' : '') ?>><?= Lang::getTxt('membergroups_group_type_free', file: 'ManageMembers') ?></label><br><?php if (Utils::$context['group']['allow_post_group']): ?>
+
+
+							<label for="group_type_post"><input type="radio" name="group_type" id="group_type_post" value="-1"<?= Utils::$context['group']['is_post_group'] ? ' checked' : '' ?> onclick="swapPostGroup(1);"><?= Lang::getTxt('membergroups_group_type_post', file: 'ManageMembers') ?></label><br><?php endif; ?>
+						</fieldset>
+					</dd><?php endif; ?><?php if (Utils::$context['group']['id'] != 3 && Utils::$context['group']['id'] != 4): ?>
+					<dt id="group_moderators_text">
+						<label for="group_moderators"><strong><?= Lang::getTxt('moderators', file: 'General') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="group_moderators" id="group_moderators" value="<?= Utils::$context['group']['moderator_list'] ?>" size="30">
+						<div id="moderator_container"></div>
+					</dd>
+					<dt id="group_hidden_text">
+						<label for="group_hidden_input"><strong><?= Lang::getTxt('membergroups_edit_hidden', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<select name="group_hidden" id="group_hidden_input" onchange="if (this.value == 2 &amp;&amp; !confirm('<?= Lang::getTxt('membergroups_edit_hidden_warning', file: 'ManageMembers') ?>')) this.value = 0;">
+							<option value="0"<?= Utils::$context['group']['hidden'] ? '' : ' selected' ?>><?= Lang::getTxt('membergroups_edit_hidden_no', file: 'ManageMembers') ?></option>
+							<option value="1"<?= Utils::$context['group']['hidden'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('membergroups_edit_hidden_boardindex', file: 'ManageMembers') ?></option>
+							<option value="2"<?= Utils::$context['group']['hidden'] == 2 ? ' selected' : '' ?>><?= Lang::getTxt('membergroups_edit_hidden_all', file: 'ManageMembers') ?></option>
+						</select>
+					</dd><?php endif; ?><?php /* Can they inherit permissions? */ ?><?php if (Utils::$context['group']['id'] > 1 && Utils::$context['group']['id'] != 3): ?>
+					<dt id="group_inherit_text">
+						<label for="group_inherit_input"><strong><?= Lang::getTxt('membergroups_edit_inherit_permissions', file: 'ManageMembers') ?></strong></label><br>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_edit_inherit_permissions_desc', file: 'ManageMembers') ?></span>
+					</dt>
+					<dd>
+						<select name="group_inherit" id="group_inherit_input">
+							<option value="-2"><?= Lang::getTxt('membergroups_edit_inherit_permissions_no', file: 'ManageMembers') ?></option>
+							<option value="-1"<?= Utils::$context['group']['inherited_from'] == -1 ? ' selected' : '' ?>><?= Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => Lang::getTxt('membergroups_guests', file: 'Admin')]) ?></option>
+							<option value="0"<?= Utils::$context['group']['inherited_from'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => Lang::getTxt('membergroups_members', file: 'Admin')]) ?></option><?php /* For all the inheritable groups show an option. */ ?><?php foreach (Utils::$context['inheritable_groups'] as $id => $group): ?>
+							<option value="<?= $id ?>"<?= Utils::$context['group']['inherited_from'] == $id ? ' selected' : '' ?>><?= Lang::getTxt('membergroups_edit_inherit_permissions_from', ['group' => $group], file: 'ManageMembers') ?></option><?php endforeach; ?>
+						</select>
+						<input type="hidden" name="old_inherit" value="<?= Utils::$context['group']['inherited_from'] ?>">
+					</dd><?php endif; ?><?php if (Utils::$context['group']['allow_post_group']): ?>
+
+
+					<dt id="min_posts_text">
+						<label for="min_posts_input"><strong><?= Lang::getTxt('membergroups_min_posts', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="number" name="min_posts" id="min_posts_input"<?= Utils::$context['group']['is_post_group'] ? ' value="' . Utils::$context['group']['min_posts'] . '"' : '' ?> size="6">
+					</dd><?php endif; ?>
+					<dt>
+						<label for="online_color_input"><strong><?= Lang::getTxt('membergroups_online_color', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="online_color" id="online_color_input" value="<?= Utils::$context['group']['color'] ?>" size="20">
+					</dd>
+					<dt>
+						<label for="icon_count_input"><strong><?= Lang::getTxt('membergroups_icon_count', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="number" name="icon_count" id="icon_count_input" value="<?= Utils::$context['group']['icon_count'] ?>" size="4">
+					</dd><?php /* Do we have any possible icons to select from? */ ?><?php if (!empty(Utils::$context['possible_icons'])): ?>
+					<dt>
+						<label for="icon_image_input"><strong><?= Lang::getTxt('membergroups_icon_image', file: 'ManageMembers') ?></strong></label><br>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_icon_image_note', file: 'ManageMembers') ?></span>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_icon_image_size', file: 'ManageMembers') ?></span>
+					</dt>
+					<dd>
+						<?= Lang::getTxt('membergroups_images_url', file: 'ManageMembers') ?>
+						<select name="icon_image" id="icon_image_input"><?php /* For every possible icon, create an option. */ ?><?php foreach (Utils::$context['possible_icons'] as $icon): ?>
+							<option value="<?= $icon ?>"<?= Utils::$context['group']['icon_image'] == $icon ? ' selected' : '' ?>><?= $icon ?></option><?php endforeach; ?>
+						</select>
+						<img id="icon_preview" src="" alt="*">
+					</dd><?php /* No? Hide the entire control. */ ?><?php else: ?>
+					<input type="hidden" name="icon_image" value=""><?php endif; ?>
+					<dt>
+						<label for="max_messages_input"><strong><?= Lang::getTxt('membergroups_max_messages', file: 'ManageMembers') ?></strong></label><br>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_max_messages_note', file: 'ManageMembers') ?></span>
+					</dt>
+					<dd>
+						<input type="text" name="max_messages" id="max_messages_input" value="<?= Utils::$context['group']['id'] == 1 ? 0 : Utils::$context['group']['max_messages'] ?>" size="6"<?= Utils::$context['group']['id'] == 1 ? ' disabled' : '' ?>>
+					</dd><?php /* Force 2FA for this membergroup? */ ?><?php if (!empty(Config::$modSettings['tfa_mode']) && Config::$modSettings['tfa_mode'] == 2): ?>
+					<dt>
+						<label for="group_tfa_force_input"><strong><?= Lang::getTxt('membergroups_tfa_force', file: 'ManageMembers') ?></strong></label><br>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_tfa_force_note', file: 'ManageMembers') ?></span>
+					</dt>
+					<dd>
+						<input type="checkbox" name="group_tfa_force"<?= Utils::$context['group']['tfa_required'] ? ' checked' : '' ?>>
+					</dd><?php endif; ?><?php if (!empty(Utils::$context['categories'])): ?>
+					<dt>
+						<strong><?= Lang::getTxt('membergroups_new_board', file: 'ManageMembers') ?></strong><?= Utils::$context['group']['is_post_group'] ? '<br>
+						<span class="smalltext">' . Lang::getTxt('membergroups_new_board_post_groups', file: 'ManageMembers') . '</span>' : '' ?>
+					</dt>
+					<dd><?php if (!empty(Utils::$context['can_manage_boards'])): ?><?= Lang::getTxt('membergroups_can_manage_access', file: 'ManageMembers') ?><?php else: ?><?php $this->subTemplate('add_edit_group_boards_list', ['collapse' => true, 'form_id' => 'groupForm']); ?><?php endif; ?>
+					</dd><?php endif; ?>
+				</dl>
+				<input type="submit" name="save" value="<?= Lang::getTxt('membergroups_edit_save', file: 'ManageMembers') ?>" class="button"><?= Utils::$context['group']['allow_delete'] ? '
+				<input type="submit" name="delete" value="' . Lang::getTxt('membergroups_delete', file: 'ManageMembers') . '" data-confirm="' . Lang::getTxt(Utils::$context['is_moderator_group'] ? 'membergroups_confirm_delete_mod' : 'membergroups_confirm_delete', file: 'ManageMembers') . '" class="button you_sure">' : '' ?>
+			</div><!-- .windowbg -->
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-mmg_token_var'] ?>" value="<?= Utils::$context['admin-mmg_token'] ?>">
+		</form>
+	<script>
+		var oModeratorSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'group_moderators',
+			sControlId: 'group_moderators',
+			sSearchType: 'member',
+			bItemList: true,
+			sPostName: 'moderator_list',
+			sURLMask: 'action=profile;u=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			sItemListContainerId: 'moderator_container',
+			aListItems: [<?php foreach (Utils::$context['group']['moderators'] as $id_member => $member_name): ?>
+
+				{
+					sItemId: <?= Utils::escapeJavaScript($id_member) ?>,
+					sItemName: <?= Utils::escapeJavaScript($member_name) ?>
+
+				}<?= $id_member == Utils::$context['group']['last_moderator_id'] ? '' : ',' ?><?php endforeach; ?>
+
+			]
+		});
+	</script><?php if (Utils::$context['group']['allow_post_group']): ?>
+	<script>
+		function swapPostGroup(isChecked)
+		{
+			var is_moderator_group = <?= (int) Utils::$context['is_moderator_group'] ?>;
+			var group_type = <?= Utils::$context['group']['type'] ?>;
+			var min_posts_text = document.getElementById('min_posts_text');
+			var group_desc_text = document.getElementById('group_desc_text');
+			var group_hidden_text = document.getElementById('group_hidden_text');
+			var group_moderators_text = document.getElementById('group_moderators_text');
+
+			// If it's a moderator group, warn of possible problems... and remember the group type
+			if (isChecked && is_moderator_group && !confirm('<?= Lang::getTxt('membergroups_swap_mod', file: 'ManageMembers') ?>'))
+			{
+				isChecked = false;
+
+				switch(group_type)
+				{
+					case 0:
+						document.getElementById('group_type_private').checked = true;
+						break;
+					case 1:
+						document.getElementById('group_type_protected').checked = true;
+						break;
+					case 2:
+						document.getElementById('group_type_request').checked = true;
+						break;
+					case 3:
+						document.getElementById('group_type_free').checked = true;
+						break;
+					default:
+						document.getElementById('group_type_private').checked = true;
+						break;
+				}
+			}
+
+			document.forms.groupForm.min_posts.disabled = !isChecked;
+			min_posts_text.style.color = isChecked ? "" : "#888888";
+			document.forms.groupForm.group_desc_input.disabled = isChecked;
+			group_desc_text.style.color = !isChecked ? "" : "#888888";
+			document.forms.groupForm.group_hidden_input.disabled = isChecked;
+			group_hidden_text.style.color = !isChecked ? "" : "#888888";
+			document.forms.groupForm.group_moderators.disabled = isChecked;
+			group_moderators_text.style.color = !isChecked ? "" : "#888888";
+		}
+
+		swapPostGroup(<?= Utils::$context['group']['is_post_group'] ? 'true' : 'false' ?>);
+	</script><?php endif; ?>
diff --git a/Themes/default/templates/ManageMembergroups/group_members.php b/Themes/default/templates/ManageMembergroups/group_members.php
new file mode 100644
index 00000000000..fe288c46ead
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/group_members.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for viewing the members of a group.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;group=<?= Utils::$context['group']['id'] ?>" method="post" accept-charset="UTF-8" id="view_group">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('name', file: 'General') ?></strong>
+					</dt>
+					<dd>
+						<span <?= Utils::$context['group']['online_color'] ? 'style="color: ' . Utils::$context['group']['online_color'] . ';"' : '' ?>><?= Utils::$context['group']['name'] ?></span> <?= Utils::$context['group']['icons'] ?>
+					</dd><?php /* Any description to show? */ ?><?php if (!empty(Utils::$context['group']['description'])): ?>
+					<dt>
+						<strong><?= Lang::getTxt('membergroups_members_description', file: 'ManageMembers') ?></strong>
+					</dt>
+					<dd>
+						<?= Utils::$context['group']['description'] ?>
+					</dd><?php endif; ?>
+					<dt>
+						<strong><?= Lang::getTxt('membergroups_members_top', file: 'ManageMembers') ?></strong>
+					</dt>
+					<dd>
+						<?= Utils::$context['total_members'] ?>
+					</dd><?php /* Any group moderators to show? */ ?><?php if (!empty(Utils::$context['group']['moderators'])): ?><?php $moderators = []; ?><?php foreach (Utils::$context['group']['moderators'] as $moderator): ?><?php $moderators[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $moderator['id'] . '">' . $moderator['name'] . '</a>'; ?><?php endforeach; ?>
+					<dt>
+						<strong><?= Lang::getTxt('membergroups_members_group_moderators', file: 'ManageMembers') ?></strong>
+					</dt>
+					<dd>
+						<?= implode(', ', $moderators) ?>
+					</dd><?php endif; ?>
+				</dl>
+			</div><!-- .windowbg -->
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('membergroups_members_group_members', file: 'ManageMembers') ?></h3>
+			</div>
+			<br>
+			<div class="pagesection">
+				<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+			</div>
+			<table class="table_grid" id="group_members">
+				<thead>
+					<tr class="title_bar">
+						<th class="user_name"><a href="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;start=<?= Utils::$context['start'] ?>;sort=name<?= Utils::$context['sort_by'] == 'name' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?>;group=<?= Utils::$context['group']['id'] ?>"><?= Lang::getTxt('name', file: 'General') ?><?= Utils::$context['sort_by'] == 'name' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th><?php if (Utils::$context['can_send_email']): ?>
+						<th class="email"><a href="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;start=<?= Utils::$context['start'] ?>;sort=email<?= Utils::$context['sort_by'] == 'email' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?>;group=<?= Utils::$context['group']['id'] ?>"><?= Lang::getTxt('email', file: 'General') ?><?= Utils::$context['sort_by'] == 'email' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th><?php endif; ?>
+						<th class="last_active"><a href="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;start=<?= Utils::$context['start'] ?>;sort=active<?= Utils::$context['sort_by'] == 'active' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?>;group=<?= Utils::$context['group']['id'] ?>"><?= Lang::getTxt('membergroups_members_last_active', file: 'ManageMembers') ?><?= Utils::$context['sort_by'] == 'active' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th>
+						<th class="date_registered"><a href="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;start=<?= Utils::$context['start'] ?>;sort=registered<?= Utils::$context['sort_by'] == 'registered' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?>;group=<?= Utils::$context['group']['id'] ?>"><?= Lang::getTxt('date_registered', file: 'General') ?><?= Utils::$context['sort_by'] == 'registered' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th>
+						<th class="posts"<?= empty(Utils::$context['can_add_remove']) ? ' colspan="2"' : '' ?>>
+							<a href="<?= Config::$scripturl ?>?action=<?= Utils::$context['current_action'] ?><?= (isset(Utils::$context['admin_area']) ? ';area=' . Utils::$context['admin_area'] : '') ?>;sa=members;start=<?= Utils::$context['start'] ?>;sort=posts<?= Utils::$context['sort_by'] == 'posts' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?>;group=<?= Utils::$context['group']['id'] ?>"><?= Lang::getTxt('posts', file: 'General') ?><?= Utils::$context['sort_by'] == 'posts' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a>
+						</th><?php if (!empty(Utils::$context['can_add_remove'])): ?>
+						<th class="quick_moderation" style="width: 4%"><input type="checkbox" onclick="invertAll(this, this.form);"></th><?php endif; ?>
+					</tr>
+				</thead>
+				<tbody><?php if (empty(Utils::$context['members'])): ?>
+					<tr class="windowbg">
+						<td colspan="6"><?= Lang::getTxt('membergroups_members_no_members', file: 'ManageMembers') ?></td>
+					</tr><?php endif; ?><?php foreach (Utils::$context['members'] as $member): ?>
+					<tr class="windowbg">
+						<td class="user_name"><?= $member['link'] ?></td><?php if (Utils::$context['can_send_email']): ?>
+						<td class="email">
+								<a href="mailto:<?= $member['email'] ?>"><?= $member['email'] ?></a>
+						</td><?php endif; ?>
+						<td class="last_active"><?= $member['last_login'] ?></td>
+						<td class="date_registered"><?= $member['registered'] ?></td>
+						<td class="posts"<?= empty(Utils::$context['can_add_remove']) ? ' colspan="2"' : '' ?>><?= $member['posts'] ?></td><?php if (!empty(Utils::$context['can_add_remove'])): ?>
+						<td class="quick_moderation" style="width: 4%"><input type="checkbox" name="rem[]" value="<?= $member['id'] ?>" <?= (User::$me->id == $member['id'] && Utils::$context['group']['id'] == 1 ? 'onclick="if (this.checked) return confirm(\'' . Lang::getTxt('membergroups_members_deadmin_confirm', file: 'ManageMembers') . '\')" ' : '') ?>/></td><?php endif; ?>
+					</tr><?php endforeach; ?>
+				</tbody>
+			</table><?php if (!empty(Utils::$context['can_add_remove'])): ?>
+			<div class="floatright">
+				<input type="submit" name="remove" value="<?= Lang::getTxt('membergroups_members_remove', file: 'ManageMembers') ?>" class="button ">
+			</div><?php endif; ?>
+			<div class="pagesection">
+				<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+			</div>
+			<br><?php if (!empty(Utils::$context['can_add_remove'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('membergroups_members_add_title', file: 'ManageMembers') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<strong><label for="toAdd"><?= Lang::getTxt('membergroups_members_add_desc', file: 'ManageMembers') ?></label></strong>
+					</dt>
+					<dd>
+						<input type="text" name="toAdd" id="toAdd" value="">
+						<div id="toAddItemContainer"></div>
+					</dd>
+				</dl>
+				<input type="submit" name="add" value="<?= Lang::getTxt('membergroups_members_add', file: 'ManageMembers') ?>" class="button">
+			</div><?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['mod-mgm_token_var'] ?>" value="<?= Utils::$context['mod-mgm_token'] ?>">
+		</form><?php if (!empty(Utils::$context['can_add_remove'])): ?>
+	<script>
+		var oAddMemberSuggest = new smc_AutoSuggest({
+			sSessionId: '<?= Utils::$context['session_id'] ?>',
+			sSessionVar: '<?= Utils::$context['session_var'] ?>',
+			sSuggestId: 'to_suggest',
+			sControlId: 'toAdd',
+			sSearchType: 'member',
+			sPostName: 'member_add',
+			sURLMask: 'action=profile;u=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			bItemList: true,
+			sItemListContainerId: 'toAddItemContainer'
+		});
+	</script><?php endif; ?>
diff --git a/Themes/default/templates/ManageMembergroups/group_request_reason.php b/Themes/default/templates/ManageMembergroups/group_request_reason.php
new file mode 100644
index 00000000000..2e492eea7f2
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/group_request_reason.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Allow the moderator to enter a reason to each user being rejected.
+ */
+?>
+
+<?php /* Show a welcome message to the user. */ ?>
+	<div id="moderationcenter">
+		<form action="<?= Config::$scripturl ?>?action=groups;sa=requests" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_groups_reason_title', file: 'ModerationCenter') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings"><?php /* Loop through and print out a reason box for each... */ ?>
+
+<?php foreach (Utils::$context['group_requests'] as $request): ?>
+					<dt>
+						<strong><?= Lang::getTxt('mc_groupr_reason_desc', $request, file: 'ModerationCenter') ?>:</strong>
+					</dt>
+					<dd>
+						<input type="hidden" name="groupr[]" value="<?= $request['id'] ?>">
+						<textarea name="groupreason[<?= $request['id'] ?>]" rows="3" cols="40"></textarea>
+					</dd>
+<?php endforeach; ?>
+				</dl>
+				<input type="submit" name="go" value="<?= Lang::getTxt('mc_groupr_submit', file: 'ModerationCenter') ?>" class="button">
+				<input type="hidden" name="req_action" value="got_reason">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['mod-gr_token_var'] ?>" value="<?= Utils::$context['mod-gr_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #moderationcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMembergroups/index.php b/Themes/default/templates/ManageMembergroups/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageMembergroups/main.php b/Themes/default/templates/ManageMembergroups/main.php
new file mode 100644
index 00000000000..a2779c539ec
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/main.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main page listing all the groups.
+ */
+?><?php $this->subTemplate('show_list', ['list_id' => 'regular_membergroups_list']); ?><br><br><?php $this->subTemplate('show_list', ['list_id' => 'post_count_membergroups_list']); ?>
diff --git a/Themes/default/templates/ManageMembergroups/new_group.php b/Themes/default/templates/ManageMembergroups/new_group.php
new file mode 100644
index 00000000000..173efecc6f7
--- /dev/null
+++ b/Themes/default/templates/ManageMembergroups/new_group.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add a new membergroup.
+ */
+?>
+		<form id="new_group" action="<?= Config::$scripturl ?>?action=admin;area=membergroups;sa=add" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('membergroups_new_group', file: 'Admin') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for="group_name_input"><strong><?= Lang::getTxt('membergroups_group_name', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="group_name" id="group_name_input" size="30">
+					</dd>
+<?php if (Utils::$context['undefined_group']): ?>
+					<dt>
+						<label for="group_type"><strong><?= Lang::getTxt('membergroups_edit_group_type', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<fieldset id="group_type">
+							<legend><?= Lang::getTxt('membergroups_edit_select_group_type', file: 'ManageMembers') ?></legend>
+							<label for="group_type_private"><input type="radio" name="group_type" id="group_type_private" value="0" checked onclick="swapPostGroup(0);"><?= Lang::getTxt('membergroups_group_type_private', file: 'ManageMembers') ?></label><br>
+<?php if (Utils::$context['allow_protected']): ?>
+							<label for="group_type_protected"><input type="radio" name="group_type" id="group_type_protected" value="1" onclick="swapPostGroup(0);"><?= Lang::getTxt('membergroups_group_type_protected', file: 'ManageMembers') ?></label><br>
+<?php endif; ?>
+							<label for="group_type_request"><input type="radio" name="group_type" id="group_type_request" value="2" onclick="swapPostGroup(0);"><?= Lang::getTxt('membergroups_group_type_request', file: 'ManageMembers') ?></label><br>
+							<label for="group_type_free"><input type="radio" name="group_type" id="group_type_free" value="3" onclick="swapPostGroup(0);"><?= Lang::getTxt('membergroups_group_type_free', file: 'ManageMembers') ?></label><br>
+							<label for="group_type_post"><input type="radio" name="group_type" id="group_type_post" value="-1" onclick="swapPostGroup(1);"><?= Lang::getTxt('membergroups_group_type_post', file: 'ManageMembers') ?></label><br>
+						</fieldset>
+					</dd>
+<?php endif; ?>
+<?php if (Utils::$context['post_group'] || Utils::$context['undefined_group']): ?>
+					<dt id="min_posts_text">
+						<label for="min_posts_input"><strong><?= Lang::getTxt('membergroups_min_posts', file: 'ManageMembers') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="number" name="min_posts" id="min_posts_input" size="5">
+					</dd>
+<?php endif; ?>
+<?php if (!Utils::$context['post_group'] || !empty(Config::$modSettings['permission_enable_postgroups'])): ?>
+					<dt>
+						<label for="permission_base"><strong><?= Lang::getTxt('membergroups_permissions', file: 'Admin') ?></strong></label><br>
+						<span class="smalltext"><?= Lang::getTxt('membergroups_can_edit_later', file: 'ManageMembers') ?></span>
+					</dt>
+					<dd>
+						<fieldset id="permission_base">
+							<legend><?= Lang::getTxt('membergroups_select_permission_type', file: 'ManageMembers') ?></legend>
+							<input type="radio" name="perm_type" id="perm_type_inherit" value="inherit" checked>
+							<label for="perm_type_inherit"><?= Lang::getTxt('membergroups_new_as_inherit', file: 'ManageMembers') ?></label>
+							<select name="inheritperm" id="inheritperm_select" onclick="document.getElementById('perm_type_inherit').checked = true;">
+								<option value="-1"><?= Lang::getTxt('membergroups_guests', file: 'Admin') ?></option>
+								<option value="0" selected><?= Lang::getTxt('membergroups_members', file: 'Admin') ?></option>
+<?php foreach (Utils::$context['groups'] as $group): ?>
+								<option value="<?= $group['id'] ?>"><?= $group['name'] ?></option>
+<?php endforeach; ?>
+							</select>
+							<br>
+							<input type="radio" name="perm_type" id="perm_type_copy" value="copy">
+							<label for="perm_type_copy"><?= Lang::getTxt('membergroups_new_as_copy', file: 'ManageMembers') ?></label>
+							<select name="copyperm" id="copyperm_select" onclick="document.getElementById('perm_type_copy').checked = true;">
+								<option value="-1"><?= Lang::getTxt('membergroups_guests', file: 'Admin') ?></option>
+								<option value="0" selected><?= Lang::getTxt('membergroups_members', file: 'Admin') ?></option>
+<?php foreach (Utils::$context['groups'] as $group): ?>
+								<option value="<?= $group['id'] ?>"><?= $group['name'] ?></option>
+<?php endforeach; ?>
+							</select>
+							<br>
+							<input type="radio" name="perm_type" id="perm_type_predefined" value="predefined">
+							<label for="perm_type_predefined"><?= Lang::getTxt('membergroups_new_as_type', file: 'ManageMembers') ?></label>
+							<select name="level" id="level_select" onclick="document.getElementById('perm_type_predefined').checked = true;">
+								<option value="restrict"><?= Lang::getTxt('permitgroups_restrict', file: 'Admin') ?></option>
+								<option value="standard" selected><?= Lang::getTxt('permitgroups_standard', file: 'Admin') ?></option>
+								<option value="moderator"><?= Lang::getTxt('permitgroups_moderator', file: 'Admin') ?></option>
+								<option value="maintenance"><?= Lang::getTxt('permitgroups_maintenance', file: 'Admin') ?></option>
+							</select>
+						</fieldset>
+					</dd>
+<?php endif; ?>
+					<dt>
+						<strong><?= Lang::getTxt('membergroups_new_board', file: 'ManageMembers') ?></strong><?= Utils::$context['post_group'] ? '<br>
+						<span class="smalltext">' . Lang::getTxt('membergroups_new_board_post_groups', file: 'ManageMembers') . '</span>' : '' ?>
+					</dt>
+					<dd><?php $this->subTemplate('add_edit_group_boards_list', ['collapse' => false]); ?>
+					</dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('membergroups_add_group', file: 'Admin') ?>" class="button">
+			</div><!-- .windowbg -->
+<?php if (Utils::$context['undefined_group']): ?>
+			<script>
+				function swapPostGroup(isChecked)
+				{
+					var min_posts_text = document.getElementById('min_posts_text');
+					document.getElementById('min_posts_input').disabled = !isChecked;
+					min_posts_text.style.color = isChecked ? "" : "#888888";
+				}
+				swapPostGroup(<?= Utils::$context['post_group'] ? 'true' : 'false' ?>);
+			</script>
+<?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-mmg_token_var'] ?>" value="<?= Utils::$context['admin-mmg_token'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageMembers/admin_browse.php b/Themes/default/templates/ManageMembers/admin_browse.php
new file mode 100644
index 00000000000..39e55667fe8
--- /dev/null
+++ b/Themes/default/templates/ManageMembers/admin_browse.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The admin member list.
+ */
+?><?php $this->subTemplate('show_list', ['list_id' => 'approve_list']); ?><?php /* If we have lots of outstanding members try to make the admin's life easier. */ ?><?php if (Utils::$context['approve_list']['total_num_items'] > -1): ?><?php Utils::$context['browse_type'] = 'activate'; ?>
+		<br>
+		<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=viewmembers" method="post" accept-charset="UTF-8" name="postFormOutstanding" id="postFormOutstanding" onsubmit="return onOutstandingSubmit();">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('admin_browse_outstanding', file: 'ManageMembers') ?></h3>
+			</div>
+			<script>
+				function onOutstandingSubmit()
+				{
+					if (document.forms.postFormOutstanding.todo.value == "")
+						return;
+
+					var message = "";
+					if (document.forms.postFormOutstanding.todo.value.indexOf("delete") != -1)
+						message = "<?= Lang::getTxt('admin_browse_w_delete', file: 'ManageMembers') ?>";
+					else if (document.forms.postFormOutstanding.todo.value.indexOf("reject") != -1)
+						message = "<?= Lang::getTxt('admin_browse_w_reject', file: 'ManageMembers') ?>";
+					else if (document.forms.postFormOutstanding.todo.value == "remind")
+						message = "<?= Lang::getTxt('admin_browse_w_remind', file: 'ManageMembers') ?>";
+					else
+						message = "<?= Lang::getTxt(Utils::$context['browse_type'] == 'approve' ? 'admin_browse_w_approve' : 'admin_browse_w_activate', file: 'ManageMembers') ?>";
+
+					if (confirm(message + " <?= Lang::getTxt('admin_browse_outstanding_warn', file: 'ManageMembers') ?>"))
+						return true;
+					else
+						return false;
+				}
+			</script>
+
+			<div class="windowbg">
+				<p class="settings">
+					<?= Lang::getTxt(
+						'admin_browse_outstanding_days',
+						[
+							'input' => '<input type="number" name="time_passed" value="14">',
+							'number' => 14,
+						],
+						file: 'ManageMembers',
+					) ?>
+				</p>
+				<dl class="settings">
+					<dt>
+						<?= Lang::getTxt('admin_browse_outstanding_perform', file: 'ManageMembers') ?>:
+					</dt>
+					<dd>
+						<select name="todo">
+							<?= Utils::$context['browse_type'] == 'activate' ? '
+							<option value="ok">' . Lang::getTxt('admin_browse_w_activate', file: 'ManageMembers') . '</option>' : '' ?>
+							<option value="okemail"><?= Lang::getTxt(Utils::$context['browse_type'] == 'approve' ? 'admin_browse_w_approve_send_email' : 'admin_browse_w_activate_send_email', file: 'ManageMembers') ?></option><?= Utils::$context['browse_type'] == 'activate' ? '' : '
+							<option value="require_activation">' . Lang::getTxt('admin_browse_w_approve_require_activate', file: 'ManageMembers') . '</option>' ?>
+							<option value="reject"><?= Lang::getTxt('admin_browse_w_reject', file: 'ManageMembers') ?></option>
+							<option value="rejectemail"><?= Lang::getTxt('admin_browse_w_reject_send_email', file: 'ManageMembers') ?></option>
+							<option value="delete"><?= Lang::getTxt('admin_browse_w_delete', file: 'ManageMembers') ?></option>
+							<option value="deleteemail"><?= Lang::getTxt('admin_browse_w_delete_send_email', file: 'ManageMembers') ?></option><?= Utils::$context['browse_type'] == 'activate' ? '
+							<option value="remind">' . Lang::getTxt('admin_browse_w_remind', file: 'ManageMembers') . '</option>' : '' ?>
+						</select>
+					</dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('admin_browse_outstanding_go', file: 'ManageMembers') ?>" class="button">
+				<input type="hidden" name="type" value="<?= Utils::$context['browse_type'] ?>">
+				<input type="hidden" name="sort" value="<?= Utils::$context['approve_list']['sort']['id'] ?>">
+				<input type="hidden" name="start" value="<?= Utils::$context['approve_list']['start'] ?>">
+				<input type="hidden" name="orig_filter" value="<?= Utils::$context['current_filter'] ?>">
+				<input type="hidden" name="sa" value="approve"><?= !empty(Utils::$context['approve_list']['sort']['desc']) ? '
+				<input type="hidden" name="desc" value="1">' : '' ?>
+			</div><!-- .windowbg -->
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form><?php endif; ?>
diff --git a/Themes/default/templates/ManageMembers/index.php b/Themes/default/templates/ManageMembers/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageMembers/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageMembers/search_members.php b/Themes/default/templates/ManageMembers/search_members.php
new file mode 100644
index 00000000000..dcc35e4bf2a
--- /dev/null
+++ b/Themes/default/templates/ManageMembers/search_members.php
@@ -0,0 +1,210 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The admin member search form
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=viewmembers" method="post" accept-charset="UTF-8" id="admin_form_wrapper">
+			<input type="hidden" name="sa" value="query">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="floatleft"><?= Lang::getTxt('search_for', file: 'General') ?></span>
+					<span class="smalltext floatright"><?= Lang::getTxt('wild_cards_allowed', file: 'Admin') ?></span>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<div class="flow_hidden">
+					<div class="msearch_details floatleft">
+						<dl class="settings right">
+							<dt class="righttext">
+								<strong><label for="mem_id"><?= Lang::getTxt('member_id', file: 'Admin') ?></label></strong>
+								<select name="types[mem_id]">
+									<option value="--">&lt;</option>
+									<option value="-">&lt;=</option>
+									<option value="=" selected>=</option>
+									<option value="+">&gt;=</option>
+									<option value="++">&gt;</option>
+								</select>
+							</dt>
+							<dd>
+								<input type="number" name="mem_id" id="mem_id" value="" size="6">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="age"><?= Lang::getTxt('age', file: 'Admin') ?></label></strong>
+								<select name="types[age]">
+									<option value="--">&lt;</option>
+									<option value="-">&lt;=</option>
+									<option value="=" selected>=</option>
+									<option value="+">&gt;=</option>
+									<option value="++">&gt;</option>
+								</select>
+							</dt>
+							<dd>
+								<input type="number" name="age" id="age" value="" size="6">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="posts"><?= Lang::getTxt('member_postcount', file: 'General') ?></label></strong>
+								<select name="types[posts]">
+									<option value="--">&lt;</option>
+									<option value="-">&lt;=</option>
+									<option value="=" selected>=</option>
+									<option value="+">&gt;=</option>
+									<option value="++">&gt;</option>
+								</select>
+							</dt>
+							<dd>
+								<input type="number" name="posts" id="posts" value="" size="6">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="reg_date"><?= Lang::getTxt('date_registered', file: 'General') ?></label></strong>
+								<select name="types[reg_date]">
+									<option value="--">&lt;</option>
+									<option value="-">&lt;=</option>
+									<option value="=" selected>=</option>
+									<option value="+">&gt;=</option>
+									<option value="++">&gt;</option>
+								</select>
+							</dt>
+							<dd>
+								<input type="date" name="reg_date" id="reg_date" value="" size="10"><span class="smalltext"></span>
+							</dd>
+							<dt class="righttext">
+								<strong><label for="last_online"><?= Lang::getTxt('viewmembers_online', file: 'Admin') ?></label></strong>
+								<select name="types[last_online]">
+									<option value="--">&lt;</option>
+									<option value="-">&lt;=</option>
+									<option value="=" selected>=</option>
+									<option value="+">&gt;=</option>
+									<option value="++">&gt;</option>
+								</select>
+							</dt>
+							<dd>
+								<input type="date" name="last_online" id="last_online" value="" size="10"><span class="smalltext"></span>
+							</dd>
+						</dl>
+					</div><!-- .msearch_details -->
+					<div class="msearch_details floatright">
+						<dl class="settings right">
+							<dt class="righttext">
+								<strong><label for="membername"><?= Lang::getTxt('username', file: 'General') ?></label></strong>
+							</dt>
+							<dd>
+								<input type="text" name="membername" id="membername" value="">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="email"><?= Lang::getTxt('email_address', file: 'Admin') ?></label></strong>
+							</dt>
+							<dd>
+								<input type="email" name="email" id="email" value="">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="website"><?= Lang::getTxt('website', file: 'General') ?></label></strong>
+							</dt>
+							<dd>
+								<input type="url" name="website" id="website" value="">
+							</dd>
+							<dt class="righttext">
+								<strong><label for="ip"><?= Lang::getTxt('ip_address', file: 'General') ?></label></strong>
+							</dt>
+							<dd>
+								<input type="text" name="ip" id="ip" value="">
+							</dd>
+						</dl>
+					</div><!-- .msearch_details -->
+					<div class="msearch_details floatright">
+						<fieldset>
+							<legend><?= Lang::getTxt('activation_status', file: 'Admin') ?></legend>
+							<label for="activated-0"><input type="checkbox" name="activated[]" value="1" id="activated-0" checked> <?= Lang::getTxt('activated', file: 'Admin') ?></label>&nbsp;&nbsp;
+							<label for="activated-1"><input type="checkbox" name="activated[]" value="0" id="activated-1" checked> <?= Lang::getTxt('not_activated', file: 'Admin') ?></label>
+						</fieldset>
+					</div>
+				</div><!-- .flow_hidden -->
+			</div><!-- ..windowbg -->
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('member_part_of_these_membergroups', file: 'Admin') ?></h3>
+			</div>
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th scope="col"><?= Lang::getTxt('membergroups', file: 'Admin') ?></th>
+						<th scope="col" class="centercol quarter_table"><?= Lang::getTxt('primary', file: 'Admin') ?></th>
+						<th scope="col" class="centercol quarter_table"><?= Lang::getTxt('additional', file: 'Admin') ?></th>
+					</tr>
+				</thead>
+				<tbody>
+<?php foreach (Utils::$context['membergroups'] as $membergroup): ?>
+					<tr class="windowbg">
+						<td><?= $membergroup['name'] ?></td>
+						<td class="centercol">
+							<input type="checkbox" name="membergroups[1][]" value="<?= $membergroup['id'] ?>" checked>
+						</td>
+						<td class="centercol">
+							<?= $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked>' : '' ?>
+						</td>
+					</tr>
+<?php endforeach; ?>
+					<tr class="windowbg">
+						<td>
+							<em><?= Lang::getTxt('check_all', file: 'General') ?></em>
+						</td>
+						<td class="centercol">
+							<input type="checkbox" onclick="invertAll(this, this.form, 'membergroups[1]');" checked>
+						</td>
+						<td class="centercol">
+							<input type="checkbox" onclick="invertAll(this, this.form, 'membergroups[2]');" checked>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th scope="col">
+							<?= Lang::getTxt('membergroups_postgroups', file: 'ManageMembers') ?>
+						</th>
+						<th class="quarter_table"></th>
+					</tr>
+				</thead>
+				<tbody>
+<?php foreach (Utils::$context['postgroups'] as $postgroup): ?>
+					<tr class="windowbg">
+						<td>
+							<?= $postgroup['name'] ?>
+						</td>
+						<td class="centercol">
+							<input type="checkbox" name="postgroups[]" value="<?= $postgroup['id'] ?>" checked>
+						</td>
+					</tr>
+<?php endforeach; ?>
+					<tr class="windowbg">
+						<td>
+							<em><?= Lang::getTxt('check_all', file: 'General') ?></em>
+						</td>
+						<td class="centercol">
+							<input type="checkbox" onclick="invertAll(this, this.form, 'postgroups[]');" checked>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<br>
+			<input type="submit" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageNews/email_members.php b/Themes/default/templates/ManageNews/email_members.php
new file mode 100644
index 00000000000..f3ffe11ee27
--- /dev/null
+++ b/Themes/default/templates/ManageNews/email_members.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for sending newsletters
+ */
+?><?php /* Are we done sending the newsletter? */ ?><?php if (!empty(Utils::$context['newsletter_sent'])): ?>
+	<div class="infobox"><?= Lang::getTxt('admin_news_newsletter_' . Utils::$context['newsletter_sent'], file: 'Admin') ?></div><?php endif; ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=news;sa=mailingcompose" method="post" id="admin_newsletters" class="flow_hidden" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('admin_newsletters', file: 'Admin') ?></h3>
+			</div>
+			<div class="information noup">
+				<?= Lang::getTxt('admin_news_select_recipients', file: 'Admin') ?>
+			</div>
+			<div class="windowbg noup">
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('admin_news_select_group', file: 'Admin') ?></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('admin_news_select_group_desc', file: 'Admin') ?></span>
+					</dt>
+					<dd><?php foreach (Utils::$context['groups'] as $group): ?>
+						<label for="groups_<?= $group['id'] ?>"><input type="checkbox" name="groups[<?= $group['id'] ?>]" id="groups_<?= $group['id'] ?>" value="<?= $group['id'] ?>" checked> <?= $group['name'] ?></label> <em>(<?= $group['member_count'] ?? Lang::getTxt('not_applicable', file: 'General') ?>)</em><br><?php endforeach; ?>
+						<br>
+						<label for="checkAllGroups"><input type="checkbox" id="checkAllGroups" checked onclick="invertAll(this, this.form, 'groups');"> <em><?= Lang::getTxt('check_all', file: 'General') ?></em></label>
+					</dd>
+				</dl>
+				<div id="advanced_panel_header" class="title_bar">
+					<h3 class="titlebg">
+						<a href="#" id="advanced_panel_link"><?= Lang::getTxt('advanced', file: 'Admin') ?></a>
+					</h3>
+					<span id="advanced_panel_toggle" class="toggle_down" style="display: none;"></span>
+				</div>
+				<div id="advanced_panel_div" class="padding">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('admin_news_select_email', file: 'Admin') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('admin_news_select_email_desc', file: 'Admin') ?></span>
+						</dt>
+						<dd>
+							<textarea name="emails" rows="5" cols="30" style="width: 98%;"></textarea>
+						</dd>
+						<dt>
+							<strong><?= Lang::getTxt('admin_news_select_members', file: 'Admin') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('admin_news_select_members_desc', file: 'Admin') ?></span>
+						</dt>
+						<dd>
+							<input type="text" name="members" id="members" value="" size="30">
+							<span id="members_container"></span>
+						</dd>
+					</dl>
+					<hr class="bordercolor">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('admin_news_select_excluded_groups', file: 'Admin') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('admin_news_select_excluded_groups_desc', file: 'Admin') ?></span>
+						</dt>
+						<dd><?php foreach (Utils::$context['groups'] as $group): ?>
+							<label for="exclude_groups_<?= $group['id'] ?>"><input type="checkbox" name="exclude_groups[<?= $group['id'] ?>]" id="exclude_groups_<?= $group['id'] ?>" value="<?= $group['id'] ?>"> <?= $group['name'] ?></label> <em>(<?= $group['member_count'] ?>)</em><br><?php endforeach; ?>
+							<br>
+							<label for="checkAllGroupsExclude"><input type="checkbox" id="checkAllGroupsExclude" onclick="invertAll(this, this.form, 'exclude_groups');"> <em><?= Lang::getTxt('check_all', file: 'General') ?></em></label><br>
+						</dd>
+						<dt>
+							<strong><?= Lang::getTxt('admin_news_select_excluded_members', file: 'Admin') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('admin_news_select_excluded_members_desc', file: 'Admin') ?></span>
+						</dt>
+							<dd>
+							<input type="text" name="exclude_members" id="exclude_members" value="" size="30">
+							<span id="exclude_members_container"></span>
+						</dd>
+					</dl>
+					<hr class="bordercolor">
+					<dl class="settings">
+						<dt>
+							<label for="email_force"><strong><?= Lang::getTxt('admin_news_select_override_notify', file: 'Admin') ?></strong></label><br>
+							<span class="smalltext"><?= Lang::getTxt('email_force', file: 'Admin') ?></span>
+						</dt>
+						<dd>
+							<input type="checkbox" name="email_force" id="email_force" value="1">
+						</dd>
+					</dl>
+				</div><!-- #advanced_panel_div -->
+				<br>
+				<input type="submit" value="<?= Lang::getTxt('admin_next', file: 'Admin') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</div><!-- .windowbg -->
+		</form><?php /* This is some javascript for the simple/advanced toggling and member suggest */ ?>
+	<script>
+		var oAdvancedPanelToggle = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: true,
+			aSwappableContainers: [
+				'advanced_panel_div'
+			],
+			aSwapImages: [
+				{
+					sId: 'advanced_panel_toggle',
+					altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+					altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+				}
+			],
+			aSwapLinks: [
+				{
+					sId: 'advanced_panel_link',
+					msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('advanced', file: 'Admin')) ?>,
+					msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('advanced', file: 'Admin')) ?>
+
+				}
+			]
+		});
+	</script>
+	<script>
+		var oMemberSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'members',
+			sControlId: 'members',
+			sSearchType: 'member',
+			bItemList: true,
+			sPostName: 'member_list',
+			sURLMask: 'action=profile;u=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			sItemListContainerId: 'members_container',
+			aListItems: []
+		});
+		var oExcludeMemberSuggest = new smc_AutoSuggest({
+			sSessionId: '<?= Utils::$context['session_id'] ?>',
+			sSessionVar: '<?= Utils::$context['session_var'] ?>',
+			sSuggestId: 'exclude_members',
+			sControlId: 'exclude_members',
+			sSearchType: 'member',
+			bItemList: true,
+			sPostName: 'exclude_member_list',
+			sURLMask: 'action=profile;u=%item_id%',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+			sItemListContainerId: 'exclude_members_container',
+			aListItems: []
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageNews/email_members_compose.php b/Themes/default/templates/ManageNews/email_members_compose.php
new file mode 100644
index 00000000000..46cbeb00d3a
--- /dev/null
+++ b/Themes/default/templates/ManageNews/email_members_compose.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for composing a newsletter
+ */
+?>
+	<div id="preview_section"<?= isset(Utils::$context['preview_message']) ? '' : ' class="hidden"' ?>>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span id="preview_subject"><?= empty(Utils::$context['preview_subject']) ? '' : Utils::$context['preview_subject'] ?></span>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<div class="post" id="preview_body">
+				<?= empty(Utils::$context['preview_message']) ? '<br>' : Utils::$context['preview_message'] ?>
+			</div>
+		</div>
+	</div>
+	<br>
+		<form name="newsmodify" action="<?= Config::$scripturl ?>?action=admin;area=news;sa=mailingsend" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('admin_newsletters', file: 'Admin') ?>
+				</h3>
+			</div>
+			<div class="information noup">
+				<?= Lang::getTxt('email_variables', ['scripturl' => Config::$scripturl], file: 'Admin') ?>
+			</div>
+			<div class="windowbg noup">
+				<div class="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox' ?>"<?= empty(Utils::$context['post_error']['messages']) ? ' style="display: none"' : '' ?> id="errors">
+					<dl>
+						<dt>
+							<strong id="error_serious"><?= Lang::getTxt('error_while_submitting', file: 'General') ?></strong>
+						</dt>
+						<dd class="error" id="error_list">
+							<?= empty(Utils::$context['post_error']['messages']) ? '' : implode('<br>', Utils::$context['post_error']['messages']) ?>
+						</dd>
+					</dl>
+				</div>
+				<dl id="post_header">
+					<dt>
+						<label<?= (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '') ?> for="subject" id="caption_subject"><?= Lang::getTxt('subject', file: 'General') ?></label>
+					</dt>
+					<dd id="pm_subject">
+						<input type="text" id="subject" name="subject" value="<?= Utils::$context['subject'] ?>" size="80" maxlength="84"<?= isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '' ?>>
+					</dd>
+				</dl>
+				<div id="bbcBox_message"></div>
+<?php /* What about smileys? */ ?>
+<?php if (!empty(Utils::$context['smileys']['postform']) || !empty(Utils::$context['smileys']['popup'])): ?>
+				<div id="smileyBox_message"></div>
+<?php endif; ?>
+<?php /* Show BBC buttons, smileys and textbox. */ ?>
+				<?php $this->subTemplate('control_richedit', ['editor_id' => Utils::$context['post_box_name'], 'smiley_container' => 'smileyBox_message', 'bbc_container' => 'bbcBox_message']); ?>
+				<ul>
+					<li><label for="send_pm"><input type="checkbox" name="send_pm" id="send_pm"<?= !empty(Utils::$context['send_pm']) ? ' checked' : '' ?> onclick="checkboxes_status(this);"> <?= Lang::getTxt('email_as_pms', file: 'Admin') ?></label></li>
+					<li><label for="send_html"><input type="checkbox" name="send_html" id="send_html"<?= !empty(Utils::$context['send_html']) ? ' checked' : '' ?> onclick="checkboxes_status(this);"> <?= Lang::getTxt('email_as_html', file: 'Admin') ?></label></li>
+					<li><label for="parse_html"><input type="checkbox" name="parse_html" id="parse_html" checked disabled> <?= Lang::getTxt('email_parsed_html', file: 'Admin') ?></label></li>
+				</ul>
+				<span id="post_confirm_buttons">
+					<?php $this->subTemplate('control_richedit_buttons', ['editor_id' => Utils::$context['post_box_name']]); ?>
+				</span>
+			</div><!-- .windowbg -->
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="email_force" value="<?= Utils::$context['email_force'] ?>">
+			<input type="hidden" name="total_emails" value="<?= Utils::$context['total_emails'] ?>">
+<?php foreach (Utils::$context['recipients'] as $key => $values): ?>
+			<input type="hidden" name="<?= $key ?>" value="<?= implode(($key == 'emails' ? ';' : ','), $values) ?>">
+<?php endforeach; ?>
+			<script>
+<?php /* The functions used to preview a posts without loading a new page. */ ?>
+				var txt_preview_title = "<?= Lang::getTxt('preview_title', file: 'General') ?>";
+				var txt_preview_fetch = "<?= Lang::getTxt('preview_fetch', file: 'General') ?>";
+				function previewPost()
+				{
+					if (window.XMLHttpRequest)
+					{
+						// Opera didn't support setRequestHeader() before 8.01.
+						// @todo Remove support for old browsers
+						if ('opera' in window)
+						{
+							// Handle the WYSIWYG editor.
+							if (textFields[i] == <?= Utils::escapeJavaScript(Utils::$context['post_box_name']) ?> && <?= Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']) ?> in window && oEditorHandle_<?= Utils::$context['post_box_name'] ?>.bRichTextEnabled)
+								x[x.length] = 'message_mode=1&' + textFields[i] + '=' + oEditorHandle_<?= Utils::$context['post_box_name'] ?>.getText(false).php_to8bit().php_urlencode();
+							else
+								x[x.length] = textFields[i] + '=' + document.forms.newsmodify[textFields[i]].value.php_to8bit().php_urlencode();
+						}
+						// @todo Currently not sending poll options and option checkboxes.
+						var x = new Array();
+						var textFields = ['subject', <?= Utils::escapeJavaScript(Utils::$context['post_box_name']) ?>];
+						var checkboxFields = ['send_html', 'send_pm'];
+
+						for (var i = 0, n = textFields.length; i < n; i++)
+							if (textFields[i] in document.forms.newsmodify)
+							{
+								// Handle the WYSIWYG editor.
+								if (textFields[i] == <?= Utils::escapeJavaScript(Utils::$context['post_box_name']) ?> && <?= Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']) ?> in window && oEditorHandle_<?= Utils::$context['post_box_name'] ?>.bRichTextEnabled)
+									x[x.length] = 'message_mode=1&' + textFields[i] + '=' + oEditorHandle_<?= Utils::$context['post_box_name'] ?>.getText(false).replace(/&#/g, '&#38;#').php_to8bit().php_urlencode();
+								else
+									x[x.length] = textFields[i] + '=' + document.forms.newsmodify[textFields[i]].value.replace(/&#/g, '&#38;#').php_to8bit().php_urlencode();
+							}
+						for (var i = 0, n = checkboxFields.length; i < n; i++)
+							if (checkboxFields[i] in document.forms.newsmodify && document.forms.newsmodify.elements[checkboxFields[i]].checked)
+								x[x.length] = checkboxFields[i] + '=' + document.forms.newsmodify.elements[checkboxFields[i]].value;
+
+						x[x.length] = 'item=newsletterpreview';
+
+						sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=xmlhttp;sa=previews;xml', x.join('&'), onDocSent);
+
+						document.getElementById('preview_section').style.display = '';
+						setInnerHTML(document.getElementById('preview_subject'), txt_preview_title);
+						setInnerHTML(document.getElementById('preview_body'), txt_preview_fetch);
+
+						return false;
+					}
+					else
+						return submitThisOnce(document.forms.newsmodify);
+				}
+				function onDocSent(XMLDoc)
+				{
+					if (!XMLDoc)
+					{
+						document.forms.newsmodify.preview.onclick = new function ()
+						{
+							return true;
+						}
+						document.forms.newsmodify.preview.click();
+					}
+
+					// Show the preview section.
+					var preview = XMLDoc.getElementsByTagName('smf')[0].getElementsByTagName('preview')[0];
+					setInnerHTML(document.getElementById('preview_subject'), preview.getElementsByTagName('subject')[0].firstChild.nodeValue);
+
+					var bodyText = '';
+					for (var i = 0, n = preview.getElementsByTagName('body')[0].childNodes.length; i < n; i++)
+						bodyText += preview.getElementsByTagName('body')[0].childNodes[i].nodeValue;
+
+					setInnerHTML(document.getElementById('preview_body'), bodyText);
+					document.getElementById('preview_body').className = 'post';
+
+					// Show a list of errors (if any).
+					var errors = XMLDoc.getElementsByTagName('smf')[0].getElementsByTagName('errors')[0];
+					var errorList = new Array();
+					for (var i = 0, numErrors = errors.getElementsByTagName('error').length; i < numErrors; i++)
+						errorList[errorList.length] = errors.getElementsByTagName('error')[i].firstChild.nodeValue;
+					document.getElementById('errors').style.display = numErrors == 0 ? 'none' : '';
+					setInnerHTML(document.getElementById('error_list'), numErrors == 0 ? '' : errorList.join('<br>'));
+
+					// Adjust the color of captions if the given data is erroneous.
+					var captions = errors.getElementsByTagName('caption');
+					for (var i = 0, numCaptions = errors.getElementsByTagName('caption').length; i < numCaptions; i++)
+						if (document.getElementById('caption_' + captions[i].getAttribute('name')))
+							document.getElementById('caption_' + captions[i].getAttribute('name')).className = captions[i].getAttribute('class');
+
+					if (errors.getElementsByTagName('post_error').length == 1)
+						document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>.style.border = '1px solid red';
+					else if (document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor == 'red' || document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor == 'red red red red')
+					{
+						if ('runtimeStyle' in document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>)
+							document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor = '';
+						else
+							document.forms.newsmodify.<?= Utils::$context['post_box_name'] ?>.style.border = null;
+					}
+					location.hash = '#' + 'preview_section';
+				}
+			</script>
+			<script>
+				function checkboxes_status (item)
+				{
+					if (item.id == 'send_html')
+						document.getElementById('parse_html').disabled = !document.getElementById('parse_html').disabled;
+					if (item.id == 'send_pm')
+					{
+						if (!document.getElementById('send_html').checked)
+							document.getElementById('parse_html').disabled = true;
+						else
+							document.getElementById('parse_html').disabled = false;
+						document.getElementById('send_html').disabled = !document.getElementById('send_html').disabled;
+					}
+				}
+			</script>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageNews/email_members_send.php b/Themes/default/templates/ManageNews/email_members_send.php
new file mode 100644
index 00000000000..cedf74d3731
--- /dev/null
+++ b/Themes/default/templates/ManageNews/email_members_send.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page shown while the newsletter is being sent
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=news;sa=mailingsend" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('admin_newsletters', file: 'Admin') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<div class="progress_bar">
+					<span><?= Lang::getTxt('email_done', Utils::$context, file: 'Admin') ?></span>
+					<div class="bar" style="width: <?= Utils::$context['percentage_done'] ?>%;"></div>
+				</div>
+				<hr>
+				<input type="submit" name="cont" value="<?= Lang::getTxt('email_continue', file: 'Admin') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="subject" value="<?= Utils::$context['subject'] ?>">
+				<input type="hidden" name="message" value="<?= Utils::$context['message'] ?>">
+				<input type="hidden" name="start" value="<?= Utils::$context['start'] ?>">
+				<input type="hidden" name="total_members" value="<?= Utils::$context['total_members'] ?>">
+				<input type="hidden" name="total_emails" value="<?= Utils::$context['total_emails'] ?>">
+				<input type="hidden" name="send_pm" value="<?= Utils::$context['send_pm'] ?>">
+				<input type="hidden" name="send_html" value="<?= Utils::$context['send_html'] ?>">
+				<input type="hidden" name="parse_html" value="<?= Utils::$context['parse_html'] ?>">
+<?php /* All the things we must remember! */ ?>
+<?php foreach (Utils::$context['recipients'] as $key => $values): ?>
+				<input type="hidden" name="<?= $key ?>" value="<?= implode(($key == 'emails' ? ';' : ','), $values) ?>">
+<?php endforeach; ?>
+			</div><!-- .windowbg -->
+		</form>
+
+		<script>
+			doAutoSubmit(2, <?= Utils::escapeJavaScript(Lang::getTxt('email_continue', file: 'Admin')) ?>);
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageNews/index.php b/Themes/default/templates/ManageNews/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageNews/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageNews/news_lists.php b/Themes/default/templates/ManageNews/news_lists.php
new file mode 100644
index 00000000000..3d823a6c3ff
--- /dev/null
+++ b/Themes/default/templates/ManageNews/news_lists.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The settings page.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+			<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?><?php $this->subTemplate('show_list', ['list_id' => 'news_lists']); ?>
diff --git a/Themes/default/templates/ManagePaid/choose_payment.php b/Themes/default/templates/ManagePaid/choose_payment.php
new file mode 100644
index 00000000000..132ef206b71
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/choose_payment.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The "choose payment" dialog.
+ */
+?>
+	<div id="paid_subscription">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('paid_confirm_payment', file: 'ManagePaid') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('paid_confirm_desc', file: 'ManagePaid') ?>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<strong><?= Lang::getTxt('subscription', file: 'ManagePaid') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['sub']['name'] ?>
+				</dd>
+				<dt>
+					<strong><?= Lang::getTxt('paid_cost', file: 'ManagePaid') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['cost'] ?>
+				</dd>
+			</dl>
+		</div>
+<?php /* Do all the gateway options. */ ?>
+<?php foreach (Utils::$context['gateways'] as $gateway): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= $gateway['title'] ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= $gateway['desc'] ?><br>
+			<form action="<?= $gateway['form'] ?>" method="post">
+<?php if (!empty($gateway['javascript'])): ?>
+				<script>
+					<?= $gateway['javascript'] ?>
+
+				</script>
+<?php endif; ?>
+<?php foreach ($gateway['hidden'] as $name => $value): ?>
+				<input type="hidden" id="<?= $gateway['id'] ?>_<?= $name ?>" name="<?= $name ?>" value="<?= $value ?>">
+<?php endforeach; ?>
+				<br>
+				<input type="submit" value="<?= $gateway['submit'] ?>" class="button">
+			</form>
+		</div>
+<?php endforeach; ?>
+	</div><!-- #paid_subscription -->
+	<br class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePaid/delete_subscription.php b/Themes/default/templates/ManagePaid/delete_subscription.php
new file mode 100644
index 00000000000..d70cd2cba4a
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/delete_subscription.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page for deleting a subscription.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modify;sid=<?= Utils::$context['sub_id'] ?>;delete" method="post">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('paid_delete_subscription', file: 'ManagePaid') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('paid_mod_delete_warning', file: 'ManagePaid') ?></p>
+			<input type="submit" name="delete_confirm" value="<?= Lang::getTxt('paid_delete_subscription', file: 'ManagePaid') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-pmsd_token_var'] ?>" value="<?= Utils::$context['admin-pmsd_token'] ?>">
+		</div>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePaid/index.php b/Themes/default/templates/ManagePaid/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManagePaid/modify_subscription.php b/Themes/default/templates/ManagePaid/modify_subscription.php
new file mode 100644
index 00000000000..c1723065201
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/modify_subscription.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for adding or editing a subscription.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modify;sid=<?= Utils::$context['sub_id'] ?>" method="post">
+<?php if (!empty(Utils::$context['disable_groups'])): ?>
+		<div class="noticebox"><?= Lang::getTxt('paid_mod_edit_note', file: 'ManagePaid') ?></div>
+<?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('paid_' . Utils::$context['action_type'] . '_subscription', file: 'ManagePaid') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<?= Lang::getTxt('paid_mod_name', file: 'ManagePaid') ?>
+				</dt>
+				<dd>
+					<input type="text" name="name" value="<?= Utils::$context['sub']['name'] ?>" size="30">
+				</dd>
+				<dt>
+					<?= Lang::getTxt('paid_mod_desc', file: 'ManagePaid') ?>
+				</dt>
+				<dd>
+					<textarea name="desc" rows="3" cols="40"><?= Utils::$context['sub']['desc'] ?></textarea>
+				</dd>
+				<dt>
+					<label for="repeatable_check"><?= Lang::getTxt('paid_mod_repeatable', file: 'ManagePaid') ?></label>
+				</dt>
+				<dd>
+					<input type="checkbox" name="repeatable" id="repeatable_check"<?= empty(Utils::$context['sub']['repeatable']) ? '' : ' checked' ?>>
+				</dd>
+				<dt>
+					<label for="activated_check"><?= Lang::getTxt('paid_mod_active', file: 'ManagePaid') ?></label><br><span class="smalltext"><?= Lang::getTxt('paid_mod_active_desc', file: 'ManagePaid') ?></span>
+				</dt>
+				<dd>
+					<input type="checkbox" name="active" id="activated_check"<?= empty(Utils::$context['sub']['active']) ? '' : ' checked' ?>>
+				</dd>
+			</dl>
+			<hr>
+			<dl class="settings">
+				<dt>
+					<?= Lang::getTxt('paid_mod_prim_group', file: 'ManagePaid') ?><br>
+					<span class="smalltext"><?= Lang::getTxt('paid_mod_prim_group_desc', file: 'ManagePaid') ?></span>
+				</dt>
+				<dd>
+					<select name="prim_group"<?= !empty(Utils::$context['disable_groups']) ? ' disabled' : '' ?>>
+						<option value="0"<?= Utils::$context['sub']['prim_group'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('paid_mod_no_group', file: 'ManagePaid') ?></option>
+<?php /* Put each group into the box. */ ?>
+<?php foreach (Utils::$context['groups'] as $id => $name): ?>
+						<option value="<?= $id ?>"<?= Utils::$context['sub']['prim_group'] == $id ? ' selected' : '' ?>><?= $name ?></option>
+<?php endforeach; ?>
+					</select>
+				</dd>
+				<dt>
+					<?= Lang::getTxt('paid_mod_add_groups', file: 'ManagePaid') ?>:<br>
+					<span class="smalltext"><?= Lang::getTxt('paid_mod_add_groups_desc', file: 'ManagePaid') ?></span>
+				</dt>
+				<dd>
+<?php /* Put a checkbox in for each group */ ?>
+<?php foreach (Utils::$context['groups'] as $id => $name): ?>
+					<label for="addgroup_<?= $id ?>">
+						<input type="checkbox" id="addgroup_<?= $id ?>" name="addgroup[<?= $id ?>]"<?= in_array($id, Utils::$context['sub']['add_groups']) ? ' checked' : '' ?><?= !empty(Utils::$context['disable_groups']) ? ' disabled' : '' ?>>
+						<span class="smalltext"><?= $name ?></span>
+					</label><br>
+<?php endforeach; ?>
+				</dd>
+				<dt>
+					<?= Lang::getTxt('paid_mod_reminder', file: 'ManagePaid') ?><br>
+					<span class="smalltext"><?= Lang::getTxt('paid_mod_reminder_desc', file: 'ManagePaid') ?> <?= Lang::getTxt('zero_to_disable', file: 'Admin') ?></span>
+				</dt>
+				<dd>
+					<input type="number" name="reminder" value="<?= Utils::$context['sub']['reminder'] ?>" size="6">
+				</dd>
+				<dt>
+					<?= Lang::getTxt('paid_mod_email', file: 'ManagePaid') ?><br>
+					<span class="smalltext"><?= Lang::getTxt('paid_mod_email_desc', file: 'ManagePaid') ?></span>
+				</dt>
+				<dd>
+					<textarea name="emailcomplete" rows="6" cols="40"><?= Utils::$context['sub']['email_complete'] ?></textarea>
+				</dd>
+			</dl>
+			<hr>
+			<input type="radio" name="duration_type" id="duration_type_fixed" value="fixed"<?= empty(Utils::$context['sub']['duration']) || Utils::$context['sub']['duration'] == 'fixed' ? ' checked' : '' ?> onclick="toggleDuration('fixed');">
+			<strong><label for="duration_type_fixed"><?= Lang::getTxt('paid_mod_fixed_price', file: 'ManagePaid') ?></label></strong>
+			<br>
+			<div id="fixed_area" <?= empty(Utils::$context['sub']['duration']) || Utils::$context['sub']['duration'] == 'fixed' ? '' : 'style="display: none;"' ?>>
+				<fieldset>
+					<dl class="settings">
+						<dt>
+							<?= Lang::getTxt('paid_cost', file: 'ManagePaid') ?> (<?= str_replace('%1.2f', '', Config::$modSettings['paid_currency_symbol']) ?>)
+						</dt>
+						<dd>
+							<input type="number" step="0.01" name="cost" value="<?= empty(Utils::$context['sub']['cost']['fixed']) ? '' : Utils::$context['sub']['cost']['fixed'] ?>" placeholder="0.00" size="4">
+						</dd>
+						<dt>
+							<?= Lang::getTxt('paid_mod_span', file: 'ManagePaid') ?>
+						</dt>
+						<dd>
+							<input type="number" name="span_value" value="<?= Utils::$context['sub']['span']['value'] ?>" size="4">
+							<select name="span_unit">
+								<option value="D"<?= Utils::$context['sub']['span']['unit'] == 'D' ? ' selected' : '' ?>><?= Lang::getTxt('paid_mod_span_days', file: 'ManagePaid') ?></option>
+								<option value="W"<?= Utils::$context['sub']['span']['unit'] == 'W' ? ' selected' : '' ?>><?= Lang::getTxt('paid_mod_span_weeks', file: 'ManagePaid') ?></option>
+								<option value="M"<?= Utils::$context['sub']['span']['unit'] == 'M' ? ' selected' : '' ?>><?= Lang::getTxt('paid_mod_span_months', file: 'ManagePaid') ?></option>
+								<option value="Y"<?= Utils::$context['sub']['span']['unit'] == 'Y' ? ' selected' : '' ?>><?= Lang::getTxt('paid_mod_span_years', file: 'ManagePaid') ?></option>
+							</select>
+						</dd>
+					</dl>
+				</fieldset>
+			</div><!-- #fixed_area -->
+			<input type="radio" name="duration_type" id="duration_type_flexible" value="flexible"<?= !empty(Utils::$context['sub']['duration']) && Utils::$context['sub']['duration'] == 'flexible' ? ' checked' : '' ?> onclick="toggleDuration('flexible');">
+			<strong><label for="duration_type_flexible"><?= Lang::getTxt('paid_mod_flexible_price', file: 'ManagePaid') ?></label></strong>
+			<br>
+			<div id="flexible_area" <?= !empty(Utils::$context['sub']['duration']) && Utils::$context['sub']['duration'] == 'flexible' ? '' : 'style="display: none;"' ?>>
+				<fieldset>
+					<div class="information">
+						<strong><?= Lang::getTxt('paid_mod_price_breakdown', file: 'ManagePaid') ?></strong><br>
+						<?= Lang::getTxt('paid_mod_price_breakdown_desc', file: 'ManagePaid') ?>
+					</div>
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('paid_duration', file: 'ManagePaid') ?></strong>
+						</dt>
+						<dd>
+							<strong><?= Lang::getTxt('paid_cost', file: 'ManagePaid') ?> (<?= preg_replace('~%[df\.\d]+~', '', Config::$modSettings['paid_currency_symbol']) ?>)</strong>
+						</dd>
+						<dt>
+							<?= Lang::getTxt('paid_per_day', file: 'ManagePaid') ?>
+						</dt>
+						<dd>
+							<input type="number" step="0.01" name="cost_day" value="<?= empty(Utils::$context['sub']['cost']['day']) ? '0' : Utils::$context['sub']['cost']['day'] ?>" size="5">
+						</dd>
+						<dt>
+							<?= Lang::getTxt('paid_per_week', file: 'ManagePaid') ?>
+						</dt>
+						<dd>
+							<input type="number" step="0.01" name="cost_week" value="<?= empty(Utils::$context['sub']['cost']['week']) ? '0' : Utils::$context['sub']['cost']['week'] ?>" size="5">
+						</dd>
+						<dt>
+							<?= Lang::getTxt('paid_per_month', file: 'ManagePaid') ?>
+						</dt>
+						<dd>
+							<input type="number" step="0.01" name="cost_month" value="<?= empty(Utils::$context['sub']['cost']['month']) ? '0' : Utils::$context['sub']['cost']['month'] ?>" size="5">
+						</dd>
+						<dt>
+							<?= Lang::getTxt('paid_per_year', file: 'ManagePaid') ?>
+						</dt>
+						<dd>
+							<input type="number" step="0.01" name="cost_year" value="<?= empty(Utils::$context['sub']['cost']['year']) ? '0' : Utils::$context['sub']['cost']['year'] ?>" size="5">
+						</dd>
+					</dl>
+				</fieldset>
+			</div><!-- #flexible_area -->
+			<input type="submit" name="save" value="<?= Lang::getTxt('paid_settings_save', file: 'ManagePaid') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-pms_token_var'] ?>" value="<?= Utils::$context['admin-pms_token'] ?>">
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePaid/modify_user_subscription.php b/Themes/default/templates/ManagePaid/modify_user_subscription.php
new file mode 100644
index 00000000000..ca55b5d2fbd
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/modify_user_subscription.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add or edit an existing subscriber.
+ */
+?>
+
+<?php
+// The year lists below have to reach whatever dates this subscription
+// already carries, however far out they are, and leave room to pick
+// something new either side of today.
+$years = [
+	Utils::$context['sub']['start']['year'],
+	Utils::$context['sub']['end']['year'],
+	(int) date('Y'),
+];
+$first_year = min($years) - 10;
+$last_year = max($years) + 10;
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modifyuser;sid=<?= Utils::$context['sub_id'] ?>;lid=<?= Utils::$context['log_id'] ?>" method="post">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt(
+					'paid_' . Utils::$context['action_type'] . '_subscription_name' . (empty(Utils::$context['sub']['username']) ? '' : '_for_member'),
+					[
+						'name' => Utils::$context['current_subscription']['name'],
+						'member' => Utils::$context['sub']['username'] ?? '',
+					],
+					file: 'ManagePaid',
+				) ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+<?php /* Do we need a username? */ ?>
+<?php if (Utils::$context['action_type'] == 'add'): ?>
+				<dt>
+					<strong><?= Lang::getTxt('paid_username', file: 'ManagePaid') ?></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('one_username', file: 'ManagePaid') ?></span>
+				</dt>
+				<dd>
+					<input type="text" name="name" id="name_control" value="<?= Utils::$context['sub']['username'] ?>" size="30">
+				</dd>
+<?php endif; ?>
+				<dt>
+					<strong><?= Lang::getTxt('paid_status', file: 'ManagePaid') ?></strong>
+				</dt>
+				<dd>
+					<select name="status">
+						<option value="0"<?= Utils::$context['sub']['status'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('paid_finished', file: 'ManagePaid') ?></option>
+						<option value="1"<?= Utils::$context['sub']['status'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('paid_active', file: 'ManagePaid') ?></option>
+					</select>
+				</dd>
+			</dl>
+			<fieldset>
+				<legend><?= Lang::getTxt('start_date_and_time', file: 'ManagePaid') ?></legend>
+				<select name="year" id="year">
+<?php /* Show a list of all the years we allow... */ ?>
+<?php for ($year = $first_year; $year <= $last_year; $year++): ?>
+					<option value="<?= $year ?>"<?= $year == Utils::$context['sub']['start']['year'] ? ' selected' : '' ?>><?= $year ?></option>
+<?php endfor; ?>
+				</select>
+				<select name="month" id="month">
+<?php /* There are 12 months per year - ensure that they all get listed. */ ?>
+<?php for ($month = 1; $month <= 12; $month++): ?>
+					<option value="<?= $month ?>"<?= $month == Utils::$context['sub']['start']['month'] ? ' selected' : '' ?>><?= Lang::getTxt(['months', $month], file: 'General') ?></option>
+<?php endfor; ?>
+				</select>
+				<select name="day" id="day">
+<?php /* This prints out all the days in the current month - this changes dynamically as we switch months. */ ?>
+<?php for ($day = 1; $day <= Utils::$context['sub']['start']['last_day']; $day++): ?>
+					<option value="<?= $day ?>"<?= $day == Utils::$context['sub']['start']['day'] ? ' selected' : '' ?>><?= $day ?></option>
+<?php endfor; ?>
+				</select>
+				&nbsp;&nbsp;&nbsp;
+				<input type="number" name="hour" value="<?= Utils::$context['sub']['start']['hour'] ?>" size="2" min="0" max="23">
+				:
+				<input type="number" name="minute" value="<?= Utils::$context['sub']['start']['min'] ?>" size="2" min="0" max="59">
+			</fieldset>
+			<fieldset>
+				<legend><?= Lang::getTxt('end_date_and_time', file: 'ManagePaid') ?></legend>
+				<select name="yearend" id="yearend">
+<?php /* Show a list of all the years we allow... */ ?>
+<?php for ($year = $first_year; $year <= $last_year; $year++): ?>
+					<option value="<?= $year ?>"<?= $year == Utils::$context['sub']['end']['year'] ? ' selected' : '' ?>><?= $year ?></option>
+<?php endfor; ?>
+				</select>
+				<select name="monthend" id="monthend">
+<?php /* There are 12 months per year - ensure that they all get listed. */ ?>
+<?php for ($month = 1; $month <= 12; $month++): ?>
+					<option value="<?= $month ?>"<?= $month == Utils::$context['sub']['end']['month'] ? ' selected' : '' ?>><?= Lang::getTxt(['months', $month], file: 'General') ?></option>
+<?php endfor; ?>
+				</select>
+				<select name="dayend" id="dayend">
+<?php /* This prints out all the days in the current month - this changes dynamically as we switch months. */ ?>
+<?php for ($day = 1; $day <= Utils::$context['sub']['end']['last_day']; $day++): ?>
+					<option value="<?= $day ?>"<?= $day == Utils::$context['sub']['end']['day'] ? ' selected' : '' ?>><?= $day ?></option>
+<?php endfor; ?>
+				</select>
+				&nbsp;&nbsp;&nbsp;
+				<input type="number" name="hourend" value="<?= Utils::$context['sub']['end']['hour'] ?>" size="2" min="0" max="23">
+				:
+				<input type="number" name="minuteend" value="<?= Utils::$context['sub']['end']['min'] ?>" size="2" min="0" max="59">
+			</fieldset>
+			<input type="submit" name="save_sub" value="<?= Lang::getTxt('paid_settings_save', file: 'ManagePaid') ?>" class="button">
+		</div><!-- .windowbg -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<script>
+		var oAddMemberSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'name_subscriber',
+			sControlId: 'name_control',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+		});
+	</script>
+<?php if (!empty(Utils::$context['pending_payments'])): ?>
+	<div class="cat_bar">
+		<h3 class="catbg"><?= Lang::getTxt('pending_payments', file: 'ManagePaid') ?></h3>
+	</div>
+	<div class="information">
+		<?= Lang::getTxt('pending_payments_desc', file: 'ManagePaid') ?>
+	</div>
+	<div class="cat_bar">
+		<h3 class="catbg"><?= Lang::getTxt('pending_payments_value', file: 'ManagePaid') ?></h3>
+	</div>
+	<div class="windowbg">
+		<ul>
+<?php foreach (Utils::$context['pending_payments'] as $id => $payment): ?>
+			<li>
+				<?= $payment['desc'] ?>
+				<span class="floatleft">
+					<a href="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modifyuser;lid=<?= Utils::$context['log_id'] ?>;pending=<?= $id ?>;accept"><?= Lang::getTxt('pending_payments_accept', file: 'ManagePaid') ?></a>
+				</span>
+				<span class="floatright">
+					<a href="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modifyuser;lid=<?= Utils::$context['log_id'] ?>;pending=<?= $id ?>;remove"><?= Lang::getTxt('pending_payments_remove', file: 'ManagePaid') ?></a>
+				</span>
+			</li>
+<?php endforeach; ?>
+		</ul>
+<?php endif; ?>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePaid/paid_done.php b/Themes/default/templates/ManagePaid/paid_done.php
new file mode 100644
index 00000000000..9d8a9fa3280
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/paid_done.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The "thank you" bit...
+ */
+?>
+	<div id="paid_subscription">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('paid_done', file: 'ManagePaid') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('paid_done_desc', file: 'ManagePaid') ?></p>
+			<br>
+			<a href="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['member']['id'] ?>;area=subscriptions"><?= Lang::getTxt('paid_sub_return', file: 'ManagePaid') ?></a>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePaid/user_subscription.php b/Themes/default/templates/ManagePaid/user_subscription.php
new file mode 100644
index 00000000000..77f76bca182
--- /dev/null
+++ b/Themes/default/templates/ManagePaid/user_subscription.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for a user to edit/pick their subscriptions.
+ */
+?>
+	<div id="paid_subscription">
+		<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=subscriptions;confirm" method="post">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('subscriptions', file: 'ManagePaid') ?></h3>
+			</div>
+<?php if (empty(Utils::$context['subscriptions'])): ?>
+			<div class="information">
+				<?= Lang::getTxt('paid_subs_none', file: 'ManagePaid') ?>
+			</div>
+<?php else: ?>
+			<div class="information">
+				<?= Lang::getTxt('paid_subs_desc', file: 'ManagePaid') ?>
+			</div><?php /* Print out all the subscriptions. */ ?>
+
+<?php foreach (Utils::$context['subscriptions'] as $id => $subscription): ?>
+<?php /* Ignore the inactive ones... */ ?>
+<?php if (empty($subscription['active'])): ?>
+<?php continue; ?>
+<?php endif; ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= $subscription['name'] ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><strong><?= $subscription['name'] ?></strong></p>
+				<p class="smalltext"><?= $subscription['desc'] ?></p>
+<?php if (!$subscription['flexible']): ?>
+				<div><strong><?= Lang::getTxt('paid_duration', file: 'ManagePaid') ?></strong> <?= $subscription['length'] ?></div>
+<?php endif; ?>
+<?php if (Profile::$member->is_me): ?>
+				<strong><?= Lang::getTxt('paid_cost', file: 'ManagePaid') ?></strong>
+<?php if ($subscription['flexible']): ?>
+				<select name="cur[<?= $subscription['id'] ?>]"><?php /* Print out the costs for this one. */ ?>
+
+<?php foreach ($subscription['costs'] as $duration => $value): ?>
+					<option value="<?= $duration ?>"><?= sprintf(Config::$modSettings['paid_currency_symbol'], $value) ?>/<?= Lang::getTxt($duration, file: 'ManagePaid') ?></option>
+<?php endforeach; ?>
+				</select>
+<?php else: ?>
+				<?= sprintf(Config::$modSettings['paid_currency_symbol'], $subscription['costs']['fixed']) ?>
+
+<?php endif; ?>
+				<hr>
+				<input type="submit" name="sub_id[<?= $subscription['id'] ?>]" value="<?= Lang::getTxt('paid_order', file: 'ManagePaid') ?>" class="button">
+<?php else: ?>
+				<a href="<?= Config::$scripturl ?>?action=admin;area=paidsubscribe;sa=modifyuser;sid=<?= $subscription['id'] ?>;uid=<?= Utils::$context['member']['id'] ?><?= (empty(Utils::$context['current'][$subscription['id']]) ? '' : ';lid=' . Utils::$context['current'][$subscription['id']]['id']) ?>"><?= Lang::getTxt(empty(Utils::$context['current'][$subscription['id']]) ? 'paid_admin_add' : 'paid_edit_subscription', file: 'ManagePaid') ?></a>
+<?php endif; ?>
+			</div><!-- .windowbg -->
+<?php endforeach; ?>
+<?php endif; ?>
+		</form>
+		<br class="clear">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('paid_current', file: 'ManagePaid') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('paid_current_desc', file: 'ManagePaid') ?>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th style="width: 30%"><?= Lang::getTxt('paid_name', file: 'ManagePaid') ?></th>
+					<th><?= Lang::getTxt('paid_status', file: 'ManagePaid') ?></th>
+					<th><?= Lang::getTxt('start_date', file: 'ManagePaid') ?></th>
+					<th><?= Lang::getTxt('end_date', file: 'ManagePaid') ?></th>
+				</tr>
+			</thead>
+			<tbody>
+<?php if (empty(Utils::$context['current'])): ?>
+				<tr class="windowbg">
+					<td colspan="4">
+						<?= Lang::getTxt('paid_none_yet', file: 'ManagePaid') ?>
+					</td>
+				</tr>
+<?php endif; ?>
+<?php foreach (Utils::$context['current'] as $sub): ?>
+<?php if (!$sub['hide']): ?>
+				<tr class="windowbg">
+					<td>
+						<?= (User::$me->is_admin ? '<a href="' . Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $sub['id'] . '">' . $sub['name'] . '</a>' : $sub['name']) ?>
+					</td>
+					<td>
+						<span style="color: <?= ($sub['status'] == 2 ? 'green' : ($sub['status'] == 1 ? 'red' : 'orange')) ?>"><strong><?= $sub['status_text'] ?></strong></span>
+					</td>
+					<td><?= $sub['start'] ?></td>
+					<td><?= $sub['end'] ?></td>
+				</tr>
+<?php endif; ?>
+<?php endforeach; ?>
+			</tbody>
+		</table>
+	</div><!-- #paid_subscription -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/by_board.php b/Themes/default/templates/ManagePermissions/by_board.php
new file mode 100644
index 00000000000..5bf4e00a675
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/by_board.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * THe page that shows which permissions profile applies to each board
+ */
+?>
+		<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=board" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('permissions_boards', file: 'Admin') ?></h3>
+			</div>
+			<div class="information">
+				<?= Lang::getTxt('permissions_boards_desc', file: 'ManagePermissions') ?>
+			</div>
+
+			<div class="cat_bar">
+				<h3 id="board_permissions" class="catbg flow_hidden">
+					<span class="perm_name floatleft"><?= Lang::getTxt('board_name', file: 'General') ?></span>
+					<span class="perm_profile floatleft"><?= Lang::getTxt('permission_profile', file: 'ManagePermissions') ?></span>
+				</h3>
+			</div>
+			<div class="windowbg">
+<?php foreach (Utils::$context['categories'] as $category): ?>
+				<div class="sub_bar">
+					<h3 class="subbg"><?= $category['name'] ?></h3>
+				</div>
+<?php if (!empty($category['boards'])): ?>
+				<ul class="perm_boards flow_hidden">
+<?php endif; ?>
+<?php foreach ($category['boards'] as $board): ?>
+					<li class="flow_hidden">
+						<span class="perm_board floatleft">
+							<a href="<?= Config::$scripturl ?>?action=admin;area=manageboards;sa=board;boardid=<?= $board['id'] ?>;rid=permissions;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= str_repeat('-', $board['child_level']) ?> <?= $board['name'] ?></a>
+						</span>
+						<span class="perm_boardprofile floatleft">
+<?php if (Utils::$context['edit_all']): ?>
+							<select name="boardprofile[<?= $board['id'] ?>]">
+<?php foreach (Utils::$context['profiles'] as $id => $profile): ?>
+								<option value="<?= $id ?>"<?= $id == $board['profile'] ? ' selected' : '' ?>><?= $profile['name'] ?></option>
+<?php endforeach; ?>
+							</select>
+<?php else: ?>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=index;pid=<?= $board['profile'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= $board['profile_name'] ?></a>
+<?php endif; ?>
+						</span>
+					</li>
+<?php endforeach; ?>
+<?php if (!empty($category['boards'])): ?>
+				</ul>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (Utils::$context['edit_all']): ?>
+				<input type="submit" name="save_changes" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+<?php else: ?>
+				<a class="button" href="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=board;edit;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('permissions_board_all', file: 'ManagePermissions') ?></a>
+<?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-mpb_token_var'] ?>" value="<?= Utils::$context['admin-mpb_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/edit_profiles.php b/Themes/default/templates/ManagePermissions/edit_profiles.php
new file mode 100644
index 00000000000..188c58aa53b
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/edit_profiles.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Edit permission profiles (predefined).
+ */
+?>
+	<div id="admin_form_wrapper">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=profiles" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('permissions_profile_edit', file: 'ManagePermissions') ?></h3>
+			</div>
+
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th><?= Lang::getTxt('permissions_profile_name', file: 'ManagePermissions') ?></th>
+						<th><?= Lang::getTxt('permissions_profile_used_by', file: 'ManagePermissions') ?></th>
+						<th class="table_icon"<?= !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '' ?>><?= Lang::getTxt('delete', file: 'General') ?></th>
+					</tr>
+				</thead>
+				<tbody>
+<?php foreach (Utils::$context['profiles'] as $profile): ?>
+					<tr class="windowbg">
+						<td>
+<?php if (!empty(Utils::$context['show_rename_boxes']) && $profile['can_rename']): ?>
+							<input type="text" name="rename_profile[<?= $profile['id'] ?>]" value="<?= $profile['name'] ?>">
+<?php else: ?>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=index;pid=<?= $profile['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= $profile['name'] ?></a>
+<?php endif; ?>
+						</td>
+						<td>
+							<?= !empty($profile['boards_text']) ? $profile['boards_text'] : Lang::getTxt('permissions_profile_used_by_count', [0], file: 'ManagePermissions') ?>
+						</td>
+						<td<?= !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '' ?>>
+							<input type="checkbox" name="delete_profile[]" value="<?= $profile['id'] ?>" <?= $profile['can_delete'] ? '' : 'disabled' ?>>
+						</td>
+					</tr>
+<?php endforeach; ?>
+				</tbody>
+			</table>
+			<div class="flow_auto righttext padding">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-mpp_token_var'] ?>" value="<?= Utils::$context['admin-mpp_token'] ?>">
+<?php if (Utils::$context['can_rename_something']): ?>
+				<input type="submit" name="rename" value="<?= Lang::getTxt(empty(Utils::$context['show_rename_boxes']) ? 'permissions_profile_rename' : 'permissions_commit', file: 'ManagePermissions') ?>" class="button">
+<?php endif; ?>
+				<input type="submit" name="delete" value="<?= Lang::getTxt('quickmod_delete_selected', file: 'General') ?>" class="button" <?= !empty(Utils::$context['show_rename_boxes']) ? ' style="display:none"' : '' ?>>
+			</div>
+		</form>
+		<br>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=profiles" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('permissions_profile_new', file: 'ManagePermissions') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('permissions_profile_name', file: 'ManagePermissions') ?></strong>
+					</dt>
+					<dd>
+						<input type="text" name="profile_name" value="">
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('permissions_profile_copy_from', file: 'ManagePermissions') ?></strong>
+					</dt>
+					<dd>
+						<select name="copy_from">
+<?php foreach (Utils::$context['profiles'] as $id => $profile): ?>
+							<option value="<?= $id ?>"><?= $profile['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+					</dd>
+				</dl>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-mpp_token_var'] ?>" value="<?= Utils::$context['admin-mpp_token'] ?>">
+				<input type="submit" name="create" value="<?= Lang::getTxt('permissions_profile_new_create', file: 'ManagePermissions') ?>" class="button">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/index.php b/Themes/default/templates/ManagePermissions/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManagePermissions/inline_permissions.php b/Themes/default/templates/ManagePermissions/inline_permissions.php
new file mode 100644
index 00000000000..013bd733e64
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/inline_permissions.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A form for displaying inline permissions, such as on a settings page.
+ */
+?>
+
+<?php /* This looks really weird, but it keeps things nested properly... */ ?>
+											<fieldset id="<?= Utils::$context['current_permission'] ?>">
+												<legend><a href="javascript:void(0);" onclick="document.getElementById('<?= Utils::$context['current_permission'] ?>').style.display = 'none';document.getElementById('<?= Utils::$context['current_permission'] ?>_groups_link').style.display = 'block'; return false;" class="toggle_up"> <?= Lang::getTxt('avatar_select_permission', file: 'Admin') ?></a></legend>
+<?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+												<ul>
+<?php else: ?>
+												<div class="information"><?= Lang::getTxt('permissions_option_desc', file: 'ManagePermissions') ?></div>
+												<dl class="settings">
+													<dt>
+														<span class="perms"><strong><?= Lang::getTxt('permissions_option_on', file: 'ManagePermissions') ?></strong></span>
+														<span class="perms"><strong><?= Lang::getTxt('permissions_option_off', file: 'ManagePermissions') ?></strong></span>
+														<span class="perms red"><strong><?= Lang::getTxt('permissions_option_deny', file: 'ManagePermissions') ?></strong></span>
+													</dt>
+													<dd>
+													</dd>
+<?php endif; ?>
+<?php foreach (Utils::$context['member_groups'] as $group): ?>
+<?php if (!empty(Config::$modSettings['permission_enable_deny'])): ?>
+													<dt>
+<?php else: ?>
+													<li>
+<?php endif; ?>
+<?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+														<input type="checkbox" name="<?= Utils::$context['current_permission'] ?>[<?= $group['id'] ?>]" value="on"<?= $group['status'] == 'on' ? ' checked' : '' ?>>
+<?php else: ?>
+														<span class="perms"><input type="radio" name="<?= Utils::$context['current_permission'] ?>[<?= $group['id'] ?>]" value="on"<?= $group['status'] == 'on' ? ' checked' : '' ?>></span>
+														<span class="perms"><input type="radio" name="<?= Utils::$context['current_permission'] ?>[<?= $group['id'] ?>]" value="off"<?= $group['status'] == 'off' ? ' checked' : '' ?>></span>
+														<span class="perms"><input type="radio" name="<?= Utils::$context['current_permission'] ?>[<?= $group['id'] ?>]" value="deny"<?= $group['status'] == 'deny' ? ' checked' : '' ?>></span>
+<?php endif; ?>
+<?php if (!empty(Config::$modSettings['permission_enable_deny'])): ?>
+													</dt>
+													<dd>
+														<span<?= $group['is_postgroup'] ? ' style="font-style: italic;"' : '' ?>><?= $group['name'] ?></span>
+													</dd>
+<?php else: ?>
+														<span<?= $group['is_postgroup'] ? ' style="font-style: italic;"' : '' ?>><?= $group['name'] ?></span>
+													</li>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+													<li>
+														<input type="checkbox" onclick="invertAll(this, this.form, '<?= Utils::$context['current_permission'] ?>[');">
+														<span><?= Lang::getTxt('check_all', file: 'General') ?></span>
+													</li>
+												</ul>
+<?php else: ?>
+												</dl>
+<?php endif; ?>
+											</fieldset>
+
+											<a href="javascript:void(0);" onclick="document.getElementById('<?= Utils::$context['current_permission'] ?>').style.display = 'block'; document.getElementById('<?= Utils::$context['current_permission'] ?>_groups_link').style.display = 'none'; return false;" id="<?= Utils::$context['current_permission'] ?>_groups_link" style="display: none;" class="toggle_down"> <?= Lang::getTxt('avatar_select_permission', file: 'Admin') ?></a>
+
+											<script>
+												document.getElementById("<?= Utils::$context['current_permission'] ?>").style.display = "none";
+												document.getElementById("<?= Utils::$context['current_permission'] ?>_groups_link").style.display = "";
+											</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/modify_group.php b/Themes/default/templates/ManagePermissions/modify_group.php
new file mode 100644
index 00000000000..453e1f68d7a
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/modify_group.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Modify a group's permissions
+ */
+?><?php /* Cannot be edited? */ ?><?php if (!Utils::$context['profile']['can_modify']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('permission_cannot_edit', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles'], file: 'ManagePermissions') ?>
+	</div><?php else: ?>
+	<script>
+		window.smf_usedDeny = false;
+
+		function warnAboutDeny()
+		{
+			if (window.smf_usedDeny)
+				return confirm("<?= Lang::getTxt('permissions_deny_dangerous', file: 'ManagePermissions') ?>");
+			else
+				return true;
+		}
+	</script><?php endif; ?>
+		<form id="permissions" action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=modify2;group=<?= Utils::$context['group']['id'] ?>;pid=<?= Utils::$context['profile']['id'] ?>" method="post" accept-charset="UTF-8" name="permissionForm" onsubmit="return warnAboutDeny();"><?php if (!empty(Config::$modSettings['permission_enable_deny']) && Utils::$context['group']['id'] != -1): ?>
+			<div class="noticebox">
+				<?= Lang::getTxt('permissions_option_desc', file: 'ManagePermissions') ?>
+			</div><?php endif; ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?php if (Utils::$context['permission_type'] == 'board'): ?>
+				<?= Lang::getTxt('permissions_for_in', ['group' => Utils::$context['group']['name'], 'profile' => Utils::$context['profile']['name']], file: 'ManagePermissions') ?><?php else: ?>
+				<?= Lang::getTxt(Utils::$context['permission_type'] == 'global' ? 'permissions_general_for' : 'permissions_board_for', ['name' => Utils::$context['group']['name']], file: 'ManagePermissions') ?><?php endif; ?>
+				</h3>
+			</div><?php /* Draw out the main bits. */ ?><?php $this->subTemplate('modify_group_display', ['type' => Utils::$context['permission_type']]); ?><?php if (Utils::$context['profile']['can_modify']): ?>
+			<div class="padding">
+				<input type="submit" value="<?= Lang::getTxt('permissions_commit', file: 'ManagePermissions') ?>" class="button">
+			</div><?php endif; ?><?php foreach (Utils::$context['hidden_perms'] as $hidden_perm): ?>
+			<input type="hidden" name="perm[<?= $hidden_perm[0] ?>][<?= $hidden_perm[1] ?>]" value="<?= $hidden_perm[2] ?>"><?php endforeach; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-mp_token_var'] ?>" value="<?= Utils::$context['admin-mp_token'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/modify_group_display.php b/Themes/default/templates/ManagePermissions/modify_group_display.php
new file mode 100644
index 00000000000..34bce190022
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/modify_group_display.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The way of looking at permissions.
+ *
+ * @param string $type The permissions type
+ */
+?><?php
+$permission_type = &Utils::$context['permissions'][$type];
+$disable_field = Utils::$context['profile']['can_modify'] ? '' : 'disabled ';
+?><?php foreach ($permission_type['columns'] as $column): ?>
+					<table class="table_grid half_content"><?php foreach ($column as $permissionGroup): ?><?php if (empty($permissionGroup['permissions'])): ?><?php continue; ?><?php endif; ?><?php
+// Are we likely to have something in this group to display or is it all hidden?
+$has_display_content = false;
+?><?php if (!$permissionGroup['hidden']): ?><?php /* Before we go any further check we are going to have some data to print otherwise we just have a silly heading. */ ?><?php foreach ($permissionGroup['permissions'] as $permission): ?><?php if (!$permission['hidden']): ?><?php $has_display_content = true; ?><?php endif; ?><?php endforeach; ?><?php if ($has_display_content): ?>
+						<tr class="title_bar">
+							<th></th>
+							<th<?= Utils::$context['group']['id'] == -1 ? ' colspan="2"' : '' ?> class="smalltext"><?= $permissionGroup['name'] ?></th><?php if (Utils::$context['group']['id'] != -1): ?>
+							<th><?= Lang::getTxt('permissions_option_own', file: 'ManagePermissions') ?></th>
+							<th><?= Lang::getTxt('permissions_option_any', file: 'ManagePermissions') ?></th><?php endif; ?>
+						</tr><?php endif; ?><?php endif; ?><?php foreach ($permissionGroup['permissions'] as $permission): ?><?php if (!$permission['hidden'] && !$permissionGroup['hidden']): ?>
+						<tr class="windowbg">
+							<td>
+								<?= $permission['show_help'] ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=permissionhelp_' . $permission['id'] . '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : '' ?>
+							</td>
+							<td class="lefttext full_width">
+								<?= $permission['name'] ?><?= (!empty($permission['note']) ? '<br>
+								<strong class="smalltext">' . $permission['note'] . '</strong>' : '') ?>
+							</td>
+							<td><?php if ($permission['has_own_any']): ?><?php /* Guests can't do their own thing. */ ?><?php if (Utils::$context['group']['id'] != -1): ?><?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+								<input type="checkbox" name="perm[<?= $permission_type['id'] ?>][<?= $permission['own']['id'] ?>]"<?= $permission['own']['select'] == 'on' ? ' checked="checked"' : '' ?> value="on" id="<?= $permission['own']['id'] ?>_on" <?= $disable_field ?>><?php else: ?>
+								<select name="perm[<?= $permission_type['id'] ?>][<?= $permission['own']['id'] ?>]" <?= $disable_field ?>><?php foreach (['on', 'off', 'deny'] as $c): ?>
+									<option <?= $permission['own']['select'] == $c ? ' selected' : '' ?> value="<?= $c ?>"><?= Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions') ?></option><?php endforeach; ?>
+								</select><?php endif; ?>
+							</td>
+							<td><?php endif; ?><?php if (empty(Config::$modSettings['permission_enable_deny']) || Utils::$context['group']['id'] == -1): ?>
+								<input type="checkbox" name="perm[<?= $permission_type['id'] ?>][<?= $permission['any']['id'] ?>]"<?= $permission['any']['select'] == 'on' ? ' checked="checked"' : '' ?> value="on" <?= $disable_field ?>><?php else: ?>
+								<select name="perm[<?= $permission_type['id'] ?>][<?= $permission['any']['id'] ?>]" <?= $disable_field ?>><?php foreach (['on', 'off', 'deny'] as $c): ?>
+									<option <?= $permission['any']['select'] == $c ? ' selected' : '' ?> value="<?= $c ?>"><?= Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions') ?></option><?php endforeach; ?>
+								</select><?php endif; ?><?php else: ?><?php if (Utils::$context['group']['id'] != -1): ?>
+							</td>
+							<td><?php endif; ?><?php if (empty(Config::$modSettings['permission_enable_deny']) || Utils::$context['group']['id'] == -1): ?>
+								<input type="checkbox" name="perm[<?= $permission_type['id'] ?>][<?= $permission['id'] ?>]"<?= $permission['select'] == 'on' ? ' checked="checked"' : '' ?> value="on" <?= $disable_field ?>><?php else: ?>
+								<select name="perm[<?= $permission_type['id'] ?>][<?= $permission['id'] ?>]" <?= $disable_field ?>><?php foreach (['on', 'off', 'deny'] as $c): ?>
+									<option <?= $permission['select'] == $c ? ' selected' : '' ?> value="<?= $c ?>"><?= Lang::getTxt('permissions_option_' . $c, file: 'ManagePermissions') ?></option><?php endforeach; ?>
+								</select><?php endif; ?><?php endif; ?>
+							</td>
+						</tr><?php endif; ?><?php endforeach; ?><?php endforeach; ?>
+					</table><?php endforeach; ?>
+					<br class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/permission_index.php b/Themes/default/templates/ManagePermissions/permission_index.php
new file mode 100644
index 00000000000..44f5a5331bb
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/permission_index.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main manage permissions page
+ */
+?><?php /* Not allowed to edit? */ ?><?php if (!Utils::$context['can_modify']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('permission_cannot_edit', ['url' => Config::$scripturl . '?action=admin;area=permissions;sa=profiles'], file: 'ManagePermissions') ?>
+	</div><?php endif; ?>
+	<div id="admin_form_wrapper">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=quick" method="post" accept-charset="UTF-8" name="permissionForm" id="permissionForm"><?php if (!empty(Utils::$context['profile'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('permissions_for_profile', Utils::$context['profile'], file: 'ManagePermissions') ?></h3>
+			</div><?php else: ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('permissions_title', file: 'ManagePermissions') ?></h3>
+			</div><?php endif; ?>
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th><?= Lang::getTxt('membergroups_name', file: 'ManageMembers') ?></th>
+						<th class="small_table"><?= Lang::getTxt('membergroups_members_top', file: 'ManageMembers') ?></th><?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+						<th class="small_table"><?= Lang::getTxt('membergroups_permissions', file: 'Admin') ?></th><?php else: ?>
+						<th class="small_table"><?= Lang::getTxt('permissions_allowed', file: 'ManagePermissions') ?></th>
+						<th class="small_table"><?= Lang::getTxt('permissions_denied', file: 'ManagePermissions') ?></th><?php endif; ?>
+						<th class="small_table"><?= Lang::getTxt(Utils::$context['can_modify'] ? 'permissions_modify' : 'permissions_view', file: 'ManagePermissions') ?></th>
+						<th class="table_icon centercol">
+							<?= Utils::$context['can_modify'] ? '<input type="checkbox" onclick="invertAll(this, this.form, \'group\');">' : '' ?>
+						</th>
+					</tr>
+				</thead>
+				<tbody><?php foreach (Utils::$context['groups'] as $group): ?>
+					<tr class="windowbg">
+						<td>
+							<?= !empty($group['help']) ? ' <a class="help" href="' . Config::$scripturl . '?action=helpadmin;help=' . $group['help'] . '" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a> ' : '<img class="icon" src="' . Theme::$current->settings['images_url'] . '/blank.png" alt="' . Lang::getTxt('help', file: 'General') . '">' ?><span><?= $group['name'] ?></span><?php if (!empty($group['children'])): ?>
+							<br>
+							<span class="smalltext"><?= Lang::getTxt('permissions_includes_inherited', ['list' => Lang::sentenceList(array_map(fn($grp) => '"' . $grp . '"', $group['children']))], file: 'ManagePermissions') ?></span><?php endif; ?>
+						</td>
+						<td><?= $group['can_search'] ? $group['link'] : ($group['num_members'] ?? Lang::getTxt('not_applicable', file: 'General')) ?></td><?php if (empty(Config::$modSettings['permission_enable_deny'])): ?>
+						<td><?= $group['num_permissions']['allowed'] ?></td><?php else: ?>
+						<td <?= $group['id'] == 1 ? ' style="font-style: italic;"' : '' ?>>
+							<?= $group['num_permissions']['allowed'] ?>
+						</td>
+						<td <?= $group['id'] == 1 || $group['id'] == -1 ? ' style="font-style: italic;"' : (!empty($group['num_permissions']['denied']) ? ' class="red"' : '') ?>>
+							<?= $group['num_permissions']['denied'] ?>
+						</td><?php endif; ?>
+						<td>
+							<?= $group['allow_modify'] ? '<a href="' . Config::$scripturl . '?action=admin;area=permissions;sa=modify;group=' . $group['id'] . (empty(Utils::$context['profile']) ? '' : ';pid=' . Utils::$context['profile']['id']) . '">' . Lang::getTxt(Utils::$context['can_modify'] ? 'permissions_modify' : 'permissions_view', file: 'ManagePermissions') . '</a>' : '' ?>
+						</td>
+						<td class="centercol">
+							<?= $group['allow_modify'] && Utils::$context['can_modify'] ? '<input type="checkbox" name="group[]" value="' . $group['id'] . '">' : '' ?>
+						</td>
+					</tr><?php endforeach; ?>
+				</tbody>
+			</table>
+			<br><?php /* Advanced stuff... */ ?><?php if (Utils::$context['can_modify']): ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="#" id="permissions_panel_link"><?= Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions') ?></a>
+				</h3>
+				<span id="permissions_panel_toggle" class="<?= empty(Utils::$context['show_advanced_options']) ? 'toggle_down' : 'toggle_up' ?>" style="display: none;"></span>
+			</div>
+			<div id="permissions_panel_advanced" class="windowbg">
+				<fieldset>
+					<legend><?= Lang::getTxt('permissions_with_selection', file: 'ManagePermissions') ?></legend>
+					<dl class="settings">
+						<dt>
+							<a class="help" href="<?= Config::$scripturl ?>?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+							<?= Lang::getTxt('permissions_apply_pre_defined', file: 'ManagePermissions') ?>
+						</dt>
+						<dd>
+							<select name="predefined">
+								<option value="">(<?= Lang::getTxt('permissions_select_pre_defined', file: 'ManagePermissions') ?>)</option>
+								<option value="restrict"><?= Lang::getTxt('permitgroups_restrict', file: 'Admin') ?></option>
+								<option value="standard"><?= Lang::getTxt('permitgroups_standard', file: 'Admin') ?></option>
+								<option value="moderator"><?= Lang::getTxt('permitgroups_moderator', file: 'Admin') ?></option>
+								<option value="maintenance"><?= Lang::getTxt('permitgroups_maintenance', file: 'Admin') ?></option>
+							</select>
+						</dd>
+						<dt>
+							<?= Lang::getTxt('permissions_like_group', file: 'ManagePermissions') ?>
+						</dt>
+						<dd>
+							<select name="copy_from">
+								<option value="empty">(<?= Lang::getTxt('permissions_select_membergroup', file: 'ManagePermissions') ?>)</option><?php foreach (Utils::$context['groups'] as $group): ?><?php if ($group['id'] != 1): ?>
+								<option value="<?= $group['id'] ?>"><?= $group['name'] ?></option><?php endif; ?><?php endforeach; ?>
+							</select>
+						</dd>
+						<dt>
+							<select name="add_remove">
+								<option value="add"><?= Lang::getTxt('permissions_add', file: 'ManagePermissions') ?></option>
+								<option value="clear"><?= Lang::getTxt('permissions_remove', file: 'ManagePermissions') ?></option><?php if (!empty(Config::$modSettings['permission_enable_deny'])): ?>
+								<option value="deny"><?= Lang::getTxt('permissions_deny', file: 'ManagePermissions') ?></option><?php endif; ?>
+							</select>
+						</dt>
+						<dd style="overflow:auto;">
+							<select name="permissions">
+								<option value="">(<?= Lang::getTxt('permissions_select_permission', file: 'ManagePermissions') ?>)</option><?php foreach (Utils::$context['permissions'] as $permissionType): ?><?php if (($permissionType['id'] == 'global') == (!empty(Utils::$context['profile']))): ?><?php continue; ?><?php endif; ?><?php foreach ($permissionType['columns'] as $column): ?><?php foreach ($column as $permissionGroup): ?><?php if ($permissionGroup['hidden']): ?><?php continue; ?><?php endif; ?>
+								<option value="" disabled>[<?= $permissionGroup['name'] ?>]</option><?php foreach ($permissionGroup['permissions'] as $perm): ?><?php if ($perm['hidden']): ?><?php continue; ?><?php endif; ?><?php if ($perm['has_own_any']): ?>
+								<option value="<?= $permissionType['id'] ?>/<?= $perm['own']['id'] ?>">&nbsp;&nbsp;&nbsp;<?= $perm['name'] ?> (<?= $perm['own']['name'] ?>)</option>
+								<option value="<?= $permissionType['id'] ?>/<?= $perm['any']['id'] ?>">&nbsp;&nbsp;&nbsp;<?= $perm['name'] ?> (<?= $perm['any']['name'] ?>)</option><?php else: ?>
+								<option value="<?= $permissionType['id'] ?>/<?= $perm['id'] ?>">&nbsp;&nbsp;&nbsp;<?= $perm['name'] ?></option><?php endif; ?><?php endforeach; ?><?php endforeach; ?><?php endforeach; ?><?php endforeach; ?>
+							</select>
+						</dd>
+					</dl>
+				</fieldset>
+				<input type="submit" value="<?= Lang::getTxt('permissions_set_permissions', file: 'ManagePermissions') ?>" onclick="return checkSubmit();" class="button">
+			</div><!-- #permissions_panel_advanced --><?php /* Javascript for the advanced stuff. */ ?>
+			<script>
+				var oPermissionsPanelToggle = new smc_Toggle({
+					bToggleEnabled: true,
+					bCurrentlyCollapsed: <?= empty(Utils::$context['show_advanced_options']) ? 'true' : 'false' ?>,
+					aSwappableContainers: [
+						'permissions_panel_advanced'
+					],
+					aSwapImages: [
+						{
+							sId: 'permissions_panel_toggle',
+							altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+							altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+						}
+					],
+					aSwapLinks: [
+						{
+							sId: 'permissions_panel_link',
+							msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions')) ?>,
+							msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('permissions_advanced_options', file: 'ManagePermissions')) ?>
+
+						}
+					],
+					oThemeOptions: {
+						bUseThemeSettings: true,
+						sOptionName: 'admin_preferences',
+						sSessionVar: smf_session_var,
+						sSessionId: smf_session_id,
+						sThemeId: '1',
+						sAdditionalVars: ';admin_key=app'
+					}
+				});
+
+				function checkSubmit()
+				{
+					if ((document.forms.permissionForm.predefined.value != "" && (document.forms.permissionForm.copy_from.value != "empty" || document.forms.permissionForm.permissions.value != "")) || (document.forms.permissionForm.copy_from.value != "empty" && document.forms.permissionForm.permissions.value != ""))
+					{
+						alert("<?= Lang::getTxt('permissions_only_one_option', file: 'ManagePermissions') ?>");
+						return false;
+					}
+					if (document.forms.permissionForm.predefined.value == "" && document.forms.permissionForm.copy_from.value == "" && document.forms.permissionForm.permissions.value == "")
+					{
+						alert("<?= Lang::getTxt('permissions_no_action', file: 'ManagePermissions') ?>");
+						return false;
+					}
+					if (document.forms.permissionForm.permissions.value != "" && document.forms.permissionForm.add_remove.value == "deny")
+						return confirm("<?= Lang::getTxt('permissions_deny_dangerous', file: 'ManagePermissions') ?>");
+
+					return true;
+				}
+			</script><?php if (!empty(Utils::$context['profile'])): ?>
+			<input type="hidden" name="pid" value="<?= Utils::$context['profile']['id'] ?>"><?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-mpq_token_var'] ?>" value="<?= Utils::$context['admin-mpq_token'] ?>"><?php endif; ?>
+		</form>
+	</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManagePermissions/postmod_permissions.php b/Themes/default/templates/ManagePermissions/postmod_permissions.php
new file mode 100644
index 00000000000..6f80b1ec930
--- /dev/null
+++ b/Themes/default/templates/ManagePermissions/postmod_permissions.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Edit post moderation permissions.
+ */
+?>
+					<div id="admin_form_wrapper">
+						<form action="<?= Config::$scripturl ?>?action=admin;area=permissions;sa=postmod;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" name="postmodForm" id="postmodForm" accept-charset="UTF-8">
+							<div class="cat_bar">
+								<h3 class="catbg"><?= Lang::getTxt('permissions_post_moderation', file: 'Admin') ?></h3>
+							</div>
+<?php /* First, we have the bit where we can enable or disable this bad boy. */ ?>
+							<div class="windowbg">
+								<dl class="settings">
+									<dt><?= Lang::getTxt('permissions_post_moderation_enable', file: 'ManagePermissions') ?></dt>
+									<dd><input type="checkbox" name="postmod_active"<?= !empty(Config::$modSettings['postmod_active']) ? ' checked' : '' ?>></dd>
+								</dl>
+							</div>
+<?php /* If we're not active, there's a bunch of stuff we don't need to show. */ ?>
+<?php if (!empty(Config::$modSettings['postmod_active'])): ?>
+<?php /* Got advanced permissions - if so warn! */ ?>
+<?php if (!empty(Config::$modSettings['permission_enable_deny'])): ?>
+							<div class="information"><?= Lang::getTxt('permissions_post_moderation_deny_note', file: 'ManagePermissions') ?></div>
+<?php endif; ?>
+							<div class="padding">
+								<strong><?= Lang::getTxt('permissions_post_moderation_legend', file: 'ManagePermissions') ?></strong>
+								<ul class="floatleft smalltext block">
+									<li><span class="main_icons post_moderation_allow"></span><?= Lang::getTxt('permissions_post_moderation_allow', file: 'ManagePermissions') ?></li>
+									<li><span class="main_icons post_moderation_moderate"></span><?= Lang::getTxt('permissions_post_moderation_moderate', file: 'ManagePermissions') ?></li>
+									<li><span class="main_icons post_moderation_deny"></span><?= Lang::getTxt('permissions_post_moderation_disallow', file: 'ManagePermissions') ?></li>
+								</ul>
+								<br><br><br>
+								<p class="righttext floatright block">
+									<?= Lang::getTxt('permissions_post_moderation_select', file: 'ManagePermissions') ?>
+									<select name="pid" onchange="document.forms.postmodForm.submit();">
+<?php foreach (Utils::$context['profiles'] as $profile): ?>
+<?php if ($profile['can_modify']): ?>
+										<option value="<?= $profile['id'] ?>"<?= $profile['id'] == Utils::$context['current_profile'] ? ' selected' : '' ?>><?= $profile['name'] ?></option>
+<?php endif; ?>
+<?php endforeach; ?>
+									</select>
+									<input type="submit" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button">
+								</p>
+							</div><!-- .padding -->
+							<table class="table_grid" id="postmod">
+								<thead>
+									<tr class="title_bar">
+										<th></th>
+										<th class="centercol" colspan="3">
+											<?= Lang::getTxt('permissions_post_moderation_new_topics', file: 'ManagePermissions') ?>
+										</th>
+										<th class="centercol" colspan="3">
+											<?= Lang::getTxt('permissions_post_moderation_replies_own', file: 'ManagePermissions') ?>
+										</th>
+										<th class="centercol" colspan="3">
+											<?= Lang::getTxt('permissions_post_moderation_replies_any', file: 'ManagePermissions') ?>
+										</th>
+<?php if (Config::$modSettings['attachmentEnable'] == 1): ?>
+										<th class="centercol" colspan="3">
+											<?= Lang::getTxt('permissions_post_moderation_attachments', file: 'ManagePermissions') ?>
+										</th>
+<?php endif; ?>
+									</tr>
+									<tr class="windowbg">
+										<th class="quarter_table">
+											<?= Lang::getTxt('permissions_post_moderation_group', file: 'ManagePermissions') ?>
+										</th>
+										<th><span class="main_icons post_moderation_allow"></span></th>
+										<th><span class="main_icons post_moderation_moderate"></span></th>
+										<th><span class="main_icons post_moderation_deny"></span></th>
+										<th><span class="main_icons post_moderation_allow"></span></th>
+										<th><span class="main_icons post_moderation_moderate"></span></th>
+										<th><span class="main_icons post_moderation_deny"></span></th>
+										<th><span class="main_icons post_moderation_allow"></span></th>
+										<th><span class="main_icons post_moderation_moderate"></span></th>
+										<th><span class="main_icons post_moderation_deny"></span></th>
+<?php if (Config::$modSettings['attachmentEnable'] == 1): ?>
+										<th><span class="main_icons post_moderation_allow"></span></th>
+										<th><span class="main_icons post_moderation_moderate"></span></th>
+										<th><span class="main_icons post_moderation_deny"></span></th>
+<?php endif; ?>
+									</tr>
+								</thead>
+								<tbody>
+<?php foreach (Utils::$context['profile_groups'] as $group): ?>
+									<tr class="windowbg">
+										<td class="half_table">
+											<span <?= ($group['color'] ? 'style="color: ' . $group['color'] . '"' : '') ?>><?= $group['name'] ?></span>
+<?php if (!empty($group['children'])): ?>
+											<br>
+											<span class="smalltext"><?= Lang::getTxt('permissions_includes_inherited', ['list' => Lang::sentenceList(array_map(fn($grp) => '"' . $grp . '"', $group['children']))], file: 'ManagePermissions') ?></span>
+<?php endif; ?>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="new_topic[<?= $group['id'] ?>]" value="allow"<?= $group['new_topic'] == 'allow' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="new_topic[<?= $group['id'] ?>]" value="moderate"<?= $group['new_topic'] == 'moderate' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="new_topic[<?= $group['id'] ?>]" value="disallow"<?= $group['new_topic'] == 'disallow' ? ' checked' : '' ?>>
+										</td>
+<?php /* Guests can't have "own" permissions */ ?>
+<?php if ($group['id'] == '-1'): ?>
+										<td colspan="3"></td>
+<?php else: ?>
+										<td class="centercol">
+											<input type="radio" name="replies_own[<?= $group['id'] ?>]" value="allow"<?= $group['replies_own'] == 'allow' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="replies_own[<?= $group['id'] ?>]" value="moderate"<?= $group['replies_own'] == 'moderate' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="replies_own[<?= $group['id'] ?>]" value="disallow"<?= $group['replies_own'] == 'disallow' ? ' checked' : '' ?>>
+										</td>
+<?php endif; ?>
+										<td class="centercol">
+											<input type="radio" name="replies_any[<?= $group['id'] ?>]" value="allow"<?= $group['replies_any'] == 'allow' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="replies_any[<?= $group['id'] ?>]" value="moderate"<?= $group['replies_any'] == 'moderate' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="replies_any[<?= $group['id'] ?>]" value="disallow"<?= $group['replies_any'] == 'disallow' ? ' checked' : '' ?>>
+										</td>
+<?php if (Config::$modSettings['attachmentEnable'] == 1): ?>
+										<td class="centercol">
+											<input type="radio" name="attachment[<?= $group['id'] ?>]" value="allow"<?= $group['attachment'] == 'allow' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="attachment[<?= $group['id'] ?>]" value="moderate"<?= $group['attachment'] == 'moderate' ? ' checked' : '' ?>>
+										</td>
+										<td class="centercol">
+											<input type="radio" name="attachment[<?= $group['id'] ?>]" value="disallow"<?= $group['attachment'] == 'disallow' ? ' checked' : '' ?>>
+										</td>
+<?php endif; ?>
+									</tr>
+<?php endforeach; ?>
+								</tbody>
+							</table>
+<?php endif; ?>
+								<input type="submit" name="save_changes" value="<?= Lang::getTxt('permissions_commit', file: 'ManagePermissions') ?>" class="button">
+								<input type="hidden" name="<?= Utils::$context['admin-mppm_token_var'] ?>" value="<?= Utils::$context['admin-mppm_token'] ?>">
+						</form>
+					</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/ManageScheduledTasks/edit_scheduled_tasks.php b/Themes/default/templates/ManageScheduledTasks/edit_scheduled_tasks.php
new file mode 100644
index 00000000000..705c18fa2f7
--- /dev/null
+++ b/Themes/default/templates/ManageScheduledTasks/edit_scheduled_tasks.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A template for, you guessed it, editing a task!
+ */
+?>
+
+<?php /* Starts off with general maintenance procedures. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=scheduledtasks;sa=taskedit;save;tid=<?= Utils::$context['task']['id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('scheduled_task_edit', file: 'ManageScheduledTasks') ?></h3>
+			</div>
+			<div class="information">
+				<em><?= Lang::getTxt('scheduled_task_time_offset', Utils::$context, file: 'ManageScheduledTasks') ?> </em>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('scheduled_tasks_name', file: 'ManageScheduledTasks') ?></strong>
+					</dt>
+					<dd>
+						<?= Utils::$context['task']['name'] ?><br>
+						<span class="smalltext"><?= Utils::$context['task']['desc'] ?></span>
+					</dd>
+					<dt>
+						<strong><label for="regularity"><?= Lang::getTxt('scheduled_task_edit_interval', file: 'ManageScheduledTasks') ?></label></strong>
+					</dt>
+					<dd>
+						<?= Lang::getTxt('scheduled_task_edit_repeat', file: 'ManageScheduledTasks') ?>
+						<input type="number" name="regularity" id="regularity" value="<?= empty(Utils::$context['task']['regularity']) ? 1 : Utils::$context['task']['regularity'] ?>" onchange="if (this.value < 1) this.value = 1;" size="2" min="0">
+						<select name="unit">
+							<option value="m"<?= empty(Utils::$context['task']['unit']) || Utils::$context['task']['unit'] == 'm' ? ' selected' : '' ?>><?= Lang::getTxt('scheduled_task_reg_unit_m', file: 'ManageScheduledTasks') ?></option>
+							<option value="h"<?= Utils::$context['task']['unit'] == 'h' ? ' selected' : '' ?>><?= Lang::getTxt('scheduled_task_reg_unit_h', file: 'ManageScheduledTasks') ?></option>
+							<option value="d"<?= Utils::$context['task']['unit'] == 'd' ? ' selected' : '' ?>><?= Lang::getTxt('scheduled_task_reg_unit_d', file: 'ManageScheduledTasks') ?></option>
+							<option value="w"<?= Utils::$context['task']['unit'] == 'w' ? ' selected' : '' ?>><?= Lang::getTxt('scheduled_task_reg_unit_w', file: 'ManageScheduledTasks') ?></option>
+						</select>
+					</dd>
+					<dt>
+						<strong><label for="start_time"><?= Lang::getTxt('scheduled_task_edit_start_time', file: 'ManageScheduledTasks') ?></label></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('scheduled_task_edit_start_time_desc', file: 'ManageScheduledTasks') ?></span>
+					</dt>
+					<dd>
+						<input type="time" name="offset" id="start_time" value="<?= Utils::$context['task']['offset_formatted'] ?>">
+					</dd>
+					<dt>
+						<strong><label for="enabled"><?= Lang::getTxt('scheduled_tasks_enabled', file: 'ManageScheduledTasks') ?></label></strong>
+					</dt>
+					<dd>
+						<input type="checkbox" name="enabled" id="enabled"<?= !Utils::$context['task']['disabled'] ? ' checked' : '' ?>>
+					</dd>
+				</dl>
+				<div class="righttext">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['admin-st_token_var'] ?>" value="<?= Utils::$context['admin-st_token'] ?>">
+					<input type="submit" name="save" value="<?= Lang::getTxt('scheduled_tasks_save_changes', file: 'ManageScheduledTasks') ?>" class="button">
+				</div>
+			</div><!-- .windowbg -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageScheduledTasks/index.php b/Themes/default/templates/ManageScheduledTasks/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageScheduledTasks/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageScheduledTasks/view_scheduled_tasks.php b/Themes/default/templates/ManageScheduledTasks/view_scheduled_tasks.php
new file mode 100644
index 00000000000..c03a86d6b9b
--- /dev/null
+++ b/Themes/default/templates/ManageScheduledTasks/view_scheduled_tasks.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for listing all scheduled tasks.
+ */
+?><?php /* We completed some tasks? */ ?><?php if (!empty(Utils::$context['tasks_were_run'])): ?><?php if (empty(Utils::$context['scheduled_errors'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('scheduled_tasks_were_run', file: 'ManageScheduledTasks') ?>
+	</div><?php else: ?>
+	<div class="errorbox" id="errors">
+		<dl>
+			<dt>
+				<strong id="error_serious"><?= Lang::getTxt('scheduled_tasks_were_run_errors', file: 'ManageScheduledTasks') ?></strong>
+			</dt><?php foreach (Utils::$context['scheduled_errors'] as $task => $errors): ?>
+			<dd class="error">
+				<strong><?= Lang::txtExists('scheduled_task_' . $task, file: 'ManageScheduledTasks') ? Lang::getTxt('scheduled_task_' . $task, file: 'ManageScheduledTasks') : $task ?></strong>
+				<ul>
+					<li><?= implode('</li><li>', $errors) ?></li>
+				</ul>
+			</dd><?php endforeach; ?>
+		</dl>
+	</div><?php endif; ?><?php endif; ?><?php $this->subTemplate('show_list', ['list_id' => 'scheduled_tasks']); ?>
diff --git a/Themes/default/templates/ManageSearch/create_index.php b/Themes/default/templates/ManageSearch/create_index.php
new file mode 100644
index 00000000000..ca0ca6473e5
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/create_index.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Create a search index.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=createmsgindex;step=1" method="post" accept-charset="UTF-8" name="create_index">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('search_create_index', file: 'Search') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<label for="predefine_select"><?= Lang::getTxt('search_predefined', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<select name="bytes_per_word" id="predefine_select">
+						<option value="2"><?= Lang::getTxt('search_predefined_small', file: 'Search') ?></option>
+						<option value="4" selected><?= Lang::getTxt('search_predefined_moderate', file: 'Search') ?></option>
+						<option value="5"><?= Lang::getTxt('search_predefined_large', file: 'Search') ?></option>
+					</select>
+				</dd>
+			</dl>
+			<hr>
+			<input type="submit" name="save" value="<?= Lang::getTxt('search_create_index_start', file: 'Search') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</div>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/create_index_done.php b/Themes/default/templates/ManageSearch/create_index_done.php
new file mode 100644
index 00000000000..2239cd9442b
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/create_index_done.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Done creating a search index.
+ */
+?>
+	<div class="cat_bar">
+		<h3 class="catbg"><?= Lang::getTxt('search_create_index', file: 'Search') ?></h3>
+	</div>
+	<div class="windowbg">
+		<p><?= Lang::getTxt('search_create_index_done', file: 'Search') ?></p>
+		<p>
+			<strong><a href="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=method"><?= Lang::getTxt('search_create_index_done_link', file: 'Search') ?></a></strong>
+		</p>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/create_index_progress.php b/Themes/default/templates/ManageSearch/create_index_progress.php
new file mode 100644
index 00000000000..bf6be08f046
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/create_index_progress.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Display a progress page while creating a search index.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=createmsgindex;step=1" name="autoSubmit" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('search_create_index', file: 'Search') ?></h3>
+		</div>
+		<div class="windowbg">
+			<div>
+				<p><?= Lang::getTxt('search_create_index_not_ready', file: 'Search') ?></p>
+				<div class="progress_bar">
+					<span><?= Utils::$context['percentage'] ?>%</span>
+					<div class="bar" style="width: <?= Utils::$context['percentage'] ?>%;"></div>
+				</div>
+			</div>
+			<hr>
+			<input type="submit" name="cont" value="<?= Lang::getTxt('search_create_index_continue', file: 'Search') ?>" class="button">
+		</div>
+		<input type="hidden" name="step" value="<?= Utils::$context['step'] ?>">
+		<input type="hidden" name="start" value="<?= Utils::$context['start'] ?>">
+		<input type="hidden" name="bytes_per_word" value="<?= Utils::$context['index_settings']['bytes_per_word'] ?>">
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<script>
+		doAutoSubmit(10, <?= Utils::escapeJavaScript(Lang::getTxt('search_create_index_continue', file: 'Search')) ?>);
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/index.php b/Themes/default/templates/ManageSearch/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageSearch/modify_weights.php b/Themes/default/templates/ManageSearch/modify_weights.php
new file mode 100644
index 00000000000..d46039a7d3f
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/modify_weights.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Modify the search weights.
+ */
+?>
+	<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=weights" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('search_weights', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_frequency" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a><label for="weight1_val">
+					<?= Lang::getTxt('search_weight_frequency', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_frequency" id="weight1_val" value="<?= empty(Config::$modSettings['search_weight_frequency']) ? '0' : Config::$modSettings['search_weight_frequency'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight1" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_frequency'] ?>%</span>
+				</dd>
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_age" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+					<label for="weight2_val"><?= Lang::getTxt('search_weight_age', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_age" id="weight2_val" value="<?= empty(Config::$modSettings['search_weight_age']) ? '0' : Config::$modSettings['search_weight_age'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight2" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_age'] ?>%</span>
+				</dd>
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_length" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+					<label for="weight3_val"><?= Lang::getTxt('search_weight_length', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_length" id="weight3_val" value="<?= empty(Config::$modSettings['search_weight_length']) ? '0' : Config::$modSettings['search_weight_length'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight3" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_length'] ?>%</span>
+				</dd>
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_subject" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+					<label for="weight4_val"><?= Lang::getTxt('search_weight_subject', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_subject" id="weight4_val" value="<?= empty(Config::$modSettings['search_weight_subject']) ? '0' : Config::$modSettings['search_weight_subject'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight4" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_subject'] ?>%</span>
+				</dd>
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_first_message" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+					<label for="weight5_val"><?= Lang::getTxt('search_weight_first_message', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_first_message" id="weight5_val" value="<?= empty(Config::$modSettings['search_weight_first_message']) ? '0' : Config::$modSettings['search_weight_first_message'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight5" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_first_message'] ?>%</span>
+				</dd>
+				<dt>
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_weight_sticky" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+					<label for="weight6_val"><?= Lang::getTxt('search_weight_sticky', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<span class="search_weight">
+						<input type="text" name="search_weight_sticky" id="weight6_val" value="<?= empty(Config::$modSettings['search_weight_sticky']) ? '0' : Config::$modSettings['search_weight_sticky'] ?>" onchange="calculateNewValues()" size="3">
+					</span>
+					<span id="weight6" class="search_weight"><?= Utils::$context['relative_weights']['search_weight_sticky'] ?>%</span>
+				</dd>
+				<dt>
+					<strong><?= Lang::getTxt('search_weights_total', file: 'Search') ?></strong>
+				</dt>
+				<dd>
+					<span id="weighttotal" class="search_weight">
+						<strong><?= Utils::$context['relative_weights']['total'] ?></strong>
+					</span>
+					<span class="search_weight"><strong>100%</strong></span>
+				</dd>
+			</dl>
+			<input type="submit" name="save" value="<?= Lang::getTxt('search_weights_save', file: 'Search') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-msw_token_var'] ?>" value="<?= Utils::$context['admin-msw_token'] ?>">
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/select_search_method.php b/Themes/default/templates/ManageSearch/select_search_method.php
new file mode 100644
index 00000000000..6b2c68d8d69
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/select_search_method.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Select the search method.
+ */
+?>
+	<div class="cat_bar">
+		<h3 class="catbg"><?= Lang::getTxt('search_method', file: 'Admin') ?></h3>
+	</div>
+	<div class="information">
+		<div class="smalltext">
+			<a href="<?= Config::$scripturl ?>?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);"><?= Lang::getTxt('search_create_index_why', file: 'Search') ?></a>
+		</div>
+	</div>
+	<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=method" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('search_method', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings"><?php if (!empty(Utils::$context['table_info'])): ?>
+				<dt>
+					<strong><?= Lang::getTxt('search_method_messages_table_space', file: 'Search') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['table_info']['data_length'] ?>
+				</dd>
+				<dt>
+					<strong><?= Lang::getTxt('search_method_messages_index_space', file: 'Search') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['table_info']['index_length'] ?>
+				</dd><?php endif; ?>
+			</dl>
+			<?= Utils::$context['double_index'] ? '<div class="noticebox">
+			' . Lang::getTxt('search_double_index', file: 'Search') . '</div>' : '' ?>
+			<fieldset class="search_settings floatleft">
+				<legend><?= Lang::getTxt('search_index', file: 'Search') ?></legend>
+				<dl>
+					<dt>
+						<label>
+							<input type="radio" name="search_index" value=""<?= empty(Config::$modSettings['search_index']) ? ' checked' : '' ?>>
+							<?= Lang::getTxt('search_index_none', file: 'Search') ?>
+						</label>
+					</dt><?php foreach (Utils::$context['search_apis'] as $api): ?><?php if ($api['has_template'] || $api['instance']->getStatus() === 'hidden'): ?><?php continue; ?><?php endif; ?>
+					<hr>
+					<dt>
+						<label>
+							<input type="radio" name="search_index" value="<?= $api['setting_index'] ?>"<?= !empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == $api['setting_index'] ? ' checked' : '' ?><?= !in_array($api['instance']->getStatus(), [null, 'exists']) ? ' onclick="alert(\'' . Lang::getTxt('search_index_custom_warning', file: 'Search') . '\'); return false;"' : '' ?>>
+							<?= Lang::txtExists($api['instance']->getLabel(), file: 'Search') ? Lang::getTxt($api['instance']->getLabel(), file: 'Search') : Lang::getTxt('search_index_generic', ['index' => substr(strrchr($api['class'], '\\'), 1)], file: 'Search') ?>
+						</label>
+					</dt>
+					<dd>
+						<span class="smalltext"><?php if (Lang::txtExists($api['instance']->getDescription(), file: 'Search')): ?><?= Lang::getTxt($api['instance']->getDescription(), file: 'Search') ?><?php endif; ?><?php if ($api['instance']->getStatus() !== null): ?><?php if (Lang::txtExists($api['instance']->getDescription(), file: 'Search')): ?>
+						<br><?php endif; ?><?php
+$admin_subactions = $api['instance']->getAdminSubactions();
+
+switch ($api['instance']->getStatus()) {
+				case 'exists':
+					$index_status = 'search_method_index_already_exists';
+					$buttons = [];
+
+					$sa = $admin_subactions['remove']['sa'];
+
+					foreach ($admin_subactions['remove']['extra_params'] as $key => $value) {
+						$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
+					}
+
+					$buttons[$sa] = 'search_index_remove';
+					break;
+
+				case 'partial':
+					$index_status = 'search_method_index_partial';
+					$buttons = [];
+
+					foreach (['resume', 'remove'] as $type) {
+						$sa = $admin_subactions[$type]['sa'];
+
+						foreach ($admin_subactions[$type]['extra_params'] as $key => $value) {
+							$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
+						}
+
+						$buttons[$sa] = 'search_index_' . $type;
+					}
+					break;
+
+				default:
+					$index_status = 'search_method_no_index_exists';
+					$buttons = [];
+
+					$sa = $admin_subactions['build']['sa'];
+
+					foreach ($admin_subactions['build']['extra_params'] as $key => $value) {
+						$sa .= ';' . (is_int($key) ? '' : $key . '=') . $value;
+					}
+
+					$buttons[$sa] = 'search_create_index_start';
+					break;
+			}
+?><?= Lang::getTxt(
+	$index_status,
+	[
+		'index' => Lang::getTxt(
+			Lang::txtExists($api['instance']->getLabel(), file: 'Search') ? $api['instance']->getLabel() : 'search_index_generic',
+			[
+				'index' => substr(strrchr($api['instance']::class, '\\'), 1),
+			],
+			file: 'Search',
+		),
+	],
+	file: 'Search',
+) ?><?php foreach ($buttons as $sa => $label): ?> <a href="<?= Config::$scripturl ?>?action=admin;area=managesearch;sa=<?= $sa ?>" class="button"><?= Lang::getTxt($label, file: 'Search') ?></a><?php endforeach; ?><?php endif; ?><?php
+if (
+			in_array($api['instance']->getStatus(), ['exists', null])
+			&& !empty($api['instance']->getSize())
+		):
+?>
+						<br>
+						<strong><?= Lang::getTxt('search_index_size', file: 'Search') ?></strong> <?= Lang::getTxt('size_kilobyte', [$api['instance']->getSize() / 1024], file: 'General') ?><?php endif; ?>
+						</span>
+					</dd><?php endforeach; ?>
+				</dl>
+			</fieldset>
+			<fieldset class="search_settings floatright">
+			<legend><?= Lang::getTxt('search_method', file: 'Admin') ?></legend>
+				<input type="checkbox" name="search_force_index" id="search_force_index_check" value="1"<?= empty(Config::$modSettings['search_force_index']) ? '' : ' checked' ?>><label for="search_force_index_check"><?= Lang::getTxt('search_force_index', file: 'Search') ?></label><br>
+				<input type="checkbox" name="search_match_words" id="search_match_words_check" value="1"<?= empty(Config::$modSettings['search_match_words']) ? '' : ' checked' ?>><label for="search_match_words_check"><?= Lang::getTxt('search_match_words', file: 'Search') ?></label>
+			</fieldset>
+			<br class="clear">
+			<input type="submit" name="save" value="<?= Lang::getTxt('search_method_save', file: 'Search') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-msmpost_token_var'] ?>" value="<?= Utils::$context['admin-msmpost_token'] ?>">
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/show_spider_logs.php b/Themes/default/templates/ManageSearch/show_spider_logs.php
new file mode 100644
index 00000000000..2aa578c481a
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/show_spider_logs.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show... spider... logs...
+ */
+?><?php /* Standard fields. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'spider_logs']); ?>
+	<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=sengines;sa=logs" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('spider_logs_delete', file: 'Search') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p>
+				<?= Lang::getTxt('spider_logs_delete_older', file: 'Search') ?>
+				<input type="text" name="older" id="older" value="7" size="3">
+				<?= Lang::getTxt('spider_logs_delete_day', file: 'Search') ?>
+			</p>
+			<input type="submit" name="delete_entries" value="<?= Lang::getTxt('spider_logs_delete_submit', file: 'Search') ?>" onclick="if (document.getElementById('older').value &lt; 1 &amp;&amp; !confirm('<?= addcslashes(Lang::getTxt('spider_logs_delete_confirm', file: 'Search'), "'") ?>')) return false; return true;" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-sl_token_var'] ?>" value="<?= Utils::$context['admin-sl_token'] ?>">
+		</div>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/show_spider_stats.php b/Themes/default/templates/ManageSearch/show_spider_stats.php
new file mode 100644
index 00000000000..322f6c52173
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/show_spider_stats.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show... spider... stats...
+ */
+?><?php /* Standard fields. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'spider_stat_list']); ?>
+		<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=sengines;sa=stats" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('spider_logs_delete', file: 'Search') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p>
+					<?= Lang::getTxt('spider_stats_delete_older', ['input' => '<input type="number" name="older" id="older" value="90" size="3">'], file: 'Search') ?>
+				</p>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-ss_token_var'] ?>" value="<?= Utils::$context['admin-ss_token'] ?>">
+				<input type="submit" name="delete_entries" value="<?= Lang::getTxt('spider_logs_delete_submit', file: 'Search') ?>" onclick="if (document.getElementById('older').value &lt; 1 &amp;&amp; !confirm('<?= addcslashes(Lang::getTxt('spider_logs_delete_confirm', file: 'Search'), "'") ?>')) return false; return true;" class="button">
+				<br>
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSearch/spider_edit.php b/Themes/default/templates/ManageSearch/spider_edit.php
new file mode 100644
index 00000000000..732a5bf7228
--- /dev/null
+++ b/Themes/default/templates/ManageSearch/spider_edit.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add or edit a search engine spider.
+ */
+?>
+	<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=sengines;sa=editspiders;sid=<?= Utils::$context['spider']['id'] ?>" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="information noup">
+			<?= Lang::getTxt('add_spider_desc', file: 'Search') ?>
+		</div>
+		<div class="windowbg noup">
+			<dl class="settings">
+				<dt>
+					<strong><label for="spider_name"><?= Lang::getTxt('spider_name', file: 'Search') ?></label></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('spider_name_desc', file: 'Search') ?></span>
+				</dt>
+				<dd>
+					<input type="text" name="spider_name" id="spider_name" value="<?= Utils::$context['spider']['name'] ?>">
+				</dd>
+				<dt>
+					<strong><label for="spider_agent"><?= Lang::getTxt('spider_agent', file: 'Search') ?></label></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('spider_agent_desc', file: 'Search') ?></span>
+				</dt>
+				<dd>
+					<input type="text" name="spider_agent" id="spider_agent" value="<?= Utils::$context['spider']['agent'] ?>">
+				</dd>
+				<dt>
+					<strong><label for="spider_ip"><?= Lang::getTxt('spider_ip_info', file: 'Search') ?></label></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('spider_ip_info_desc', file: 'Search') ?></span>
+				</dt>
+				<dd>
+					<textarea name="spider_ip" id="spider_ip" rows="4" cols="20"><?= Utils::$context['spider']['ip_info'] ?></textarea>
+				</dd>
+			</dl>
+			<hr>
+			<input type="submit" name="save" value="<?= Utils::$context['page_title'] ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['admin-ses_token_var'] ?>" value="<?= Utils::$context['admin-ses_token'] ?>">
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSmileys/addsmiley.php b/Themes/default/templates/ManageSmileys/addsmiley.php
new file mode 100644
index 00000000000..ba141ebe223
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/addsmiley.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Adding a new smiley.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=addsmiley" method="post" accept-charset="UTF-8" name="smileyForm" id="smileyForm" enctype="multipart/form-data">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('smileys_add_method', file: 'ManageSmileys') ?></h3>
+		</div>
+		<div class="windowbg">
+			<ul>
+				<li>
+					<label for="method-existing"><input type="radio" onclick="switchType();" name="method" id="method-existing" value="existing" checked> <?= Lang::getTxt('smileys_add_existing', file: 'ManageSmileys') ?></label>
+				</li>
+				<li>
+					<label for="method-upload"><input type="radio" onclick="switchType();" name="method" id="method-upload" value="upload"> <?= Lang::getTxt('smileys_add_upload', file: 'ManageSmileys') ?></label>
+				</li>
+			</ul>
+			<br>
+			<fieldset id="ex_settings">
+				<dl class="settings">
+					<dt>
+						<strong><label for="preview"><?= Lang::getTxt('smiley_preview', file: 'ManageSmileys') ?></label></strong>
+					</dt>
+					<dd>
+						<img src="<?= Config::$modSettings['smileys_url'] ?>/<?= Config::$modSettings['smiley_sets_default'] ?>/<?= Utils::$context['filenames'][Utils::$context['selected_set']]['smiley']['id'] ?>" id="preview" alt="">
+					</dd>
+					<dt>
+						<strong><label for="smiley_filename"><?= Lang::getTxt('smileys_filename', file: 'ManageSmileys') ?></label></strong>
+					</dt>
+					<dd>
+<?php if (empty(Utils::$context['filenames'])): ?>
+						<input type="text" name="smiley_filename" id="smiley_filename" value="<?= Utils::$context['current_smiley']['filename'] ?>" onchange="selectMethod('existing');">
+<?php else: ?>
+						<select name="smiley_filename" id="smiley_filename" onchange="updatePreview($('#smiley_filename').val());selectMethod('existing');">
+<?php foreach (Utils::$context['smiley_sets'] as $smiley_set): ?>
+							<optgroup label="<?= $smiley_set['name'] ?>">
+<?php if (!empty(Utils::$context['filenames'][$smiley_set['path']])): ?>
+<?php foreach (Utils::$context['filenames'][$smiley_set['path']] as $filename): ?>
+								<option value="<?= $smiley_set['path'] ?>/<?= $filename['id'] ?>"<?= $filename['selected'] ? ' selected' : '' ?>><?= $filename['id'] ?></option>
+<?php endforeach; ?>
+<?php endif; ?>
+							</optgroup>
+<?php endforeach; ?>
+						</select>
+<?php endif; ?>
+					</dd>
+				</dl>
+			</fieldset>
+			<fieldset id="ul_settings" style="display: none;">
+				<dl class="settings">
+					<dt>
+						<a href="<?= Config::$scripturl ?>?action=helpadmin;help=smiley_sameall" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+						<strong><label for="sameall"><?= Lang::getTxt('smileys_add_upload_all', file: 'ManageSmileys') ?></label></strong>
+					</dt>
+					<dd>
+						<input type="checkbox" name="sameall" id="sameall" onclick="swapUploads(); selectMethod('upload');" checked>
+					</dd>
+					<dt>
+						<strong><?= Lang::getTxt('smileys_add_upload_choose', file: 'ManageSmileys') ?></strong>
+					</dt>
+					<dt class="upload_sameall">
+						<?= Lang::getTxt('smileys_add_upload_choose_desc', file: 'ManageSmileys') ?>
+					</dt>
+					<dd class="upload_sameall">
+						<input type="file" name="uploadSmiley" id="uploadSmiley" onchange="selectMethod('upload');">
+					</dd>
+<?php foreach (Utils::$context['smiley_sets'] as $smiley_set): ?>
+					<dt class="upload_more" style="display: none;">
+						<?= Lang::getTxt('smileys_add_upload_for', ['name' => '<strong>' . $smiley_set['name'] . '</strong>'], file: 'ManageSmileys') ?>:
+					</dt>
+					<dd class="upload_more" style="display: none;">
+						<input type="file" name="individual_<?= $smiley_set['path'] ?>" disabled onchange="selectMethod('upload');">
+					</dd>
+<?php endforeach; ?>
+				</dl>
+			</fieldset>
+		</div><!-- .windowbg -->
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('smiley_new', file: 'ManageSmileys') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<strong><label for="smiley_code"><?= Lang::getTxt('smileys_code', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="smiley_code" id="smiley_code" value="">
+				</dd>
+				<dt>
+					<strong><label for="smiley_description"><?= Lang::getTxt('smileys_description', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="smiley_description" id="smiley_description" value="">
+				</dd>
+				<dt>
+					<strong><label for="smiley_location"><?= Lang::getTxt('smileys_location', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<select name="smiley_location" id="smiley_location">
+						<option value="0" selected>
+							<?= Lang::getTxt('smileys_location_form', file: 'ManageSmileys') ?>
+						</option>
+						<option value="1">
+							<?= Lang::getTxt('smileys_location_hidden', file: 'ManageSmileys') ?>
+						</option>
+						<option value="2">
+							<?= Lang::getTxt('smileys_location_popup', file: 'ManageSmileys') ?>
+						</option>
+					</select>
+				</dd>
+			</dl>
+			<input type="submit" name="smiley_save" value="<?= Lang::getTxt('smileys_save', file: 'ManageSmileys') ?>" class="button">
+		</div><!-- .windowbg -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSmileys/editicon.php b/Themes/default/templates/ManageSmileys/editicon.php
new file mode 100644
index 00000000000..5f5ec886170
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/editicon.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Editing an individual message icon
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=editicon;icon=<?= Utils::$context['new_icon'] ? '0' : Utils::$context['icon']['id'] ?>" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Utils::$context['new_icon'] ? Lang::getTxt('icons_new_icon', file: 'ManageSmileys') : Lang::getTxt('icons_edit_icon', file: 'ManageSmileys') ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+<?php if (!Utils::$context['new_icon']): ?>
+				<dt>
+					<strong><?= Lang::getTxt('smiley_preview', file: 'ManageSmileys') ?></strong>
+				</dt>
+				<dd>
+					<img src="<?= Utils::$context['icon']['image_url'] ?>" alt="<?= Utils::$context['icon']['title'] ?>">
+				</dd>
+<?php endif; ?>
+				<dt>
+					<strong><label for="icon_filename"><?= Lang::getTxt('smileys_filename', file: 'ManageSmileys') ?></label>: </strong><br><span class="smalltext"><?= Lang::getTxt('icons_extension_must_be', ['extension' => '.png'], file: 'ManageSmileys') ?></span>
+				</dt>
+				<dd>
+					<input type="text" name="icon_filename" id="icon_filename" value="<?= !empty(Utils::$context['icon']['filename']) ? Utils::$context['icon']['filename'] . '.png' : '' ?>">
+				</dd>
+				<dt>
+					<strong><label for="icon_description"><?= Lang::getTxt('smileys_description', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="icon_description" id="icon_description" value="<?= !empty(Utils::$context['icon']['title']) ? Utils::$context['icon']['title'] : '' ?>">
+				</dd>
+				<dt>
+					<strong><label for="icon_board_select"><?= Lang::getTxt('icons_board', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<select name="icon_board" id="icon_board_select">
+						<option value="0"<?= empty(Utils::$context['icon']['board_id']) ? ' selected' : '' ?>><?= Lang::getTxt('icons_edit_icons_all_boards', file: 'ManageSmileys') ?></option>
+<?php foreach (Utils::$context['categories'] as $category): ?>
+						<optgroup label="<?= $category['name'] ?>">
+<?php foreach ($category['boards'] as $board): ?>
+							<option value="<?= $board['id'] ?>"<?= $board['selected'] ? ' selected' : '' ?>><?= $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '' ?> <?= $board['name'] ?></option>
+<?php endforeach; ?>
+						</optgroup>
+<?php endforeach; ?>
+					</select>
+				</dd>
+				<dt>
+					<strong><label for="icon_location"><?= Lang::getTxt('smileys_location', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<select name="icon_location" id="icon_location">
+						<option value="0"<?= empty(Utils::$context['icon']['after']) ? ' selected' : '' ?>><?= Lang::getTxt('icons_location_first_icon', file: 'ManageSmileys') ?></option><?php /* Print the list of all the icons it can be put after... */ ?>
+
+<?php foreach (Utils::$context['icons'] as $id => $data): ?>
+<?php if (empty(Utils::$context['icon']['id']) || $id != Utils::$context['icon']['id']): ?>
+						<option value="<?= $id ?>"<?= !empty(Utils::$context['icon']['after']) && $id == Utils::$context['icon']['after'] ? ' selected' : '' ?>><?= Lang::getTxt('icons_location_after', ['icon' => $data['title']], file: 'ManageSmileys') ?></option>
+<?php endif; ?>
+<?php endforeach; ?>
+					</select>
+				</dd>
+			</dl>
+<?php if (!Utils::$context['new_icon']): ?>
+			<input type="hidden" name="icon" value="<?= Utils::$context['icon']['id'] ?>">
+<?php endif; ?>
+			<input type="submit" name="icons_save" value="<?= Lang::getTxt('smileys_save', file: 'ManageSmileys') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSmileys/editicons.php b/Themes/default/templates/ManageSmileys/editicons.php
new file mode 100644
index 00000000000..7b0a2e61252
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/editicons.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Editing Message Icons
+ */
+?><?php $this->subTemplate('show_list', ['list_id' => 'message_icon_list']); ?>
diff --git a/Themes/default/templates/ManageSmileys/editsets.php b/Themes/default/templates/ManageSmileys/editsets.php
new file mode 100644
index 00000000000..3408bdd9fd4
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/editsets.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Shows a list of smiley sets so you can edit them.
+ */
+?><?php $this->subTemplate('show_list', ['list_id' => 'smiley_set_list']); ?>
diff --git a/Themes/default/templates/ManageSmileys/index.php b/Themes/default/templates/ManageSmileys/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ManageSmileys/modifyset.php b/Themes/default/templates/ManageSmileys/modifyset.php
new file mode 100644
index 00000000000..1b0730c5f36
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/modifyset.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Modifying a smiley set.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=editsets" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg">
+			<?= Lang::getTxt(Utils::$context['current_set']['is_new'] ? 'smiley_set_new' : 'smiley_set_modify_existing', file: 'ManageSmileys') ?>
+			</h3>
+		</div>
+<?php if (Utils::$context['current_set']['is_new'] && !empty(Config::$modSettings['smiley_enable'])): ?>
+		<div class="information noup">
+			<?= Lang::getTxt('smiley_set_import_info', file: 'ManageSmileys') ?>
+		</div>
+<?php /* If this is an existing set, and there are still un-added smileys - offer an import opportunity. */ ?>
+<?php elseif (!empty(Utils::$context['current_set']['can_import'])): ?>
+		<div class="information noup">
+			<?= Utils::$context['smiley_set_unused_message'] ?>
+		</div>
+<?php endif; ?>
+		<div class="windowbg noup">
+			<dl class="settings">
+				<dt>
+					<strong><label for="smiley_sets_name"><?= Lang::getTxt('smiley_sets_name', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="smiley_sets_name" id="smiley_sets_name" value="<?= Utils::$context['current_set']['name'] ?>">
+				</dd>
+				<dt>
+					<strong><label for="smiley_sets_path"><?= Lang::getTxt('smiley_sets_url', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<?= Config::$modSettings['smileys_url'] ?>/
+<?php if (empty(Utils::$context['smiley_set_dirs']) || !empty(Utils::$context['make_new'])): ?>
+					<input type="text" name="smiley_sets_path" id="smiley_sets_path" value="<?= Utils::$context['current_set']['path'] ?>"> 
+<?php else: ?>
+					<select name="smiley_sets_path" id="smiley_sets_path">
+<?php foreach (Utils::$context['smiley_set_dirs'] as $smiley_set_dir): ?>
+						<option value="<?= $smiley_set_dir['id'] ?>"<?= $smiley_set_dir['current'] ? ' selected' : '' ?><?= $smiley_set_dir['selectable'] ? '' : ' disabled' ?>><?= $smiley_set_dir['id'] ?></option>
+<?php endforeach; ?>
+					</select> 
+<?php endif; ?>
+					/..
+				</dd>
+				<dt>
+					<strong><label for="smiley_sets_default"><?= Lang::getTxt('smiley_set_select_default', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="checkbox" name="smiley_sets_default" id="smiley_sets_default" value="1"<?= Utils::$context['current_set']['is_default'] ? ' checked' : '' ?>>
+				</dd>
+			</dl>
+			<input type="submit" name="smiley_save" value="<?= Lang::getTxt('smiley_sets_save', file: 'ManageSmileys') ?>" class="button">
+		</div><!-- .windowbg -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		<input type="hidden" name="<?= Utils::$context['admin-mss_token_var'] ?>" value="<?= Utils::$context['admin-mss_token'] ?>">
+		<input type="hidden" name="set" value="<?= Utils::$context['current_set']['path'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSmileys/modifysmiley.php b/Themes/default/templates/ManageSmileys/modifysmiley.php
new file mode 100644
index 00000000000..258ca5d9cfe
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/modifysmiley.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Editing an individual smiley
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=editsmileys" method="post" accept-charset="UTF-8" name="smileyForm" id="smileyForm" enctype="multipart/form-data">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('smiley_modify_existing', file: 'ManageSmileys') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<strong><?= Lang::getTxt('smiley_preview_using_set', file: 'ManageSmileys') ?></strong>
+					<select id="set" onchange="updatePreview($('#smiley_filename_' + $('#set').val()).val(), $('#set').val());">
+<?php foreach (Utils::$context['smiley_sets'] as $smiley_set): ?>
+					<option value="<?= $smiley_set['path'] ?>"<?= Utils::$context['selected_set'] == $smiley_set['path'] ? ' selected' : '' ?>><?= $smiley_set['name'] ?></option>
+<?php endforeach; ?>
+					</select>
+				</dt>
+				<dd>
+					<img src="<?= Config::$modSettings['smileys_url'] ?>/<?= Config::$modSettings['smiley_sets_default'] ?>/<?= Utils::$context['current_smiley']['filename'] ?>" id="preview" alt="">
+				</dd>
+				<dt>
+					<strong><label for="smiley_filename"><?= Lang::getTxt('smileys_filename', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+<?php if (empty(Utils::$context['filenames'])): ?>
+				<dd>
+					<input type="text" name="smiley_filename" id="smiley_filename" value="<?= Utils::$context['current_smiley']['filename'] ?>">
+				</dd>
+<?php else: ?>
+<?php foreach (Utils::$context['smiley_sets'] as $set => $smiley_set): ?>
+				<dt>
+					<?= $smiley_set['name'] ?>
+				</dt>
+				<dd<?= in_array($set, Utils::$context['missing_sets']) ? ' class="errorbox"' : '' ?>>
+					<select name="smiley_filename[<?= $set ?>]" id="smiley_filename_<?= $set ?>" onchange="$('#set').val('<?= $set ?>');updatePreview($('#smiley_filename_' + $('#set').val()).val(), $('#set').val());">
+<?php foreach (Utils::$context['filenames'][$set] as $filename): ?>
+						<option value="<?= $filename['id'] ?>"<?= $filename['selected'] ? ' selected' : '' ?><?= $filename['disabled'] ? ' disabled' : '' ?>><?= $filename['id'] ?></option>
+<?php endforeach; ?>
+					</select>
+					<input type="file" name="smiley_upload[<?= $set ?>]" id="smiley_upload_<?= $set ?>">
+				</dd>
+<?php endforeach; ?>
+<?php endif; ?>
+			</dl>
+			<dl class="settings">
+				<dt>
+					<strong><label for="smiley_code"><?= Lang::getTxt('smileys_code', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="smiley_code" id="smiley_code" value="<?= Utils::$context['current_smiley']['code'] ?>">
+				</dd>
+				<dt>
+					<strong><label for="smiley_description"><?= Lang::getTxt('smileys_description', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="smiley_description" id="smiley_description" value="<?= Utils::$context['current_smiley']['description'] ?>">
+				</dd>
+				<dt>
+					<strong><label for="smiley_location"><?= Lang::getTxt('smileys_location', file: 'ManageSmileys') ?></label></strong>
+				</dt>
+				<dd>
+					<select name="smiley_location" id="smiley_location">
+						<option value="0"<?= Utils::$context['current_smiley']['location'] == 0 ? ' selected' : '' ?>>
+							<?= Lang::getTxt('smileys_location_form', file: 'ManageSmileys') ?>
+						</option>
+						<option value="1"<?= Utils::$context['current_smiley']['location'] == 1 ? ' selected' : '' ?>>
+							<?= Lang::getTxt('smileys_location_hidden', file: 'ManageSmileys') ?>
+						</option>
+						<option value="2"<?= Utils::$context['current_smiley']['location'] == 2 ? ' selected' : '' ?>>
+							<?= Lang::getTxt('smileys_location_popup', file: 'ManageSmileys') ?>
+						</option>
+					</select>
+				</dd>
+			</dl>
+			<input type="submit" name="smiley_save" value="<?= Lang::getTxt('smileys_save', file: 'ManageSmileys') ?>" class="button">
+			<input type="submit" name="deletesmiley" value="<?= Lang::getTxt('smileys_delete', file: 'ManageSmileys') ?>" data-confirm="<?= Lang::getTxt('smileys_delete_confirm', file: 'ManageSmileys') ?>" class="button you_sure">
+		</div><!-- .windowbg -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		<input type="hidden" name="smiley" value="<?= Utils::$context['current_smiley']['id'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ManageSmileys/setorder.php b/Themes/default/templates/ManageSmileys/setorder.php
new file mode 100644
index 00000000000..dfe6f9243b4
--- /dev/null
+++ b/Themes/default/templates/ManageSmileys/setorder.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Ordering smileys.
+ */
+?><?php foreach (Utils::$context['smileys'] as $location): ?>
+	<form action="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=editsmileys" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= $location['title'] ?></h3>
+		</div>
+		<div class="information noup">
+			<?= $location['description'] ?>
+		</div>
+		<div class="move_smileys windowbg noup">
+			<strong><?= Lang::getTxt(empty(Utils::$context['move_smiley']) ? 'smileys_move_select_smiley' : 'smileys_move_select_destination', file: 'ManageSmileys') ?></strong><br><?php foreach ($location['rows'] as $row): ?><?php if (!empty(Utils::$context['move_smiley'])): ?>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=setorder;location=<?= $location['id'] ?>;source=<?= Utils::$context['move_smiley'] ?>;row=<?= $row[0]['row'] ?>;reorder=1;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="main_icons select_below" title="<?= Lang::getTxt('smileys_move_here', file: 'ManageSmileys') ?>"></span></a><?php endif; ?><?php foreach ($row as $smiley): ?><?php if (empty(Utils::$context['move_smiley'])): ?>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=setorder;move=<?= $smiley['id'] ?>"><img src="<?= Config::$modSettings['smileys_url'] ?>/<?= Config::$modSettings['smiley_sets_default'] ?>/<?= $smiley['filename'] ?>" alt="<?= $smiley['description'] ?>"></a><?php else: ?>
+			<img src="<?= Config::$modSettings['smileys_url'] ?>/<?= Config::$modSettings['smiley_sets_default'] ?>/<?= $smiley['filename'] ?>" alt="<?= $smiley['description'] ?>" <?= $smiley['selected'] ? 'class="selected_item"' : '' ?>>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=setorder;location=<?= $location['id'] ?>;source=<?= Utils::$context['move_smiley'] ?>;after=<?= $smiley['id'] ?>;reorder=1;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" title="<?= Lang::getTxt('smileys_move_here', file: 'ManageSmileys') ?>"><span class="main_icons select_below" title="<?= Lang::getTxt('smileys_move_here', file: 'ManageSmileys') ?>"></span></a><?php endif; ?><?php endforeach; ?>
+			<br><?php endforeach; ?><?php if (!empty(Utils::$context['move_smiley'])): ?>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=smileys;sa=setorder;location=<?= $location['id'] ?>;source=<?= Utils::$context['move_smiley'] ?>;row=<?= $location['last_row'] ?>;reorder=1;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="main_icons select_below" title="<?= Lang::getTxt('smileys_move_here', file: 'ManageSmileys') ?>"></span></a><?php endif; ?>
+		</div><!-- .windowbg -->
+		<input type="hidden" name="reorder" value="1">
+	</form><?php endforeach; ?>
diff --git a/Themes/default/templates/Memberlist/index.php b/Themes/default/templates/Memberlist/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Memberlist/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Memberlist/main.php b/Themes/default/templates/Memberlist/main.php
new file mode 100644
index 00000000000..8f6e5082b73
--- /dev/null
+++ b/Themes/default/templates/Memberlist/main.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a sortable listing of all members registered on the forum.
+ */
+?>
+	<div class="main_section" id="memberlist">
+		<div class="pagesection">
+			<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div>
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['memberlist_buttons'], 'direction' => 'right']); ?>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="floatleft"><?= Lang::getTxt('members_list', file: 'General') ?></span>
+			</h3>
+		</div>
+		<div id="mlist">
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+<?php /* Display each of the column headers of the table. */ ?>
+<?php foreach (Utils::$context['columns'] as $key => $column): ?>
+<?php /* @TODO maybe find something nicer? */ ?>
+<?php if ($key == 'email_address' && !Utils::$context['can_send_email']): ?>
+<?php continue; ?>
+<?php endif; ?>
+<?php /* This is a selected column, so underline it or some such. */ ?>
+<?php if ($column['selected']): ?>
+						<th scope="col" class="<?= $key ?><?= isset($column['class']) ? ' ' . $column['class'] : '' ?> selected" style="width: auto;"<?= (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') ?>>
+							<a href="<?= $column['href'] ?>" rel="nofollow"><?= $column['label'] ?></a><span class="main_icons sort_<?= Utils::$context['sort_direction'] ?>"></span></th>
+<?php /* This is just some column... show the link and be done with it. */ ?>
+<?php else: ?>
+						<th scope="col" class="<?= $key ?><?= isset($column['class']) ? ' ' . $column['class'] : '' ?>"<?= isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '' ?><?= isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '' ?>>
+						<?= $column['link'] ?></th>
+<?php endif; ?>
+<?php endforeach; ?>
+					</tr>
+				</thead>
+				<tbody>
+<?php /* Assuming there are members loop through each one displaying their data. */ ?>
+<?php if (!empty(Utils::$context['members'])): ?>
+<?php foreach (Utils::$context['members'] as $member): ?>
+					<tr class="windowbg">
+						<td class="is_online centertext">
+							<?= Utils::$context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '' ?><span class="<?= ($member['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= $member['online']['text'] ?>"></span><?= Utils::$context['can_send_pm'] ? '</a>' : '' ?>
+						</td>
+						<td class="real_name lefttext"><?= $member['link'] ?></td>
+<?php if (!isset(Utils::$context['disabled_fields']['website'])): ?>
+						<td class="website_url centertext"><?= $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" rel="noopener"><span class="main_icons www" title="' . $member['website']['title'] . '"></span></a>' : '' ?></td>
+<?php endif; ?>
+<?php /* Group and date. */ ?>
+						<td class="id_group centertext"><?= empty($member['group']) ? $member['post_group'] : $member['group'] ?></td>
+						<td class="registered centertext"><?= $member['registered_date'] ?></td>
+<?php if (!isset(Utils::$context['disabled_fields']['posts'])): ?>
+						<td class="post_count centertext">
+<?php if (!empty($member['posts'])): ?>
+							<div class="generic_bar">
+								<div class="bar" style="width: <?= $member['post_percent'] ?>%;"></div>
+								<span><?= $member['posts'] ?></span>
+							</div>
+<?php endif; ?>
+						</td>
+<?php endif; ?>
+<?php /* Show custom fields marked to be shown here */ ?>
+<?php if (!empty(Utils::$context['custom_profile_fields']['columns'])): ?>
+<?php foreach (Utils::$context['custom_profile_fields']['columns'] as $key => $column): ?>
+						<td class="<?= $key ?> centertext"><?= $member['options'][$key] ?></td>
+<?php endforeach; ?>
+<?php endif; ?>
+					</tr>
+<?php endforeach; ?>
+<?php /* No members? */ ?>
+<?php else: ?>
+					<tr>
+						<td colspan="<?= Utils::$context['colspan'] ?>" class="windowbg"><?= Lang::getTxt('search_no_results', file: 'General') ?></td>
+					</tr>
+<?php endif; ?>
+				</tbody>
+			</table>
+		</div><!-- #mlist -->
+<?php /* Show the page numbers again. (makes 'em easier to find!) */ ?>
+		<div class="pagesection">
+			<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div>
+<?php /* If it is displaying the result of a search show a "search again" link to edit their criteria. */ ?>
+<?php if (isset(Utils::$context['old_search'])): ?>
+			<div class="buttonlist floatright">
+				<a class="button" href="<?= Config::$scripturl ?>?action=mlist;sa=search;search=<?= Utils::$context['old_search_value'] ?>"><?= Lang::getTxt('mlist_search_again', file: 'General') ?></a>
+			</div>
+<?php endif; ?>
+		</div>
+	</div><!-- #memberlist -->
\ No newline at end of file
diff --git a/Themes/default/templates/Memberlist/search.php b/Themes/default/templates/Memberlist/search.php
new file mode 100644
index 00000000000..06ae954c9fb
--- /dev/null
+++ b/Themes/default/templates/Memberlist/search.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A page allowing people to search the member list.
+ */
+?>
+
+<?php /* Start the submission form for the search! */ ?>
+	<form action="<?= Config::$scripturl ?>?action=mlist;sa=search" method="post" accept-charset="UTF-8">
+		<div id="memberlist">
+			<div class="pagesection">
+				<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['memberlist_buttons'], 'direction' => 'right']); ?>
+			</div>
+			<div class="cat_bar">
+				<h3 class="catbg mlist">
+					<span class="main_icons filter"></span><?= Lang::getTxt('mlist_search', file: 'General') ?>
+				</h3>
+			</div>
+			<div id="advanced_search" class="roundframe">
+				<dl id="mlist_search" class="settings">
+					<dt>
+						<label for="search"><strong><?= Lang::getTxt('search_for', file: 'General') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="search" id="search" value="<?= Utils::$context['old_search'] ?>" size="40">
+					</dd>
+					<dt>
+						<label><strong><?= Lang::getTxt('mlist_search_filter', file: 'General') ?></strong></label>
+					</dt>
+					<dd>
+						<ul>
+<?php foreach (Utils::$context['search_fields'] as $id => $title): ?>
+							<li>
+								<input type="checkbox" name="fields[]" id="fields-<?= $id ?>" value="<?= $id ?>"<?= in_array($id, Utils::$context['search_defaults']) ? ' checked' : '' ?>>
+								<label for="fields-<?= $id ?>"><?= $title ?></label>
+							</li>
+<?php endforeach; ?>
+						</ul>
+					</dd>
+				</dl>
+				<input type="submit" name="submit" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button floatright">
+			</div><!-- #advanced_search -->
+		</div><!-- #memberlist -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/MessageIndex/index.php b/Themes/default/templates/MessageIndex/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/MessageIndex/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/MessageIndex/main.php b/Themes/default/templates/MessageIndex/main.php
new file mode 100644
index 00000000000..c2cfb644118
--- /dev/null
+++ b/Themes/default/templates/MessageIndex/main.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main messageindex.
+ */
+?><div id="display_head" class="information">
+			<h2 class="display_title"><?= Utils::$context['name'] ?></h2><?php if (isset(Utils::$context['description']) && Utils::$context['description'] != ''): ?>
+			<p><?= Utils::$context['description'] ?></p><?php endif; ?><?php if (!empty(Utils::$context['moderators'])): ?>
+			<p><?= Lang::getTxt('moderators_list', ['num' => count(Utils::$context['link_moderators']), 'list' => Lang::sentenceList(Utils::$context['link_moderators'])], file: 'General') ?>.</p><?php endif; ?><?php if (!empty(Theme::$current->settings['display_who_viewing'])): ?><?php /* Show just numbers...? */ ?><?php if (Theme::$current->settings['display_who_viewing'] == 1 || empty(Utils::$context['view_members_list'])): ?><?php
+// Count the ones this member is allowed to see. Any hidden ones get
+// their own mention below, so counting those here as well would say
+// the same people twice.
+$list_of_viewers = [
+	Lang::getTxt('number_of_members', [count(Utils::$context['view_members_list'])], file: 'General'),
+];
+// Or show the actual people viewing the topic?
+?><?php else: ?><?php $list_of_viewers = Utils::$context['view_members_list']; ?><?php endif; ?><?php if (!empty(Utils::$context['view_num_hidden']) && !Utils::$context['can_moderate_forum']): ?><?php $list_of_viewers[] = Lang::getTxt('number_of_hidden_members', [Utils::$context['view_num_hidden']], file: 'General'); ?><?php endif; ?><?php /* Now show how many guests are here too. */ ?><?php if (!empty(Utils::$context['view_num_guests'])): ?><?php $list_of_viewers[] = Lang::getTxt('guest_plural', [Utils::$context['view_num_guests']], file: 'General'); ?><?php endif; ?>
+			<p>
+				<?= Lang::getTxt(
+			'who_viewing_board',
+			[
+				'list_of_viewers' => Lang::sentenceList(array_values($list_of_viewers)),
+				'num_viewing' => count(Utils::$context['view_members_list'] ?? []) + (int) (Utils::$context['view_num_guests'] ?? 0) + (int) (Utils::$context['view_num_hidden'] ?? 0),
+			],
+			file: 'General',
+		) ?>
+			</p><?php endif; ?>
+		</div><?php if (!empty(Utils::$context['boards']) && (!empty(Theme::$current->options['show_children']) || Utils::$context['start'] == 0)): ?>
+	<div id="board_<?= Utils::$context['current_board'] ?>_childboards" class="boardindex_table main_container">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('sub_boards', file: 'General') ?></h3>
+		</div><?php $this->subTemplate('bi_board_list', ['boards' => Utils::$context['boards']]); ?>
+	</div><!-- #board_[current_board]_childboards --><?php endif; ?><?php /* Let them know why their message became unapproved. */ ?><?php if (Utils::$context['becomesUnapproved']): ?>
+	<div class="noticebox">
+		<?= Lang::getTxt('post_becomes_unapproved', file: 'General') ?>
+	</div><?php endif; ?><?php /* If this person can approve items and we have some awaiting approval tell them. */ ?><?php if (!empty(Utils::$context['unapproved_posts_message'])): ?>
+	<div class="noticebox">
+		<?= Utils::$context['unapproved_posts_message'] ?>
+	</div><?php endif; ?><?php if (!Utils::$context['no_topic_listing']): ?>
+	<div class="pagesection">
+		<?= Utils::$context['menu_separator'] ?>
+		<div class="pagelinks floatleft">
+			<a href="#bot" class="button"><?= Lang::getTxt('go_down', file: 'General') ?></a>
+			<?= Utils::$context['page_index'] ?>
+		</div>
+		<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons'], 'direction' => 'right']); ?><?php /* Mobile action buttons (top) */ ?><?php if (!empty(Utils::$context['normal_buttons'])): ?>
+		<div class="mobile_buttons floatright">
+			<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+		</div><?php endif; ?>
+	</div><?php /* If Quick Moderation is enabled start the form. */ ?><?php if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] > 0 && !empty(Utils::$context['topics'])): ?>
+	<form action="<?= Config::$scripturl ?>?action=quickmod;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8" class="clear" name="quickModForm" id="quickModForm"><?php endif; ?>
+		<div id="messageindex">
+			<div class="title_bar" id="topic_header"><?php /* Are there actually any topics to show? */ ?><?php if (!empty(Utils::$context['topics'])): ?>
+				<div class="board_icon"></div>
+				<div class="info"><?= Utils::$context['topics_headers']['subject'] ?> / <?= Utils::$context['topics_headers']['starter'] ?></div>
+				<div class="board_stats centertext"><?= Utils::$context['topics_headers']['replies'] ?> / <?= Utils::$context['topics_headers']['views'] ?></div>
+				<div class="lastpost"><?= Utils::$context['topics_headers']['last_post'] ?></div><?php /* Show a "select all" box for quick moderation? */ ?><?php if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+				<div class="moderation">
+					<input type="checkbox" onclick="invertAll(this, this.form, 'topics[]');">
+				</div><?php /* If it's on in "image" mode, don't show anything but the column. */ ?><?php elseif (!empty(Utils::$context['can_quick_mod'])): ?>
+				<div class="moderation"></div><?php endif; ?><?php /* No topics... just say, "sorry bub". */ ?><?php else: ?>
+				<h3 class="titlebg"><?= Lang::getTxt('topic_alert_none', file: 'General') ?></h3><?php endif; ?>
+			</div><!-- #topic_header --><?php /* Contain the topic list */ ?>
+			<div id="topic_container"><?php foreach (Utils::$context['topics'] as $topic): ?>
+				<div class="<?= $topic['css_class'] ?>">
+					<div class="board_icon">
+						<img src="<?= $topic['first_post']['icon_url'] ?>" alt="">
+						<?= $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '' ?>
+					</div>
+					<div class="info<?= !empty(Utils::$context['can_quick_mod']) ? '' : ' info_block' ?>">
+						<div<?= !empty($topic['quick_mod']['modify']) ? ' data-msg-id="' . $topic['first_post']['id'] . '"' : '' ?>><?php /* Now we handle the icons */ ?>
+							<div id="icons<?= $topic['first_post']['id'] ?>" class="icons floatright"><?php if ($topic['is_watched']): ?>
+								<span class="main_icons watch" title="<?= Lang::getTxt('watching_this_topic', file: 'General') ?>"></span><?php endif; ?><?php if ($topic['is_locked']): ?>
+								<span class="main_icons lock"></span><?php endif; ?><?php if ($topic['is_sticky']): ?>
+								<span class="main_icons sticky"></span><?php endif; ?><?php if ($topic['is_redirect']): ?>
+								<span class="main_icons move"></span><?php endif; ?><?php if ($topic['is_poll']): ?>
+								<span class="main_icons poll"></span><?php endif; ?>
+							</div>
+							<div class="message_index_title">
+								<?= $topic['new'] && !User::$me->is_guest ? '<a href="' . $topic['new_href'] . '" id="newicon' . $topic['first_post']['id'] . '" class="new_posts">' . Lang::getTxt('new', file: 'General') . '</a>' : '' ?>
+								<span class="preview<?= $topic['is_sticky'] ? ' bold_text' : '' ?>" title="<?= $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'] ?>">
+									<span id="msg<?= $topic['first_post']['id'] ?>"><?= $topic['first_post']['link'] ?><?= (!$topic['approved'] ? '&nbsp;<em>(' . Lang::getTxt('awaiting_approval', file: 'General') . ')</em>' : '') ?></span>
+								</span>
+							</div>
+							<p class="floatleft">
+								<?= Lang::getTxt('started_by_member', ['member' => $topic['first_post']['member']['link']], file: 'General') ?>
+							</p>
+							<?= !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '' ?>
+						</div><!-- #topic_[first_post][id] -->
+					</div><!-- .info -->
+					<div class="board_stats centertext">
+						<p><?= Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General') ?><br><?= Lang::getTxt('number_of_views', [$topic['views']], file: 'General') ?></p>
+					</div>
+					<div class="lastpost">
+						<p><?= Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General') ?></p>
+					</div><?php /* Show the quick moderation options? */ ?><?php if (!empty(Utils::$context['can_quick_mod'])): ?>
+					<div class="moderation"><?php if (Theme::$current->options['display_quick_mod'] == 1): ?>
+						<input type="checkbox" name="topics[]" value="<?= $topic['id'] ?>"><?php else: ?><?php /* Check permissions on each and show only the ones they are allowed to use. */ ?><?php if ($topic['quick_mod']['remove']): ?><a href="<?= Config::$scripturl ?>?action=quickmod;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;actions%5B<?= $topic['id'] ?>%5D=remove;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="you_sure"><span class="main_icons delete" title="<?= Lang::getTxt('remove_topic', file: 'General') ?>"></span></a><?php endif; ?><?php if ($topic['quick_mod']['lock']): ?><a href="<?= Config::$scripturl ?>?action=quickmod;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;actions%5B<?= $topic['id'] ?>%5D=lock;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="you_sure"><span class="main_icons lock" title="<?= Lang::getTxt($topic['is_locked'] ? 'set_unlock' : 'set_lock', file: 'General') ?>"></span></a><?php endif; ?><?php if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']): ?><br><?php endif; ?><?php if ($topic['quick_mod']['sticky']): ?><a href="<?= Config::$scripturl ?>?action=quickmod;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;actions%5B<?= $topic['id'] ?>%5D=sticky;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="you_sure"><span class="main_icons sticky" title="<?= Lang::getTxt($topic['is_sticky'] ? 'set_nonsticky' : 'set_sticky', file: 'General') ?>"></span></a><?php endif; ?><?php if ($topic['quick_mod']['move']): ?><a href="<?= Config::$scripturl ?>?action=movetopic;current_board=<?= Utils::$context['current_board'] ?>;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;topic=<?= $topic['id'] ?>.0"><span class="main_icons move" title="<?= Lang::getTxt('move_topic', file: 'General') ?>"></span></a><?php endif; ?><?php endif; ?>
+					</div><!-- .moderation --><?php endif; ?>
+				</div><!-- $topic[css_class] --><?php endforeach; ?>
+			</div><!-- #topic_container --><?php if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && !empty(Utils::$context['topics'])): ?>
+			<div class="righttext" id="quick_actions">
+				<select class="qaction" name="qaction"<?= Utils::$context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '' ?>>
+					<option value="">--------</option><?php foreach (Utils::$context['qmod_actions'] as $qmod_action): ?><?php if (Utils::$context['can_' . $qmod_action]): ?>
+					<option value="<?= $qmod_action ?>"><?= Lang::getTxt('quick_mod_' . $qmod_action, file: 'General') ?></option><?php endif; ?><?php endforeach; ?>
+				</select><?php /* Show a list of boards they can move the topic to. */ ?><?php if (Utils::$context['can_move']): ?>
+				<span id="quick_mod_jump_to"></span><?php endif; ?>
+				<input type="submit" value="<?= Lang::getTxt('quick_mod_go', file: 'General') ?>" onclick="return document.forms.quickModForm.qaction.value != '' &amp;&amp; confirm('<?= Lang::getTxt('quickmod_confirm', file: 'General') ?>');" class="button qaction">
+			</div><!-- #quick_actions --><?php endif; ?>
+		</div><!-- #messageindex --><?php /* Finish off the form - again. */ ?><?php if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] > 0 && !empty(Utils::$context['topics'])): ?>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form><?php endif; ?>
+	<div class="pagesection">
+		<?= Utils::$context['menu_separator'] ?>
+		<div class="pagelinks floatleft">
+			<a href="#main_content_section" class="button" id="bot"><?= Lang::getTxt('go_up', file: 'General') ?></a>
+			<?= Utils::$context['page_index'] ?>
+		</div>
+		<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons'], 'direction' => 'right']); ?><?php /* Mobile action buttons (bottom) */ ?><?php if (!empty(Utils::$context['normal_buttons'])): ?>
+			<div class="mobile_buttons floatright">
+				<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+			</div><?php endif; ?>
+	</div><?php endif; ?><?php /* Show breadcrumbs at the bottom too. */ ?><?php $this->subTemplate('linktree'); ?>
+	<script>
+		window.addEventListener("DOMContentLoaded", function() {<?php if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && !empty(Utils::$context['topics']) && Utils::$context['can_move']): ?>
+
+			new JumpTo({
+				sContainerId: "quick_mod_jump_to",
+				sClassName: "qaction",
+				sJumpToTemplate: "%dropdown_list%",
+				iCurBoardId: <?= Utils::$context['current_board'] ?>,
+				iCurBoardChildLevel: <?= Utils::$context['jump_to']['child_level'] ?>,
+				sCurBoardName: "<?= Utils::$context['jump_to']['board_name'] ?>",
+				sBoardChildLevelIndicator: "==",
+				sBoardPrefix: "=> ",
+				sCatSeparator: "-----------------------------",
+				sCatPrefix: "",
+				bNoRedirect: true,
+				bDisabled: true,
+				sCustomName: "move_to"
+			});<?php endif; ?><?php /* Javascript for inline editing. */ ?>
+
+			new QuickModifyTopic({
+				aHidePrefixes: ["icons", "msg", "pages", "newicon"],
+				sTopicContainer: "topic_container",
+			});
+		});
+	</script><?php $this->subTemplate('topic_legend'); ?><?php /* Lets pop the... */ ?>
+	<div id="mobile_action" class="popup_container">
+		<div class="popup_window description">
+			<div class="popup_heading"><?= Lang::getTxt('mobile_action', file: 'General') ?>
+				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+			</div>
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['normal_buttons']]); ?>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/MessageIndex/topic_legend.php b/Themes/default/templates/MessageIndex/topic_legend.php
new file mode 100644
index 00000000000..c9b6672655d
--- /dev/null
+++ b/Themes/default/templates/MessageIndex/topic_legend.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Shows a legend for topic icons.
+ */
+?>
+	<div class="tborder" id="topic_icons">
+		<div class="information">
+			<p id="message_index_jump_to"></p>
+<?php if (empty(Utils::$context['no_topic_listing'])): ?>
+			<p class="floatleft"><?= !empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest ? '
+				<span class="main_icons profile_sm"></span> ' . Lang::getTxt('participation_caption', file: 'General') . '<br>' : '' ?>
+				<?= (Config::$modSettings['pollMode'] == '1' ? '<span class="main_icons poll"></span> ' . Lang::getTxt('poll', file: 'General') . '<br>' : '') ?>
+				<span class="main_icons move"></span> <?= Lang::getTxt('moved_topic', file: 'General') ?><br>
+			</p>
+			<p>
+				<span class="main_icons lock"></span> <?= Lang::getTxt('locked_topic', file: 'General') ?><br>
+				<span class="main_icons sticky"></span> <?= Lang::getTxt('sticky_topic', file: 'General') ?><br>
+				<span class="main_icons watch"></span> <?= Lang::getTxt('watching_topic', file: 'General') ?><br>
+			</p>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['jump_to'])): ?>
+			<script>
+				window.addEventListener("DOMContentLoaded", function() {
+					new JumpTo({
+						sContainerId: "message_index_jump_to",
+						sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\"><?= Utils::$context['jump_to']['label'] ?><" + "/label> %dropdown_list%",
+						iCurBoardId: <?= Utils::$context['current_board'] ?>,
+						iCurBoardChildLevel: <?= Utils::$context['jump_to']['child_level'] ?>,
+						sCurBoardName: "<?= Utils::$context['jump_to']['board_name'] ?>",
+						sBoardChildLevelIndicator: "==",
+						sBoardPrefix: "=> ",
+						sCatSeparator: "-----------------------------",
+						sCatPrefix: "",
+						sGoButtonLabel: "<?= Lang::getTxt('quick_mod_go', file: 'General') ?>"
+					});
+				});
+			</script>
+<?php endif; ?>
+		</div><!-- .information -->
+	</div><!-- #topic_icons -->
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/group_requests_block.php b/Themes/default/templates/ModerationCenter/group_requests_block.php
new file mode 100644
index 00000000000..10f9a92f6d9
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/group_requests_block.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show all the group requests the user can see.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=groups;sa=requests" id="group_requests_link"><?= Lang::getTxt('mc_group_requests', file: 'ModerationCenter') ?></a>
+			</h3>
+			<span id="group_requests_toggle" class="<?= !empty(Utils::$context['admin_prefs']['mcgr']) ? 'toggle_down' : 'toggle_up' ?>" title="<?= Lang::getTxt(empty(Utils::$context['admin_prefs']['mcgr']) ? 'hide' : 'show', file: 'General') ?>" style="display: none;"></span>
+		</div>
+		<div class="windowbg" id="group_requests_panel">
+			<ul>
+<?php foreach (Utils::$context['group_requests'] as $request): ?>
+				<li class="smalltext">
+					<?= Lang::getTxt('mc_groupr_by', ['group_link' => '<a href="' . $request['request_href'] . '">' . $request['group']['name'] . '</a>', 'member_link' => $request['member']['link']], file: 'ModerationCenter') ?>
+				</li>
+<?php endforeach; ?>
+<?php /* Don't have any watched users right now? */ ?>
+<?php if (empty(Utils::$context['group_requests'])): ?>
+				<li>
+					<strong class="smalltext"><?= Lang::getTxt('mc_group_requests_none', file: 'ModerationCenter') ?></strong>
+				</li>
+<?php endif; ?>
+			</ul>
+		</div><!-- #group_requests_panel -->
+
+		<script>
+			var oGroupRequestsPanelToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: <?= !empty(Utils::$context['admin_prefs']['mcgr']) ? 'true' : 'false' ?>,
+				aSwappableContainers: [
+					'group_requests_panel'
+				],
+				aSwapImages: [
+					{
+						sId: 'group_requests_toggle',
+						altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+						altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'group_requests_link',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('mc_group_requests', file: 'ModerationCenter')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('mc_group_requests', file: 'ModerationCenter')) ?>
+
+					}
+				],
+				oThemeOptions: {
+					bUseThemeSettings: true,
+					sOptionName: 'admin_preferences',
+					sSessionVar: smf_session_var,
+					sSessionId: smf_session_id,
+					sThemeId: '1',
+					sAdditionalVars: ';admin_key=mcgr'
+				}
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/index.php b/Themes/default/templates/ModerationCenter/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ModerationCenter/moderation_center.php b/Themes/default/templates/ModerationCenter/moderation_center.php
new file mode 100644
index 00000000000..dd413173005
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/moderation_center.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main moderation center.
+ */
+?><?php /* Show moderators notes. */ ?><?php $this->subTemplate('notes'); ?><?php /* Show a welcome message to the user. */ ?>
+	<div id="modcenter"><?php /* Show all the blocks they want to see. */ ?><?php foreach (Utils::$context['mod_blocks'] as $block): ?>
+		<div class="half_content"><?= $this->hasSubTemplate($block) ? $this->subTemplate($block) : '' ?></div><?php endforeach; ?>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/moderation_settings.php b/Themes/default/templates/ModerationCenter/moderation_settings.php
new file mode 100644
index 00000000000..0beb34451da
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/moderation_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The moderation settings page.
+ */
+?>
+	<div id="modcenter">
+		<div class="windowbg">
+			<div class="centertext"><?= Lang::getTxt('mc_no_settings', file: 'ModerationCenter') ?></div>
+		</div>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/notes.php b/Themes/default/templates/ModerationCenter/notes.php
new file mode 100644
index 00000000000..6a91b8ffc26
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/notes.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Little section for making... notes.
+ */
+?><?php /* Let them know the action was a success. */ ?><?php if (!empty(Utils::$context['report_post_action'])): ?>
+		<div class="infobox">
+			<?= Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter') ?>
+		</div><?php endif; ?>
+		<div id="modnotes">
+			<form action="<?= Config::$scripturl ?>?action=moderate;area=index;modnote" method="post">
+				<div class="cat_bar">
+					<h3 class="catbg"><?= Lang::getTxt('mc_notes', file: 'ModerationCenter') ?></h3>
+				</div>
+				<div class="windowbg"><?php if (!empty(Utils::$context['notes'])): ?>
+					<ul class="moderation_notes"><?php /* Cycle through the notes. */ ?><?php foreach (Utils::$context['notes'] as $note): ?>
+						<li class="smalltext">
+							<?= ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . Utils::$context['mod-modnote-del_token_var'] . '=' . Utils::$context['mod-modnote-del_token'] . '" data-confirm="' . Lang::getTxt('mc_reportedp_delete_confirm', file: 'ModerationCenter') . '" class="you_sure"><span class="main_icons delete"></span></a>' : '') ?><?= $note['time'] ?> <strong><?= $note['author']['link'] ?>:</strong> <?= Utils::adjustHeadingLevels($note['text'], 4) ?>
+						</li><?php endforeach; ?>
+					</ul>
+					<div class="pagesection notes">
+						<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+					</div><?php endif; ?>
+					<div class="floatleft post_note">
+						<input type="text" name="new_note" placeholder="<?= Lang::getTxt('mc_click_add_note', file: 'ModerationCenter') ?>">
+					</div>
+					<input type="hidden" name="<?= Utils::$context['mod-modnote-add_token_var'] ?>" value="<?= Utils::$context['mod-modnote-add_token'] ?>">
+					<input type="submit" name="makenote" value="<?= Lang::getTxt('mc_add_note', file: 'ModerationCenter') ?>" class="button">
+				</div><!-- .windowbg -->
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+		</div><!-- #modnotes -->
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/reported_posts_block.php b/Themes/default/templates/ModerationCenter/reported_posts_block.php
new file mode 100644
index 00000000000..464772d4f93
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/reported_posts_block.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A list of reported posts
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=moderate;area=reportedposts" id="reported_posts_link"><?= Lang::getTxt('mc_recent_reports', file: 'ModerationCenter') ?></a>
+			</h3>
+			<span id="reported_posts_toggle" class="<?= !empty(Utils::$context['admin_prefs']['mcrp']) ? 'toggle_down' : 'toggle_up' ?>" title="<?= Lang::getTxt(empty(Utils::$context['admin_prefs']['mcrp']) ? 'hide' : 'show', file: 'General') ?>" style="display: none;"></span>
+		</div>
+		<div class="windowbg" id="reported_posts_panel">
+			<ul>
+<?php foreach (Utils::$context['reported_posts'] as $post): ?>
+				<li>
+					<span class="smalltext"><?= Lang::getTxt('mc_post_report', ['report_link' => $post['report_link'], 'author_link' => $post['author']['link']], file: 'ModerationCenter') ?></span>
+				</li>
+<?php endforeach; ?>
+<?php /* Don't have any watched users right now? */ ?>
+<?php if (empty(Utils::$context['reported_posts'])): ?>
+				<li>
+					<strong class="smalltext"><?= Lang::getTxt('mc_recent_reports_none', file: 'ModerationCenter') ?></strong>
+				</li>
+<?php endif; ?>
+			</ul>
+		</div><!-- #reported_posts_panel -->
+
+		<script>
+			var oReportedPostsToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: <?= !empty(Utils::$context['admin_prefs']['mcrp']) ? 'true' : 'false' ?>,
+				aSwappableContainers: [
+					'reported_posts_panel'
+				],
+				aSwapImages: [
+					{
+						sId: 'reported_posts_toggle',
+						altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+						altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'reported_posts_link',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('mc_recent_reports', file: 'ModerationCenter')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('mc_recent_reports', file: 'ModerationCenter')) ?>
+
+					}
+				],
+				oThemeOptions: {
+					bUseThemeSettings: true,
+					sOptionName: 'admin_preferences',
+					sSessionVar: smf_session_var,
+					sSessionId: smf_session_id,
+					sThemeId: '1',
+					sAdditionalVars: ';admin_key=mcrp'
+				}
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/reported_users_block.php b/Themes/default/templates/ModerationCenter/reported_users_block.php
new file mode 100644
index 00000000000..9f006fab15f
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/reported_users_block.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A list of reported users
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=moderate;area=reportedmembers" id="reported_users_link"><?= Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter') ?></a>
+			</h3>
+			<span id="reported_users_toggle" class="<?= !empty(Utils::$context['admin_prefs']['mcur']) ? 'toggle_down' : 'toggle_up' ?>" title="<?= Lang::getTxt(empty(Utils::$context['admin_prefs']['mcur']) ? 'hide' : 'show', file: 'General') ?>" style="display: none;"></span>
+		</div>
+		<div class="windowbg" id="reported_users_panel">
+			<ul>
+<?php foreach (Utils::$context['reported_users'] as $user): ?>
+				<li>
+					<span class="smalltext"><?= $user['user']['link'] ?></span>
+				</li>
+<?php endforeach; ?>
+<?php /* Don't have any watched users right now? */ ?>
+<?php if (empty(Utils::$context['reported_users'])): ?>
+				<li>
+					<strong class="smalltext"><?= Lang::getTxt('mc_reported_users_none', file: 'ModerationCenter') ?></strong>
+				</li>
+<?php endif; ?>
+			</ul>
+		</div><!-- #reported_users_panel -->
+
+		<script>
+			var oReportedUsersToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: <?= !empty(Utils::$context['admin_prefs']['mcur']) ? 'true' : 'false' ?>,
+				aSwappableContainers: [
+					'reported_users_panel'
+				],
+				aSwapImages: [
+					{
+						sId: 'reported_users_toggle',
+						altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+						altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'reported_users_link',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('mc_recent_user_reports', file: 'ModerationCenter')) ?>
+
+					}
+				],
+				oThemeOptions: {
+					bUseThemeSettings: true,
+					sOptionName: 'admin_preferences',
+					sSessionVar: smf_session_var,
+					sSessionId: smf_session_id,
+					sThemeId: '1',
+					sAdditionalVars: ';admin_key=mcur'
+				}
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/show_notice.php b/Themes/default/templates/ModerationCenter/show_notice.php
new file mode 100644
index 00000000000..fa1b7aa4318
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/show_notice.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show a notice sent to a user.
+ */
+?><?php /* We do all the HTML for this one! */ ?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Utils::$context['page_title'] ?></title>
+		<?= Theme::template_css() ?>
+	</head>
+	<body>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('show_notice', file: 'ModerationCenter') ?></h3>
+		</div>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('show_notice_subject', ['subject' => Utils::$context['notice_subject']], file: 'ModerationCenter') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl>
+				<dt>
+					<strong><?= Lang::getTxt('show_notice_text', file: 'ModerationCenter') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::adjustHeadingLevels(Utils::$context['notice_body'], 3) ?>
+				</dd>
+			</dl>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/unapproved_posts.php b/Themes/default/templates/ModerationCenter/unapproved_posts.php
new file mode 100644
index 00000000000..b8b9d999191
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/unapproved_posts.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show a list of all the unapproved posts
+ */
+?>
+
+<?php /* Just a big table of it all really... */ ?>
+	<div id="modcenter">
+		<form action="<?= Config::$scripturl ?>?action=moderate;area=postmod;start=<?= Utils::$context['start'] ?>;sa=<?= Utils::$context['current_view'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar<?= !empty(Utils::$context['unapproved_items']) ? ' cat_bar_round' : '' ?>">
+				<h3 class="catbg"><?= Lang::getTxt('mc_unapproved_posts', file: 'ModerationCenter') ?></h3>
+			</div>
+<?php /* No posts? */ ?>
+<?php if (empty(Utils::$context['unapproved_items'])): ?>
+			<div class="windowbg">
+				<p class="centertext">
+					<?= Lang::getTxt('mc_unapproved_' . Utils::$context['current_view'] . '_none_found', file: 'ModerationCenter') ?>
+				</p>
+			</div>
+<?php else: ?>
+			<div class="pagesection">
+				<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+<?php if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+				<ul class="buttonlist floatright">
+					<li class="inline_mod_check">
+						<input type="checkbox" onclick="invertAll(this, this.form, 'item[]');" checked>
+					</li>
+				</ul>
+<?php endif; ?>
+			</div>
+<?php endif; ?>
+<?php foreach (Utils::$context['unapproved_items'] as $item): ?>
+<?php
+// The buttons
+$quickbuttons = [
+	'approve' => [
+		'label' => Lang::getTxt('approve', file: 'General'),
+		'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';approve=' . $item['id'],
+		'icon' => 'approve',
+	],
+	'delete' => [
+		'label' => Lang::getTxt('remove', file: 'General'),
+		'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';delete=' . $item['id'],
+		'icon' => 'remove_button',
+		'show' => $item['can_delete'],
+	],
+	'quickmod' => [
+		'class' => 'inline_mod_check',
+		'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
+		'show' => !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1,
+	],
+];
+?>
+			<div class="windowbg clear">
+				<div class="page_number floatright"> #<?= $item['counter'] ?></div>
+				<div class="topic_details">
+					<h5>
+						<strong><?= $item['category']['link'] ?> / <?= $item['board']['link'] ?> / <?= $item['link'] ?></strong>
+					</h5>
+					<span class="smalltext"><?= str_replace('<br>', ' ', Lang::getTxt('last_post_topic', ['post_link' => $item['time'], 'member_link' => '<strong>' . $item['poster']['link'] . '</strong>'], file: 'General')) ?></span>
+				</div>
+				<div class="list_posts">
+					<div class="post"><?= Utils::adjustHeadingLevels($item['body'], 5) ?></div>
+				</div>
+				<?php $this->subTemplate('quickbuttons', ['list_items' => $quickbuttons, 'list_class' => 'unapproved_posts']); ?>
+			</div><!-- .windowbg -->
+<?php endforeach; ?>
+			<div class="pagesection">
+<?php if (!empty(Utils::$context['unapproved_items'])): ?>
+				<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+<?php endif; ?>
+<?php if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+				<div class="floatright">
+					<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm('<?= Lang::getTxt('mc_unapproved_sure', file: 'ModerationCenter') ?>')) submit();">
+						<option value="0"><?= Lang::getTxt('with_selected', file: 'ModerationCenter') ?>:</option>
+						<option value="0" disabled>-------------------</option>
+						<option value="approve">&nbsp;--&nbsp;<?= Lang::getTxt('approve', file: 'General') ?></option>
+						<option value="delete">&nbsp;--&nbsp;<?= Lang::getTxt('delete', file: 'General') ?></option>
+					</select>
+					<noscript>
+						<input type="submit" name="mc_go" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button">
+					</noscript>
+				</div>
+<?php endif; ?>
+			</div><!-- .pagesection -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/user_watch_post_callback.php b/Themes/default/templates/ModerationCenter/user_watch_post_callback.php
new file mode 100644
index 00000000000..52ada7e8a62
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/user_watch_post_callback.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Callback function for showing a watched users post in the table.
+ *
+ * @param array $post An array of data about the post.
+ * @return string An array of HTML for showing the post info.
+ */
+?><?php
+// We'll have a delete and a checkbox please bob.
+// @todo Discuss this with the team and rewrite if required.
+$quickbuttons = [
+	'delete' => [
+		'label' => Lang::getTxt('remove_message', file: 'General'),
+		'href' => Config::$scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
+		'javascript' => 'data-confirm="' . Lang::getTxt('mc_watched_users_delete_post', file: 'ModerationCenter') . '"',
+		'class' => 'you_sure',
+		'icon' => 'remove_button',
+		'show' => $post['can_delete'],
+	],
+	'quickmod' => [
+		'class' => 'inline_mod_check',
+		'content' => '<input type="checkbox" name="delete[]" value="' . $post['id'] . '">',
+		'show' => $post['can_delete'],
+	],
+];
+$output_html = '
+					<div>
+						<div class="floatleft">
+							' . Lang::getTxt('mc_post_report', ['report_link' => '<a href="' . Config::$scripturl . '?topic=' . $post['id_topic'] . '.' . $post['id'] . '#msg' . $post['id'] . '">' . $post['subject'] . '</a>', 'author_link' => $post['author_link']], file: 'ModerationCenter') . '
+						</div>
+					</div>
+					<br>
+					<div class="smalltext">
+						' . Lang::getTxt('mc_watched_users_posted', ['time' => $post['poster_time']], file: 'ModerationCenter') . '
+					</div>
+					<div class="list_posts">
+						' . $post['body'] . '
+					</div>';
+?><?php $output_html .= $this->fetchSubTemplate('quickbuttons', ['list_items' => $quickbuttons, 'list_class' => 'user_watch_post', 'output_method' => 'return']); ?><?php echo $output_html; ?>
diff --git a/Themes/default/templates/ModerationCenter/warn_template.php b/Themes/default/templates/ModerationCenter/warn_template.php
new file mode 100644
index 00000000000..d1474c12317
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/warn_template.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Add or edit a warning template.
+ */
+?>
+	<div id="modcenter">
+		<form action="<?= Config::$scripturl ?>?action=moderate;area=warnings;sa=templateedit;tid=<?= Utils::$context['id_template'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="information">
+				<?= Lang::getTxt('mc_warning_template_desc', file: 'ModerationCenter') ?>
+			</div>
+			<div class="windowbg">
+				<div class="errorbox"<?= empty(Utils::$context['warning_errors']) ? ' style="display: none"' : '' ?> id="errors">
+					<dl>
+						<dt>
+							<strong id="error_serious"><?= Lang::getTxt('error_while_submitting', file: 'General') ?></strong>
+						</dt>
+						<dd class="error" id="error_list">
+							<?= empty(Utils::$context['warning_errors']) ? '' : implode('<br>', Utils::$context['warning_errors']) ?>
+						</dd>
+					</dl>
+				</div>
+				<div id="box_preview"<?= !empty(Utils::$context['template_preview']) ? '' : ' style="display:none"' ?>>
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('preview', file: 'General') ?></strong>
+						</dt>
+						<dd id="template_preview">
+							<?= !empty(Utils::$context['template_preview']) ? Utils::$context['template_preview'] : '' ?>
+						</dd>
+					</dl>
+				</div>
+				<dl class="settings">
+					<dt>
+						<strong><label for="template_title"><?= Lang::getTxt('mc_warning_template_title', file: 'ModerationCenter') ?></label></strong>
+					</dt>
+					<dd>
+						<input type="text" id="template_title" name="template_title" value="<?= Utils::$context['template_data']['title'] ?>" size="30">
+					</dd>
+					<dt>
+						<strong><label for="template_body"><?= Lang::getTxt('profile_warning_notify_body', file: 'Profile') ?></label></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('mc_warning_template_body_desc', file: 'ModerationCenter') ?></span>
+					</dt>
+					<dd>
+						<textarea id="template_body" name="template_body" rows="10" cols="45" class="smalltext"><?= Utils::$context['template_data']['body'] ?></textarea>
+					</dd>
+				</dl>
+<?php if (Utils::$context['template_data']['can_edit_personal']): ?>
+				<input type="checkbox" name="make_personal" id="make_personal"<?= Utils::$context['template_data']['personal'] ? ' checked' : '' ?>>
+					<label for="make_personal">
+						<strong><?= Lang::getTxt('mc_warning_template_personal', file: 'ModerationCenter') ?></strong>
+					</label>
+					<p class="smalltext"><?= Lang::getTxt('mc_warning_template_personal_desc', file: 'ModerationCenter') ?></p>
+<?php endif; ?>
+				<input type="submit" name="preview" id="preview_button" value="<?= Lang::getTxt('preview', file: 'General') ?>" class="button">
+				<input type="submit" name="save" value="<?= Utils::$context['page_title'] ?>" class="button">
+			</div><!-- .windowbg -->
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['mod-wt_token_var'] ?>" value="<?= Utils::$context['mod-wt_token'] ?>">
+		</form>
+	</div><!-- #modcenter -->
+
+	<script>
+		$(document).ready(function() {
+			$("#preview_button").click(function() {
+				return ajax_getTemplatePreview();
+			});
+		});
+
+		function ajax_getTemplatePreview ()
+		{
+			$.ajax({
+				type: "POST",
+				headers: {
+					"X-SMF-AJAX": 1
+				},
+				xhrFields: {
+					withCredentials: typeof allow_xhjr_credentials !== "undefined" ? allow_xhjr_credentials : false
+				},
+				url: "<?= Config::$scripturl ?>?action=xmlhttp;sa=previews;xml",
+				data: {item: "warning_preview", title: $("#template_title").val(), body: $("#template_body").val(), user: $('input[name="u"]').attr("value")},
+				context: document.body,
+				success: function(request){
+					$("#box_preview").css({display:""});
+					$("#template_preview").html($(request).find('body').text());
+					if ($(request).find("error").text() != '')
+					{
+						$("#errors").css({display:""});
+						var errors_html = '';
+						var errors = $(request).find('error').each(function() {
+							errors_html += $(this).text() + '<br>';
+						});
+
+						$(document).find("#error_list").html(errors_html);
+					}
+					else
+					{
+						$("#errors").css({display:"none"});
+						$("#error_list").html('');
+					}
+				return false;
+				},
+			});
+			return false;
+		}
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ModerationCenter/watched_users.php b/Themes/default/templates/ModerationCenter/watched_users.php
new file mode 100644
index 00000000000..b6b2419ca75
--- /dev/null
+++ b/Themes/default/templates/ModerationCenter/watched_users.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A list of watched users
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=moderate;area=userwatch" id="watched_users_link"><?= Lang::getTxt('mc_watched_users', file: 'ModerationCenter') ?></a>
+			</h3>
+			<span id="watched_users_toggle" class="<?= !empty(Utils::$context['admin_prefs']['mcwu']) ? 'toggle_down' : 'toggle_up' ?>" title="<?= Lang::getTxt(empty(Utils::$context['admin_prefs']['mcwu']) ? 'hide' : 'show', file: 'General') ?>" style="display: none;"></span>
+		</div>
+		<div class="windowbg" id="watched_users_panel">
+			<ul>
+<?php foreach (Utils::$context['watched_users'] as $user): ?>
+				<li>
+					<span class="smalltext"><?= Lang::getTxt(!empty($user['last_login']) ? 'mc_seen' : 'mc_seen_never', $user, file: 'ModerationCenter') ?></span>
+				</li>
+<?php endforeach; ?>
+<?php /* Don't have any watched users right now? */ ?>
+<?php if (empty(Utils::$context['watched_users'])): ?>
+				<li>
+					<strong class="smalltext"><?= Lang::getTxt('mc_watched_users_none', file: 'ModerationCenter') ?></strong>
+				</li>
+<?php endif; ?>
+			</ul>
+		</div><!-- #watched_users_panel -->
+
+		<script>
+			var oWatchedUsersToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: <?= !empty(Utils::$context['admin_prefs']['mcwu']) ? 'true' : 'false' ?>,
+				aSwappableContainers: [
+					'watched_users_panel'
+				],
+				aSwapImages: [
+					{
+						sId: 'watched_users_toggle',
+						altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+						altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'watched_users_link',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('mc_watched_users', file: 'ModerationCenter')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('mc_watched_users', file: 'ModerationCenter')) ?>
+
+					}
+				],
+				oThemeOptions: {
+					bUseThemeSettings: true,
+					sOptionName: 'admin_preferences',
+					sSessionVar: smf_session_var,
+					sSessionId: smf_session_id,
+					sThemeId: '1',
+					sAdditionalVars: ';admin_key=mcwu'
+				}
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/MoveTopic/index.php b/Themes/default/templates/MoveTopic/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/MoveTopic/merge.php b/Themes/default/templates/MoveTopic/merge.php
new file mode 100644
index 00000000000..806bbe52f92
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/merge.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Merge topic page.
+ */
+?>
+		<div id="merge_topics">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('merge', file: 'General') ?></h3>
+			</div>
+			<div class="information">
+				<?= Lang::getTxt('merge_desc', file: 'General') ?>
+			</div>
+			<div class="windowbg">
+				<dl class="settings merge_topic">
+					<dt>
+						<strong><?= Lang::getTxt('topic_to_merge', file: 'General') ?></strong>
+					</dt>
+					<dd>
+						<?= Utils::$context['origin_subject'] ?>
+					</dd>
+				</dl>
+			</div>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('target_topic', file: 'General') ?></h3>
+			</div>
+			<div class="title_bar">
+				<h4 class="titlebg"><?php if (isset(Utils::$context['merge_categories'])): ?>
+					<form action="<?= Config::$scripturl ?>?action=mergetopics;from=<?= Utils::$context['origin_topic'] ?>;targetboard=<?= Utils::$context['target_board'] ?>;board=<?= Utils::$context['current_board'] ?>.0" method="post" accept-charset="UTF-8" id="mergeSelectBoard">
+						<?= Lang::getTxt('target_below', file: 'General') ?> (<?= Lang::getTxt('board', file: 'General') ?>:
+						<select name="targetboard" onchange="this.form.submit();"><?php foreach (Utils::$context['merge_categories'] as $cat): ?>
+							<optgroup label="<?= $cat['name'] ?>"><?php foreach ($cat['boards'] as $board): ?>
+								<option value="<?= $board['id'] ?>"<?= $board['selected'] ? ' selected' : '' ?>><?= $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '' ?> <?= $board['name'] ?></option><?php endforeach; ?>
+							</optgroup><?php endforeach; ?>
+						</select>)
+						<input type="hidden" name="from" value="<?= Utils::$context['origin_topic'] ?>">
+						<input type="submit" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button">
+					</form><?php else: ?><?= Lang::getTxt('target_below', file: 'General') ?><?php endif; ?>		</h4>
+			</div><!-- .title_bar -->
+			<form action="<?= Config::$scripturl ?>?action=mergetopics;sa=options" method="post" accept-charset="UTF-8"><?php /* Don't show this if there aren't any topics... */ ?><?php if (!empty(Utils::$context['topics'])): ?>
+				<div class="pagesection">
+					<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+				</div>
+				<div class="windowbg">
+					<ul class="merge_topics"><?php foreach (Utils::$context['topics'] as $topic): ?>
+						<li>
+							<a href="<?= Config::$scripturl ?>?action=mergetopics;sa=options;board=<?= Utils::$context['current_board'] ?>.0;from=<?= Utils::$context['origin_topic'] ?>;to=<?= $topic['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="main_icons merge"></span></a>
+							<a href="<?= Config::$scripturl ?>?topic=<?= $topic['id'] ?>.0" target="_blank" rel="noopener"><?= $topic['subject'] ?></a> <?= Lang::getTxt('started_by_member', ['member' => $topic['poster']['link']], file: 'General') ?>
+						</li><?php endforeach; ?>
+					</ul>
+				</div>
+				<div class="pagesection">
+					<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+				</div><?php /* Just a nice "There aren't any topics" message */ ?><?php else: ?>
+				<div class="windowbg"><?= Lang::getTxt('topic_alert_none', file: 'General') ?></div><?php endif; ?>
+				<br>
+				<div class="title_bar">
+					<h4 class="titlebg"><?= Lang::getTxt('target_id', file: 'General') ?></h4>
+				</div>
+				<div class="windowbg">
+					<dl class="settings merge_topic">
+						<dt>
+							<strong><?= Lang::getTxt('merge_to_topic_id', file: 'General') ?></strong>
+						</dt>
+						<dd>
+							<input type="hidden" name="topics[]" value="<?= Utils::$context['origin_topic'] ?>">
+							<input type="text" name="topics[]">
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+
+						</dd>
+					</dl>
+					<input type="submit" value="<?= Lang::getTxt('merge', file: 'General') ?>" class="button">
+				</div>
+			</form>
+		</div><!-- #merge_topics -->
\ No newline at end of file
diff --git a/Themes/default/templates/MoveTopic/merge_done.php b/Themes/default/templates/MoveTopic/merge_done.php
new file mode 100644
index 00000000000..d3e814d9a8c
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/merge_done.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Confirmation page shown when finished merging topics.
+ */
+?>
+		<div id="merge_topics">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('merge', file: 'General') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Lang::getTxt('merge_successful', file: 'General') ?></p>
+				<br>
+				<ul>
+					<li>
+						<a href="<?= Config::$scripturl ?>?board=<?= Utils::$context['target_board'] ?>.0"><?= Lang::getTxt('message_index', file: 'General') ?></a>
+					</li>
+					<li>
+						<a href="<?= Config::$scripturl ?>?topic=<?= Utils::$context['target_topic'] ?>.0"><?= Lang::getTxt('new_merged_topic', file: 'General') ?></a>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<br class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/MoveTopic/merge_extra_options.php b/Themes/default/templates/MoveTopic/merge_extra_options.php
new file mode 100644
index 00000000000..761093d1ac0
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/merge_extra_options.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Extra options related to merging topics.
+ */
+?>
+	<div id="merge_topics">
+		<form action="<?= Config::$scripturl ?>?action=mergetopics;sa=merge;" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('merge_topic_list', file: 'General') ?></h3>
+			</div>
+			<table class="bordercolor table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th scope="col" style="width:10px;"><?= Lang::getTxt('merge_check', file: 'General') ?></th>
+						<th scope="col" class="lefttext"><?= Lang::getTxt('subject', file: 'General') ?></th>
+						<th scope="col" class="lefttext"><?= Lang::getTxt('started_by', file: 'General') ?></th>
+						<th scope="col" class="lefttext"><?= Lang::getTxt('last_post', file: 'General') ?></th>
+						<th scope="col" style="width:20px;"><?= Lang::getTxt('merge_include_notifications', file: 'General') ?></th>
+					</tr>
+				</thead>
+				<tbody><?php foreach (Utils::$context['topics'] as $topic): ?>
+					<tr class="windowbg">
+						<td>
+							<input type="checkbox" name="topics[]" value="<?= $topic['id'] ?>" checked>
+						</td>
+						<td>
+							<a href="<?= Config::$scripturl ?>?topic=<?= $topic['id'] ?>.0" target="_blank" rel="noopener"><?= $topic['subject'] ?></a>
+						</td>
+						<td>
+							<?= $topic['started']['link'] ?><br>
+							<span class="smalltext"><?= $topic['started']['time'] ?></span>
+						</td>
+						<td>
+							<?= $topic['updated']['link'] ?><br>
+							<span class="smalltext"><?= $topic['updated']['time'] ?></span>
+						</td>
+						<td>
+							<input type="checkbox" name="notifications[]" value="<?= $topic['id'] ?>" checked>
+						</td>
+					</tr><?php endforeach; ?>
+				</tbody>
+			</table>
+			<br>
+			<div class="windowbg">
+				<fieldset id="merge_subject" class="merge_options">
+					<legend><?= Lang::getTxt('merge_select_subject', file: 'General') ?></legend>
+					<select name="subject" onchange="this.form.custom_subject.style.display = (this.options[this.selectedIndex].value != 0) ? 'none': '' ;"><?php foreach (Utils::$context['topics'] as $topic): ?>
+						<option value="<?= $topic['id'] ?>"<?= ($topic['selected'] ? ' selected' : '') ?>><?= $topic['subject'] ?></option><?php endforeach; ?>
+						<option value="0"><?= Lang::getTxt('merge_custom_subject', file: 'General') ?></option>
+					</select>
+					<br>
+					<input type="text" name="custom_subject" size="60" id="custom_subject" class="custom_subject" style="display: none;"><br>
+					<label for="enforce_subject"><input type="checkbox" name="enforce_subject" id="enforce_subject" value="1"> <?= Lang::getTxt('movetopic_change_all_subjects', file: 'General') ?></label>
+				</fieldset><?php /* Show an option to create a redirection topic as well... */ ?><?php $this->subTemplate('redirect_options', ['type' => 'merge']); ?><?php if (!empty(Utils::$context['boards']) && count(Utils::$context['boards']) > 1): ?>
+				<fieldset id="merge_board" class="merge_options">
+					<legend><?= Lang::getTxt('merge_select_target_board', file: 'General') ?></legend>
+					<ul><?php foreach (Utils::$context['boards'] as $board): ?>
+						<li>
+							<input type="radio" name="board" value="<?= $board['id'] ?>"<?= ($board['selected'] ? ' checked' : '') ?>> <?= $board['name'] ?>
+						</li><?php endforeach; ?>
+					</ul>
+				</fieldset><?php endif; ?><?php if (!empty(Utils::$context['polls'])): ?>
+				<fieldset id="merge_poll" class="merge_options">
+					<legend><?= Lang::getTxt('merge_select_poll', file: 'General') ?></legend>
+					<ul><?php foreach (Utils::$context['polls'] as $poll): ?>
+						<li>
+							<input type="radio" name="poll" value="<?= $poll['id'] ?>"<?= ($poll['selected'] ? ' checked' : '') ?>> <?= $poll['question'] ?> (<?= Lang::getTxt('topic', file: 'General') ?>: <a href="<?= Config::$scripturl ?>?topic=<?= $poll['topic']['id'] ?>.0" target="_blank" rel="noopener"><?= $poll['topic']['subject'] ?></a>)
+						</li><?php endforeach; ?>
+						<li>
+							<input type="radio" name="poll" value="-1"> (<?= Lang::getTxt('merge_no_poll', file: 'General') ?>)
+						</li>
+					</ul>
+				</fieldset><?php endif; ?>
+				<div class="auto_flow">
+					<input type="submit" value="<?= Lang::getTxt('merge', file: 'General') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="sa" value="execute">
+				</div>
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #merge_topics -->
\ No newline at end of file
diff --git a/Themes/default/templates/MoveTopic/move.php b/Themes/default/templates/MoveTopic/move.php
new file mode 100644
index 00000000000..01054d05389
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/move.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show an interface for selecting which board to move a post to.
+ */
+?>
+	<div id="move_topic" class="lower_padding">
+		<form action="<?= Config::$scripturl ?>?action=movetopic2;current_board=<?= Utils::$context['current_board'] ?>;topic=<?= Utils::$context['current_topic'] ?>.0" method="post" accept-charset="UTF-8" onsubmit="submitonce(this);">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('move_topic', file: 'General') ?></h3>
+			</div>
+			<div class="windowbg centertext">
+				<div class="move_topic">
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('move_to', file: 'General') ?></strong>
+						</dt>
+						<dd>
+							<select name="toboard"><?php foreach (Utils::$context['categories'] as $category): ?>
+								<optgroup label="<?= $category['name'] ?>"><?php foreach ($category['boards'] as $board): ?>
+									<option value="<?= $board['id'] ?>"<?= $board['selected'] ? ' selected' : '' ?><?= $board['id'] == Utils::$context['current_board'] ? ' disabled' : '' ?>><?= $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '' ?><?= $board['name'] ?></option><?php endforeach; ?>
+								</optgroup><?php endforeach; ?>
+							</select>
+						</dd><?php /* Disable the reason textarea when the postRedirect checkbox is unchecked... */ ?>
+					</dl>
+					<label for="reset_subject">
+						<input type="checkbox" name="reset_subject" id="reset_subject" onclick="document.getElementById('subjectArea').classList.toggle('hidden');"> <?= Lang::getTxt('movetopic_change_subject', file: 'General') ?>
+					</label><br>
+					<fieldset id="subjectArea" class="hidden">
+						<dl class="settings">
+							<dt><strong><?= Lang::getTxt('movetopic_new_subject', file: 'General') ?></strong></dt>
+							<dd><input type="text" name="custom_subject" size="30" value="<?= Utils::$context['subject'] ?>"></dd>
+						</dl>
+						<label for="enforce_subject"><input type="checkbox" name="enforce_subject" id="enforce_subject"> <?= Lang::getTxt('movetopic_change_all_subjects', file: 'General') ?></label>
+					</fieldset><?php /* Stick our "create a redirection topic" template in here... */ ?><?php $this->subTemplate('redirect_options', ['type' => 'move']); ?>
+					<input type="submit" value="<?= Lang::getTxt('move_topic', file: 'General') ?>" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				</div><!-- .move_topic -->
+			</div><!-- .windowbg --><?php if (Utils::$context['back_to_topic']): ?>
+			<input type="hidden" name="goback" value="1"><?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="seqnum" value="<?= Utils::$context['form_sequence_number'] ?>">
+		</form>
+	</div><!-- #move_topic -->
\ No newline at end of file
diff --git a/Themes/default/templates/MoveTopic/redirect_options.php b/Themes/default/templates/MoveTopic/redirect_options.php
new file mode 100644
index 00000000000..df443c33e17
--- /dev/null
+++ b/Themes/default/templates/MoveTopic/redirect_options.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Redirection topic options
+ *
+ * @param string $type What type of topic this is for - currently 'merge' or 'move'. Used to display appropriate text strings...
+ */
+?>
+					<label for="postRedirect" class="block">
+						<input type="checkbox" name="postRedirect" id="postRedirect"<?= Utils::$context['is_approved'] ? ' checked' : '' ?> onclick="<?= Utils::$context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . Lang::getTxt($type . '_topic_unapproved_js', file: 'General') . '\')) return false; ' ?>document.getElementById('reasonArea').classList.toggle('hidden');"> <?= Lang::getTxt('post_redirection', file: 'General') ?>
+					</label>
+					<fieldset id="reasonArea"<?= Utils::$context['is_approved'] ? '' : 'class="hidden"' ?>>
+						<dl class="settings">
+							<dt>
+								<?= Lang::getTxt($type . '_why', file: 'General') ?>
+							</dt>
+							<dd>
+								<textarea name="reason"><?= Lang::getTxt($type . 'topic_default', ['board_link' => Lang::getTxt('movetopic_auto_board', file: 'General'), 'topic_link' => Lang::getTxt('movetopic_auto_topic', file: 'General')]) ?></textarea>
+							</dd>
+							<dt>
+								<label for="redirect_topic"><?= Lang::getTxt($type . 'topic_redirect', file: 'General') ?></label>
+							</dt>
+							<dd>
+								<input type="checkbox" name="redirect_topic" id="redirect_topic" checked>
+							</dd>
+<?php if (!empty(Config::$modSettings['allow_expire_redirect'])): ?>
+							<dt>
+								<?= Lang::getTxt('redirect_topic_expires', file: 'General') ?>
+							</dt>
+							<dd>
+								<select name="redirect_expires">
+									<option value="0"><?= Lang::getTxt('never', file: 'General') ?></option>
+									<option value="1440"><?= Lang::getTxt('one_day', file: 'General') ?></option>
+									<option value="10080" selected><?= Lang::getTxt('one_week', file: 'General') ?></option>
+									<option value="20160"><?= Lang::getTxt('two_weeks', file: 'General') ?></option>
+									<option value="43200"><?= Lang::getTxt('one_month', file: 'General') ?></option>
+									<option value="86400"><?= Lang::getTxt('two_months', file: 'General') ?></option>
+								</select>
+							</dd>
+<?php else: ?>
+							<input type="hidden" name="redirect_expires" value="0">
+<?php endif; ?>
+						</dl>
+					</fieldset>
\ No newline at end of file
diff --git a/Themes/default/templates/Notify/index.php b/Themes/default/templates/Notify/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Notify/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Notify/main.php b/Themes/default/templates/Notify/main.php
new file mode 100644
index 00000000000..368c2c00251
--- /dev/null
+++ b/Themes/default/templates/Notify/main.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main notification bar.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons mail icon"></span>
+				<?= Lang::getTxt('notify', file: 'General') ?>
+			</h3>
+		</div>
+		<div class="roundframe centertext">
+			<p><?= Lang::getTxt('notify_topic_prompt', file: 'General') ?></p>
+			<p>
+				<strong><a href="<?= Config::$scripturl ?>?action=notifytopic;sa=on;topic=<?= Utils::$context['current_topic'] ?>.<?= Utils::$context['start'] ?>;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('yes', file: 'General') ?></a> - <a href="<?= Config::$scripturl ?>?action=notifytopic;sa=off;topic=<?= Utils::$context['current_topic'] ?>.<?= Utils::$context['start'] ?>;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('no', file: 'General') ?></a></strong>
+			</p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Notify/notify_announcements.php b/Themes/default/templates/Notify/notify_announcements.php
new file mode 100644
index 00000000000..252213ce62d
--- /dev/null
+++ b/Themes/default/templates/Notify/notify_announcements.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ *
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons mail icon"></span>
+				<?= Lang::getTxt('notify', file: 'General') ?>
+			</h3>
+		</div>
+		<div class="roundframe centertext">
+			<p><?= Lang::getTxt('notify_announcements_prompt', file: 'General') ?></p>
+			<p>
+				<strong><a href="<?= Config::$scripturl ?>?action=notifyannouncements;sa=on;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('yes', file: 'General') ?></a> - <a href="<?= Config::$scripturl ?>?action=notifyannouncements;sa=off;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('no', file: 'General') ?></a></strong>
+			</p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Notify/notify_board.php b/Themes/default/templates/Notify/notify_board.php
new file mode 100644
index 00000000000..916a345b0e6
--- /dev/null
+++ b/Themes/default/templates/Notify/notify_board.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Board notification bar.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons mail icon"></span>
+				<?= Lang::getTxt('notify', file: 'General') ?>
+			</h3>
+		</div>
+		<div class="roundframe centertext">
+			<p><?= Lang::getTxt('notify_board_prompt', file: 'General') ?></p>
+			<p>
+				<strong><a href="<?= Config::$scripturl ?>?action=notifyboard;sa=on;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('yes', file: 'General') ?></a> - <a href="<?= Config::$scripturl ?>?action=notifyboard;sa=off;board=<?= Utils::$context['current_board'] ?>.<?= Utils::$context['start'] ?>;<?= (!empty(Utils::$context['notify_info']['token']) ? 'u=' . Utils::$context['notify_info']['u'] . ';token=' . Utils::$context['notify_info']['token'] : Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>"><?= Lang::getTxt('no', file: 'General') ?></a></strong>
+			</p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Notify/notify_pref_changed.php b/Themes/default/templates/Notify/notify_pref_changed.php
new file mode 100644
index 00000000000..033cdb56c6b
--- /dev/null
+++ b/Themes/default/templates/Notify/notify_pref_changed.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a message indicating the user's notification preferences were successfully changed
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons mail icon"></span>
+				<?= Lang::getTxt('notify', file: 'General') ?>
+			</h3>
+		</div>
+		<div class="roundframe centertext">
+			<p><?= Utils::$context['notify_success_msg'] ?></p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/action_permissions.php b/Themes/default/templates/Packages/action_permissions.php
new file mode 100644
index 00000000000..f744d5b9550
--- /dev/null
+++ b/Themes/default/templates/Packages/action_permissions.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A progress page showing what permissions changes are being applied
+ */
+?>
+
+<?php $countDown = 3; ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=packages;sa=perms;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" name="perm_submit" id="perm_submit" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('package_file_perms_applying', file: 'Packages') ?></h3>
+			</div>
+<?php if (!empty(Utils::$context['skip_ftp'])): ?>
+			<div class="errorbox">
+				<?= Lang::getTxt('package_file_perms_skipping_ftp', file: 'Packages') ?>
+			</div>
+<?php endif; ?>
+<?php
+// How many have we done?
+$remaining_items = count(Utils::$context['method'] == 'individual' ? Utils::$context['to_process'] : Utils::$context['directory_list']);
+$progress_message = Lang::getTxt(
+	Utils::$context['method'] == 'individual' ? 'package_file_perms_items_done' : 'package_file_perms_dirs_done',
+	[
+		Utils::$context['total_items'] - $remaining_items,
+		Utils::$context['total_items'],
+	],
+	file: 'Packages',
+);
+$progress_percent = round((Utils::$context['total_items'] - $remaining_items) / Utils::$context['total_items'] * 100, 1);
+?>
+			<div class="windowbg">
+				<div>
+					<strong><?= $progress_message ?></strong><br>
+					<div class="progress_bar progress_blue">
+						<span><?= $progress_percent ?>%</span>
+						<div class="bar" style="width: <?= $progress_percent ?>%;"></div>
+					</div>
+				</div>
+<?php /* Second progress bar for a specific directory? */ ?>
+<?php if (Utils::$context['method'] != 'individual' && !empty(Utils::$context['total_files'])): ?>
+<?php
+$file_progress_message = Lang::getTxt(
+			'package_file_perms_files_done',
+			[
+				Utils::$context['file_offset'],
+				Utils::$context['total_files'],
+			],
+			file: 'Packages',
+		);
+$file_progress_percent = round(Utils::$context['file_offset'] / Utils::$context['total_files'] * 100, 1);
+?>
+				<br>
+				<div>
+					<strong><?= $file_progress_message ?></strong><br>
+					<div class="progress_bar">
+						<span><?= $file_progress_percent ?>%</span>
+						<div class="bar" style="width: <?= $file_progress_percent ?>%;"></div>
+					</div>
+				</div>
+<?php endif; ?>
+				<br>
+<?php /* Put out the right hidden data. */ ?>
+<?php if (Utils::$context['method'] == 'individual'): ?>
+				<input type="hidden" name="custom_value" value="<?= Utils::$context['custom_value'] ?>">
+				<input type="hidden" name="totalItems" value="<?= Utils::$context['total_items'] ?>">
+				<input type="hidden" name="toProcess" value="<?= Utils::$context['to_process_encode'] ?>">
+<?php else: ?>
+				<input type="hidden" name="predefined" value="<?= Utils::$context['predefined_type'] ?>">
+				<input type="hidden" name="fileOffset" value="<?= Utils::$context['file_offset'] ?>">
+				<input type="hidden" name="totalItems" value="<?= Utils::$context['total_items'] ?>">
+				<input type="hidden" name="dirList" value="<?= Utils::$context['directory_list_encode'] ?>">
+				<input type="hidden" name="specialFiles" value="<?= Utils::$context['special_files_encode'] ?>">
+<?php endif; ?>
+<?php /* Are we not using FTP for whatever reason. */ ?>
+<?php if (!empty(Utils::$context['skip_ftp'])): ?>
+				<input type="hidden" name="skip_ftp" value="1">
+<?php endif; ?>
+<?php /* Retain state. */ ?>
+<?php foreach (Utils::$context['back_look_data'] as $path): ?>
+				<input type="hidden" name="back_look[]" value="<?= $path ?>">
+<?php endforeach; ?>
+				<input type="hidden" name="method" value="<?= Utils::$context['method'] ?>">
+				<input type="hidden" name="action_changes" value="1">
+				<div class="righttext padding">
+					<input type="submit" name="go" id="cont" value="<?= Lang::getTxt('not_done_continue', file: 'Admin') ?>" class="button">
+				</div>
+			</div><!-- .windowbg -->
+		</form>
+<?php /* Just the countdown stuff */ ?>
+	<script>
+		doAutoSubmit(<?= $countDown ?>, <?= Utils::escapeJavaScript(Lang::getTxt('not_done_continue', file: 'Admin')) ?>, "perm_submit", "go");
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/browse.php b/Themes/default/templates/Packages/browse.php
new file mode 100644
index 00000000000..cbe17cf6ca9
--- /dev/null
+++ b/Themes/default/templates/Packages/browse.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * List all packages
+ */
+?>
+		<div id="update_section"></div>
+		<div id="admin_form_wrapper">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('packages_adding_title', file: 'Packages') ?>
+				</h3>
+			</div>
+			<div class="information">
+				<?= Lang::getTxt('packages_adding', file: 'Packages') ?>
+			</div>
+
+			<script>
+				window.smfForum_scripturl = smf_scripturl;
+				window.smfForum_sessionid = smf_session_id;
+				window.smfForum_sessionvar = smf_session_var;<?php /* Make a list of already installed mods so nothing is listed twice ;). */ ?>
+
+				window.smfInstalledPackages = ["<?= implode('", "', Utils::$context['installed_mods']) ?>"];
+				window.smfVersion = "<?= Utils::$context['forum_version'] ?>";
+			</script>
+			<div id="yourVersion" style="display:none"><?= Utils::$context['forum_version'] ?></div><?php if (empty(Config::$modSettings['disable_smf_js'])): ?>
+			<script src="<?= Config::$scripturl ?>?action=viewsmfile;filename=latest-news.js"></script><?php endif; ?><?php /* This sets the announcements and current versions themselves ;). */ ?>
+			<script>
+				var oAdminIndex = new smf_AdminIndex({
+					bLoadAnnouncements: false,
+					bLoadVersions: false,
+					bLoadUpdateNotification: true,
+					sUpdateNotificationContainerId: 'update_section',
+					sUpdateNotificationDefaultTitle: <?= Utils::escapeJavaScript(Lang::getTxt('update_available', file: 'Admin')) ?>,
+					sUpdateNotificationDefaultMessage: <?= Utils::escapeJavaScript(Lang::getTxt('update_message', file: 'Admin')) ?>,
+					sUpdateNotificationTemplate: <?= Utils::escapeJavaScript('
+						<h3 id="update_title">
+							%title%
+						</h3>
+						<div id="update_message" class="smalltext">
+							%message%
+						</div>
+					') ?>,
+					sUpdateNotificationLink: smf_scripturl + <?= Utils::escapeJavaScript('?action=admin;area=packages;pgdownload;auto;package=%package%;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']) ?>
+
+				});
+			</script>
+		</div><!-- #admin_form_wrapper --><?php if (Utils::$context['available_packages'] == 0): ?>
+		<div class="noticebox"><?= Lang::getTxt('no_packages', file: 'Packages') ?></div><?php else: ?><?php foreach (Utils::$context['modification_types'] as $type): ?><?php if (!empty(Utils::$context['packages_lists_' . $type]['rows'])): ?><?php $this->subTemplate('show_list', ['list_id' => 'packages_lists_' . $type]); ?><?php endif; ?><?php endforeach; ?>
+		<br><?php endif; ?><?php /* The advanced (emulation) box, collapsed by default */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=packages;sa=browse" method="get">
+			<div id="advanced_box">
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<a href="#" id="advanced_panel_link"><?= Lang::getTxt('package_advanced_button', file: 'Packages') ?></a>
+					</h3>
+					<span id="advanced_panel_toggle" class="toggle_down" style="display: none;"></span>
+				</div>
+				<div id="advanced_panel_div" class="windowbg">
+					<p>
+						<?= Lang::getTxt('package_emulate_desc', file: 'Packages') ?>
+					</p>
+					<dl class="settings">
+						<dt>
+							<strong><?= Lang::getTxt('package_emulate', file: 'Packages') ?></strong><br>
+							<span class="smalltext">
+								<a href="#" onclick="return revert();"><?= Lang::getTxt('package_emulate_revert', file: 'Packages') ?></a>
+							</span>
+						</dt>
+						<dd>
+							<a id="revert" name="revert"></a>
+							<select name="version_emulate" id="ve"><?php foreach (Utils::$context['emulation_versions'] as $version): ?>
+								<option value="<?= $version ?>"<?= ($version == Utils::$context['selected_version'] ? ' selected="selected"' : '') ?>><?= $version ?></option><?php endforeach; ?>
+							</select>
+						</dd>
+					</dl>
+					<div class="righttext padding">
+						<input type="submit" value="<?= Lang::getTxt('package_apply', file: 'Packages') ?>" class="button">
+					</div>
+				</div><!-- #advanced_panel_div -->
+			</div><!-- #advanced_box -->
+			<input type="hidden" name="action" value="admin">
+			<input type="hidden" name="area" value="packages">
+			<input type="hidden" name="sa" value="browse">
+		</form>
+	<script>
+		var oAdvancedPanelToggle = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: true,
+			aSwappableContainers: [
+				'advanced_panel_div'
+			],
+			aSwapImages: [
+				{
+					sId: 'advanced_panel_toggle',
+					altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+					altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+				}
+			],
+			aSwapLinks: [
+				{
+					sId: 'advanced_panel_link',
+					msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('package_advanced_button', file: 'Packages')) ?>,
+					msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('package_advanced_button', file: 'Packages')) ?>
+
+				}
+			]
+		});
+		function revert()
+		{
+			var default_version = "<?= Utils::$context['default_version'] ?>";
+			$("#ve").find("option").filter(function(index) {
+				return default_version === $(this).text();
+			}).attr("selected", "selected");
+			return false;
+		}
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/control_chmod.php b/Themes/default/templates/Packages/control_chmod.php
new file mode 100644
index 00000000000..31c4d47c8e5
--- /dev/null
+++ b/Themes/default/templates/Packages/control_chmod.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Sapi;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * CHMOD control form
+ *
+ * @return bool False if nothing to do.
+ */
+?><?php /* Nothing to do? Brilliant! */ ?><?php if (empty(Utils::$context['package_ftp'])): ?><?php return false; ?><?php endif; ?><?php if (empty(Utils::$context['package_ftp']['form_elements_only'])): ?>
+				<?= Lang::getTxt('package_ftp_why', ['onclick' => 'document.getElementById(\'need_writable_list\').style.display = \'\'; return false;'], file: 'Packages') ?><br>
+				<div id="need_writable_list" class="smalltext">
+					<?= Lang::getTxt('package_ftp_why_file_list', file: 'Packages') ?>
+					<ul style="display: inline;"><?php if (!empty(Utils::$context['notwritable_files'])): ?><?php foreach (Utils::$context['notwritable_files'] as $file): ?>
+						<li><?= $file ?></li><?php endforeach; ?><?php endif; ?>
+					</ul><?php if (!Sapi::isOS(Sapi::OS_WINDOWS)): ?>
+					<hr>
+					<?= Lang::getTxt('package_chmod_linux', file: 'Packages') ?><br>
+					<samp># chmod a+w <?= implode(' ', Utils::$context['notwritable_files']) ?></samp><?php endif; ?>
+				</div><!-- #need_writable_list --><?php endif; ?>
+				<div class="bordercolor" id="ftp_error_div" style="<?= (!empty(Utils::$context['package_ftp']['error']) ? '' : 'display:none;') ?>padding: 1px; margin: 1ex;">
+					<div class="windowbg" id="ftp_error_innerdiv" style="padding: 1ex;">
+						<samp id="ftp_error_message"><?= !empty(Utils::$context['package_ftp']['error']) ? Utils::$context['package_ftp']['error'] : '' ?></samp>
+					</div>
+				</div><?php if (!empty(Utils::$context['package_ftp']['destination'])): ?>
+				<form action="<?= Utils::$context['package_ftp']['destination'] ?>" method="post" accept-charset="UTF-8"><?php endif; ?>
+					<fieldset>
+					<dl class="settings">
+						<dt>
+							<label for="ftp_server"><?= Lang::getTxt('package_ftp_server', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="30" name="ftp_server" id="ftp_server" value="<?= Utils::$context['package_ftp']['server'] ?>">
+							<label for="ftp_port"><?= Lang::getTxt('package_ftp_port', file: 'Packages') ?></label>
+							<input type="text" size="3" name="ftp_port" id="ftp_port" value="<?= Utils::$context['package_ftp']['port'] ?>">
+						</dd>
+						<dt>
+							<label for="ftp_username"><?= Lang::getTxt('package_ftp_username', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="50" name="ftp_username" id="ftp_username" value="<?= Utils::$context['package_ftp']['username'] ?>">
+						</dd>
+						<dt>
+							<label for="ftp_password"><?= Lang::getTxt('package_ftp_password', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="password" size="50" name="ftp_password" id="ftp_password">
+						</dd>
+						<dt>
+							<label for="ftp_path"><?= Lang::getTxt('package_ftp_path', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="50" name="ftp_path" id="ftp_path" value="<?= Utils::$context['package_ftp']['path'] ?>">
+						</dd>
+					</dl>
+					</fieldset><?php if (empty(Utils::$context['package_ftp']['form_elements_only'])): ?>
+					<div class="righttext" style="margin: 1ex;">
+						<span id="test_ftp_placeholder_full"></span>
+						<input type="submit" value="<?= Lang::getTxt('package_proceed', file: 'Packages') ?>" class="button">
+					</div><?php endif; ?><?php if (!empty(Utils::$context['package_ftp']['destination'])): ?>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				</form><?php endif; ?><?php /* Hide the details of the list. */ ?><?php if (empty(Utils::$context['package_ftp']['form_elements_only'])): ?>
+				<script>
+					document.getElementById('need_writable_list').style.display = 'none';
+				</script><?php endif; ?><?php /* Quick generate the test button. */ ?>
+				<script>
+					// Generate a "test ftp" button.
+					var generatedButton = false;
+					function generateFTPTest()
+					{
+						// Don't ever call this twice!
+						if (generatedButton)
+							return false;
+						generatedButton = true;
+
+						// No XML?
+						if (!window.XMLHttpRequest || (!document.getElementById("test_ftp_placeholder") && !document.getElementById("test_ftp_placeholder_full")))
+							return false;
+
+						var ftpTest = document.createElement("input");
+						ftpTest.type = "button";
+						ftpTest.onclick = testFTP;
+
+						if (document.getElementById("test_ftp_placeholder"))
+						{
+							ftpTest.value = "<?= Lang::getTxt('package_ftp_test', file: 'Packages') ?>";
+							document.getElementById("test_ftp_placeholder").appendChild(ftpTest);
+						}
+						else
+						{
+							ftpTest.value = "<?= Lang::getTxt('package_ftp_test_connection', file: 'Packages') ?>";
+							document.getElementById("test_ftp_placeholder_full").appendChild(ftpTest);
+						}
+					}
+					function testFTPResults(oXMLDoc)
+					{
+						ajax_indicator(false);
+
+						// This assumes it went wrong!
+						var wasSuccess = false;
+						var message = "<?= addcslashes(Lang::getTxt('package_ftp_test_failed', file: 'Packages'), "'") ?>";
+
+						var results = oXMLDoc.getElementsByTagName('results')[0].getElementsByTagName('result');
+						if (results.length > 0)
+						{
+							if (results[0].getAttribute('success') == 1)
+								wasSuccess = true;
+							message = results[0].firstChild.nodeValue;
+						}
+
+						document.getElementById("ftp_error_div").style.display = "";
+						document.getElementById("ftp_error_div").style.backgroundColor = wasSuccess ? "green" : "red";
+						document.getElementById("ftp_error_innerdiv").style.backgroundColor = wasSuccess ? "#DBFDC7" : "#FDBDBD";
+
+						setInnerHTML(document.getElementById("ftp_error_message"), message);
+					}
+					generateFTPTest();
+				</script><?php
+// Make sure the button gets generated last.
+Utils::$context['insert_after_template'] .= '
+				<script>
+					generateFTPTest();
+				</script>';
+?>
diff --git a/Themes/default/templates/Packages/downloaded.php b/Themes/default/templates/Packages/downloaded.php
new file mode 100644
index 00000000000..e97ec394fea
--- /dev/null
+++ b/Themes/default/templates/Packages/downloaded.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Confirmation page showing a package was uploaded/downloaded successfully.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="windowbg">
+			<p>
+				<?= Lang::getTxt(empty(Utils::$context['package_server']) ? 'package_uploaded_successfully' : 'package_downloaded_successfully', file: 'Packages') ?>
+			</p>
+			<ul>
+				<li>
+					<span class="floatleft"><strong><?= Utils::$context['package']['name'] ?></strong></span>
+					<span class="package_server floatright"><?= Utils::$context['package']['list_files']['link'] ?></span>
+					<span class="package_server floatright"><?= Utils::$context['package']['install']['link'] ?></span>
+				</li>
+			</ul>
+			<br><br>
+			<p><a href="<?= Config::$scripturl ?>?action=admin;area=packages;get<?= (isset(Utils::$context['package_server']) ? ';sa=browse;server=' . Utils::$context['package_server'] : '') ?>" class="button floatnone"><?= Lang::getTxt('back', file: 'General') ?></a></p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/examine.php b/Themes/default/templates/Packages/examine.php
new file mode 100644
index 00000000000..cccbf22a5c8
--- /dev/null
+++ b/Themes/default/templates/Packages/examine.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Examine a single file within a package
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_examine_file', file: 'Packages') ?></h3>
+		</div>
+		<div class="title_bar">
+			<h4 class="titlebg"><?= Lang::getTxt('package_file_contents', Utils::$context, file: 'Packages') ?></h4>
+		</div>
+		<div class="windowbg">
+			<pre class="file_content"><?= Utils::$context['filedata'] ?></pre>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=list;package=<?= Utils::$context['package'] ?>" class="button floatnone"><?= Lang::getTxt('list_files', file: 'Packages') ?></a>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/extract_package.php b/Themes/default/templates/Packages/extract_package.php
new file mode 100644
index 00000000000..cdaa0c32fe1
--- /dev/null
+++ b/Themes/default/templates/Packages/extract_package.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Extract package contents
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?php if (empty(Utils::$context['redirect_url'])): ?><?= Lang::getTxt(Utils::$context['uninstalling'] ? 'uninstall' : 'extracting', file: 'Packages') ?><?php else: ?><?= Lang::getTxt('package_installed_redirecting', file: 'Packages') ?><?php endif; ?></h3>
+		</div>
+		<div class="windowbg"><?php /* If we are going to redirect we have a slightly different agenda. */ ?><?php if (!empty(Utils::$context['redirect_url'])): ?>
+			<?= Utils::$context['redirect_text'] ?><br><br>
+			<a href="<?= Utils::$context['redirect_url'] ?>"><?= Lang::getTxt('package_installed_redirect_go_now', file: 'Packages') ?></a><span id="countdown" class="hidden"> (5) </span> | <a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=browse"><?= Lang::getTxt('package_installed_redirect_cancel', file: 'Packages') ?></a>
+			<script>
+				var countdown = <?= Utils::$context['redirect_timeout'] ?>;
+				var el = document.getElementById('countdown');
+				var loop = setInterval(doCountdown, 1000);
+
+				function doCountdown()
+				{
+					countdown--;
+					el.textContent = " (" + countdown + ") ";
+
+					if (countdown == 0)
+					{
+						clearInterval(loop);
+						window.location = "<?= Utils::$context['redirect_url'] ?>";
+					}
+				}
+				el.classList.remove('hidden');
+				el.value = " (" + countdown + ") ";
+			</script><?php elseif (Utils::$context['uninstalling']): ?>
+			<?= Lang::getTxt('package_uninstall_done', file: 'Packages') ?> <br>
+			<a href="<?= Utils::$context['keep_url'] ?>" class="button"><?= Lang::getTxt('package_keep', file: 'Packages') ?></a><a href="<?= Utils::$context['remove_url'] ?>" class="button"><?= Lang::getTxt('package_delete2', file: 'Packages') ?></a><?php elseif (Utils::$context['install_finished']): ?><?php if (Utils::$context['extract_type'] == 'avatar'): ?>
+			<?= Lang::getTxt('avatars_extracted', file: 'Packages') ?><?php elseif (Utils::$context['extract_type'] == 'language'): ?>
+			<?= Lang::getTxt('language_extracted', file: 'Packages') ?><?php else: ?>
+			<?= Lang::getTxt('package_installed_done', file: 'Packages') ?><?php endif; ?><?php else: ?>
+			<?= Lang::getTxt('corrupt_compatible', file: 'Packages') ?><?php endif; ?>
+		</div><!-- .windowbg --><?php /* Show the "restore permissions" screen? */ ?><?php if ($this->hasSubTemplate('show_list') && !empty(Utils::$context['restore_file_permissions']['rows'])): ?><br><?php $this->subTemplate('show_list', ['list_id' => 'restore_file_permissions']); ?><?php endif; ?>
diff --git a/Themes/default/templates/Packages/file_permissions.php b/Themes/default/templates/Packages/file_permissions.php
new file mode 100644
index 00000000000..619a3fb2fe3
--- /dev/null
+++ b/Themes/default/templates/Packages/file_permissions.php
@@ -0,0 +1,319 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The file permissions page.
+ */
+?><?php /* This will handle expanding the selection. */ ?>
+	<script>
+		var oRadioValues = {
+			0: "read",
+			1: "writable",
+			2: "execute",
+			3: "custom",
+			4: "no_change"
+		}
+		function dynamicAddMore()
+		{
+			ajax_indicator(true);
+
+			getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=admin;area=packages;fileoffset=' + (parseInt(this.offset) + <?= Utils::$context['file_limit'] ?>) + ';onlyfind=' + escape(this.path) + ';sa=perms;xml;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>', onNewFolderReceived);
+		}
+
+		// Getting something back?
+		function onNewFolderReceived(oXMLDoc)
+		{
+			ajax_indicator(false);
+
+			var fileItems = oXMLDoc.getElementsByTagName('folders')[0].getElementsByTagName('folder');
+
+			// No folders, no longer worth going further.
+			if (fileItems.length < 1)
+			{
+				if (oXMLDoc.getElementsByTagName('roots')[0].getElementsByTagName('root')[0])
+				{
+					var rootName = oXMLDoc.getElementsByTagName('roots')[0].getElementsByTagName('root')[0].firstChild.nodeValue;
+					var itemLink = document.getElementById('link_' + rootName);
+
+					// Move the children up.
+					for (i = 0; i <= itemLink.childNodes.length; i++)
+						itemLink.parentNode.insertBefore(itemLink.childNodes[0], itemLink);
+
+					// And remove the link.
+					itemLink.parentNode.removeChild(itemLink);
+				}
+				return false;
+			}
+			var tableHandle = false;
+			var isMore = false;
+			var ident = "";
+			var my_ident = "";
+			var curLevel = 0;
+
+			for (var i = 0; i < fileItems.length; i++)
+			{
+				if (fileItems[i].getAttribute('more') == 1)
+				{
+					isMore = true;
+					var curOffset = fileItems[i].getAttribute('offset');
+				}
+
+				if (fileItems[i].getAttribute('more') != 1 && document.getElementById("insert_div_loc_" + fileItems[i].getAttribute('ident')))
+				{
+					ident = fileItems[i].getAttribute('ident');
+					my_ident = fileItems[i].getAttribute('my_ident');
+					curLevel = fileItems[i].getAttribute('level') * 5;
+					curPath = fileItems[i].getAttribute('path');
+
+					// Get where we're putting it next to.
+					tableHandle = document.getElementById("insert_div_loc_" + fileItems[i].getAttribute('ident'));
+
+					var curRow = document.createElement("tr");
+					curRow.className = "windowbg";
+					curRow.id = "content_" + my_ident;
+					curRow.style.display = "";
+					var curCol = document.createElement("td");
+					curCol.className = "smalltext";
+					curCol.width = "40%";
+
+					// This is the name.
+					var fileName = document.createTextNode(fileItems[i].firstChild.nodeValue);
+
+					// Start by wacking in the spaces.
+					setInnerHTML(curCol, repeatString("&nbsp;", curLevel));
+
+					// Create the actual text.
+					if (fileItems[i].getAttribute('folder') == 1)
+					{
+						var linkData = document.createElement("a");
+						linkData.name = "fol_" + my_ident;
+						linkData.id = "link_" + my_ident;
+						linkData.href = '#';
+						linkData.path = curPath + "/" + fileItems[i].firstChild.nodeValue;
+						linkData.ident = my_ident;
+						linkData.onclick = dynamicExpandFolder;
+
+						var folderImage = document.createElement("span");
+						folderImage.className = "main_icons folder";
+						linkData.appendChild(folderImage);
+
+						linkData.appendChild(fileName);
+						curCol.appendChild(linkData);
+					}
+					else
+						curCol.appendChild(fileName);
+
+					curRow.appendChild(curCol);
+
+					// Right, the permissions.
+					curCol = document.createElement("td");
+					curCol.className = "smalltext";
+
+					var writeSpan = document.createElement("span");
+					writeSpan.className = fileItems[i].getAttribute('writable') ? "green" : "red";
+					setInnerHTML(writeSpan, fileItems[i].getAttribute('writable') ? '<?= Lang::getTxt('package_file_perms_writable', file: 'Packages') ?>' : '<?= Lang::getTxt('package_file_perms_not_writable', file: 'Packages') ?>');
+					curCol.appendChild(writeSpan);
+
+					if (fileItems[i].getAttribute('permissions'))
+					{
+						var permData = document.createTextNode("\u00a0(<?= Lang::getTxt('package_file_perms_chmod', file: 'Packages') ?>: " + fileItems[i].getAttribute('permissions') + ")");
+						curCol.appendChild(permData);
+					}
+
+					curRow.appendChild(curCol);
+
+					// Now add the five radio buttons.
+					for (j = 0; j < 5; j++)
+					{
+						curCol = document.createElement("td");
+						curCol.className = "centertext perm_" + oRadioValues[j];
+						curCol.align = "center";
+
+						var curInput = createNamedElement("input", "permStatus[" + curPath + "/" + fileItems[i].firstChild.nodeValue + "]", j == 4 ? "checked" : "");
+						curInput.type = "radio";
+						curInput.checked = "checked";
+						curInput.value = oRadioValues[j];
+
+						curCol.appendChild(curInput);
+						curRow.appendChild(curCol);
+					}
+
+					// Put the row in.
+					tableHandle.parentNode.insertBefore(curRow, tableHandle);
+
+					// Put in a new dummy section?
+					if (fileItems[i].getAttribute('folder') == 1)
+					{
+						var newRow = document.createElement("tr");
+						newRow.id = "insert_div_loc_" + my_ident;
+						newRow.style.display = "none";
+						tableHandle.parentNode.insertBefore(newRow, tableHandle);
+						var newCol = document.createElement("td");
+						newCol.colspan = 2;
+						newRow.appendChild(newCol);
+					}
+				}
+			}
+
+			// Is there some more to remove?
+			if (document.getElementById("content_" + ident + "_more"))
+			{
+				document.getElementById("content_" + ident + "_more").parentNode.removeChild(document.getElementById("content_" + ident + "_more"));
+			}
+
+			// Add more?
+			if (isMore && tableHandle)
+			{
+				// Create the actual link.
+				var linkData = document.createElement("a");
+				linkData.href = '#fol_' + my_ident;
+				linkData.path = curPath;
+				linkData.offset = curOffset;
+				linkData.onclick = dynamicAddMore;
+
+				linkData.appendChild(document.createTextNode('<?= Lang::getTxt('package_file_perms_more_files', file: 'Packages') ?>'));
+
+				curRow = document.createElement("tr");
+				curRow.className = "windowbg";
+				curRow.id = "content_" + ident + "_more";
+				tableHandle.parentNode.insertBefore(curRow, tableHandle);
+				curCol = document.createElement("td");
+				curCol.className = "smalltext";
+				curCol.width = "40%";
+
+				setInnerHTML(curCol, repeatString("&nbsp;", curLevel));
+				curCol.appendChild(document.createTextNode('\u00ab '));
+				curCol.appendChild(linkData);
+				curCol.appendChild(document.createTextNode(' \u00bb'));
+
+				curRow.appendChild(curCol);
+				curCol = document.createElement("td");
+				curCol.className = "smalltext";
+				curRow.appendChild(curCol);
+			}
+
+			// Keep track of it.
+			var curInput = createNamedElement("input", "back_look[]");
+			curInput.type = "hidden";
+			curInput.value = curPath;
+
+			curCol.appendChild(curInput);
+		}
+	</script>
+	<div class="noticebox">
+		<div>
+			<strong><?= Lang::getTxt('package_file_perms_warning', file: 'Packages') ?></strong>
+			<div class="smalltext">
+				<ol style="margin-top: 2px; margin-bottom: 2px">
+					<?= Lang::getTxt('package_file_perms_warning_desc', file: 'Packages') ?>
+				</ol>
+			</div>
+		</div>
+	</div>
+
+	<form action="<?= Config::$scripturl ?>?action=admin;area=packages;sa=perms;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="floatleft"><?= Lang::getTxt('package_file_perms', file: 'Admin') ?></span><span class="perms_status floatright"><?= Lang::getTxt('package_file_perms_new_status', file: 'Packages') ?></span>
+			</h3>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext" width="30%"><?= Lang::getTxt('package_file_perms_name', file: 'Packages') ?></th>
+					<th width="30%" class="lefttext"><?= Lang::getTxt('package_file_perms_status', file: 'Packages') ?></th>
+					<th width="8%"><span class="file_permissions"><?= Lang::getTxt('package_file_perms_status_read', file: 'Packages') ?></span></th>
+					<th width="8%"><span class="file_permissions"><?= Lang::getTxt('package_file_perms_status_write', file: 'Packages') ?></span></th>
+					<th width="8%"><span class="file_permissions"><?= Lang::getTxt('package_file_perms_status_execute', file: 'Packages') ?></span></th>
+					<th width="8%"><span class="file_permissions"><?= Lang::getTxt('package_file_perms_status_custom', file: 'Packages') ?></span></th>
+					<th width="8%"><span class="file_permissions"><?= Lang::getTxt('package_file_perms_status_no_change', file: 'Packages') ?></span></th>
+				</tr>
+			</thead>
+			<tbody><?php foreach (Utils::$context['file_tree'] as $name => $dir): ?>
+				<tr class="windowbg">
+					<td width="30%">
+						<strong><?php if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')): ?>
+							<span class="main_icons folder"></span><?php endif; ?>
+							<?= $name ?>
+						</strong>
+					</td>
+					<td width="30%">
+						<span style="color: <?= ($dir['perms']['chmod'] ? 'green' : 'red') ?>"><?= Lang::getTxt($dir['perms']['chmod'] ? 'package_file_perms_writable' : 'package_file_perms_not_writable', file: 'Packages') ?></span>
+						<?= ($dir['perms']['perms'] ? ' (' . Lang::getTxt('package_file_perms_chmod', file: 'Packages') . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : '') ?>
+					</td>
+					<td class="centertext perm_read">
+						<input type="radio" name="permStatus[<?= $name ?>]" value="read" class="centertext">
+					</td>
+					<td class="centertext perm_writable">
+						<input type="radio" name="permStatus[<?= $name ?>]" value="writable" class="centertext">
+					</td>
+					<td class="centertext perm_execute">
+						<input type="radio" name="permStatus[<?= $name ?>]" value="execute" class="centertext">
+					</td>
+					<td class="centertext perm_custom">
+						<input type="radio" name="permStatus[<?= $name ?>]" value="custom" class="centertext">
+					</td>
+					<td class="centertext perm_no_change">
+						<input type="radio" name="permStatus[<?= $name ?>]" value="no_change" checked class="centertext">
+					</td>
+				</tr><?php if (!empty($dir['contents'])): ?><?php $this->subTemplate('permission_show_contents', ['ident' => $name, 'contents' => $dir['contents'], 'level' => 1]); ?><?php endif; ?><?php endforeach; ?>
+			</tbody>
+		</table>
+		<br>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_file_perms_change', file: 'Packages') ?></h3>
+		</div>
+		<div class="windowbg">
+			<fieldset>
+				<dl>
+					<dt>
+						<input type="radio" name="method" value="individual" checked id="method_individual">
+						<label for="method_individual"><strong><?= Lang::getTxt('package_file_perms_apply', file: 'Packages') ?></strong></label>
+					</dt>
+					<dd>
+						<em class="smalltext"><?= Lang::getTxt('package_file_perms_custom', file: 'Packages') ?> <input type="text" name="custom_value" value="0755" maxlength="4" size="5"> <a href="<?= Config::$scripturl ?>?action=helpadmin;help=chmod_flags" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></em>
+					</dd>
+					<dt>
+						<input type="radio" name="method" value="predefined" id="method_predefined">
+						<label for="method_predefined"><strong><?= Lang::getTxt('package_file_perms_predefined', file: 'Packages') ?></strong></label>
+						<select name="predefined" onchange="document.getElementById('method_predefined').checked = 'checked';">
+							<option value="restricted" selected><?= Lang::getTxt('package_file_perms_pre_restricted', file: 'Packages') ?></option>
+							<option value="standard"><?= Lang::getTxt('package_file_perms_pre_standard', file: 'Packages') ?></option>
+							<option value="free"><?= Lang::getTxt('package_file_perms_pre_free', file: 'Packages') ?></option>
+						</select>
+					</dt>
+					<dd>
+						<em class="smalltext"><?= Lang::getTxt('package_file_perms_predefined_note', file: 'Packages') ?></em>
+					</dd>
+				</dl>
+			</fieldset><?php /* Likely to need FTP? */ ?><?php if (empty(Utils::$context['ftp_connected'])): ?>
+			<p>
+				<?= Lang::getTxt('package_file_perms_ftp_details', file: 'Packages') ?>
+			</p>
+			<?php $this->subTemplate('control_chmod'); ?>
+			<div class="noticebox"><?= Lang::getTxt('package_file_perms_ftp_retain', file: 'Packages') ?></div><?php endif; ?>
+			<span id="test_ftp_placeholder_full"></span>
+			<input type="hidden" name="action_changes" value="1">
+			<input type="submit" value="<?= Lang::getTxt('package_file_perms_go', file: 'Packages') ?>" name="go" class="button">
+		</div><!-- .windowbg --><?php /* Any looks fors we've already done? */ ?><?php foreach (Utils::$context['look_for'] as $path): ?>
+		<input type="hidden" name="back_look[]" value="<?= $path ?>"><?php endforeach; ?>
+	</form>
+	<br>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/ftp_required.php b/Themes/default/templates/Packages/ftp_required.php
new file mode 100644
index 00000000000..9b7b80e7b12
--- /dev/null
+++ b/Themes/default/templates/Packages/ftp_required.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Wrapper for the above template function showing that FTP is required
+ */
+?>
+		<fieldset>
+			<legend>
+				<?= Lang::getTxt('package_ftp_necessary', file: 'Packages') ?>
+			</legend>
+			<div class="ftp_details">
+				<?php $this->subTemplate('control_chmod'); ?>
+			</div>
+		</fieldset>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/index.php b/Themes/default/templates/Packages/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Packages/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Packages/install_options.php b/Themes/default/templates/Packages/install_options.php
new file mode 100644
index 00000000000..9a465f39910
--- /dev/null
+++ b/Themes/default/templates/Packages/install_options.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Installation options - FTP info and backup settings
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+	<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_install_options', file: 'Packages') ?></h3>
+		</div>
+		<div class="information noup">
+			<?= Lang::getTxt('package_install_options_ftp_why', file: 'Packages') ?>
+		</div>
+		<div class="windowbg noup">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=packages;sa=options" method="post" accept-charset="UTF-8">
+				<dl class="settings">
+					<dt>
+						<label for="pack_server"><strong><?= Lang::getTxt('package_install_options_ftp_server', file: 'Packages') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="pack_server" id="pack_server" value="<?= Utils::$context['package_ftp_server'] ?>" size="30">
+					</dd>
+					<dt>
+						<label for="pack_port"><strong><?= Lang::getTxt('package_install_options_ftp_port', file: 'Packages') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="pack_port" id="pack_port" size="3" value="<?= Utils::$context['package_ftp_port'] ?>">
+					</dd>
+					<dt>
+						<label for="pack_user"><strong><?= Lang::getTxt('package_install_options_ftp_user', file: 'Packages') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="pack_user" id="pack_user" value="<?= Utils::$context['package_ftp_username'] ?>" size="30">
+					</dd>
+					<dt>
+						<label for="package_make_backups"><?= Lang::getTxt('package_install_options_make_backups', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<input type="checkbox" name="package_make_backups" id="package_make_backups" value="1"<?= Utils::$context['package_make_backups'] ? ' checked' : '' ?>>
+					</dd>
+					<dt>
+						<label for="package_make_full_backups"><?= Lang::getTxt('package_install_options_make_full_backups', file: 'Packages') ?></label>
+					</dt>
+					<dd>
+						<input type="checkbox" name="package_make_full_backups" id="package_make_full_backups" value="1"<?= Utils::$context['package_make_full_backups'] ? ' checked' : '' ?>>
+					</dd>
+				</dl>
+
+				<input type="submit" name="save" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+		</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/list.php b/Themes/default/templates/Packages/list.php
new file mode 100644
index 00000000000..056ee870ed9
--- /dev/null
+++ b/Themes/default/templates/Packages/list.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * List files in a package
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('list_file', file: 'Packages') ?></h3>
+		</div>
+		<div class="title_bar">
+			<h4 class="titlebg"><?= Lang::getTxt('files_package', Utils::$context, file: 'Packages') ?></h4>
+		</div>
+		<div class="windowbg">
+			<ol>
+<?php foreach (Utils::$context['files'] as $fileinfo): ?>
+				<li><a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=examine;package=<?= Utils::$context['filename'] ?>;file=<?= $fileinfo['filename'] ?>" title="<?= Lang::getTxt('view', file: 'General') ?>"><?= $fileinfo['filename'] ?></a> <?= Lang::getTxt('package_bytes', $fileinfo, file: 'Packages') ?></li>
+<?php endforeach; ?>
+			</ol>
+			<br>
+			<a href="<?= Config::$scripturl ?>?action=admin;area=packages" class="button floatnone"><?= Lang::getTxt('back', file: 'General') ?></a>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/main.php b/Themes/default/templates/Packages/main.php
new file mode 100644
index 00000000000..f510f7a0b3c
--- /dev/null
+++ b/Themes/default/templates/Packages/main.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main template
+ */
diff --git a/Themes/default/templates/Packages/package_confirm.php b/Themes/default/templates/Packages/package_confirm.php
new file mode 100644
index 00000000000..0f01eba88dc
--- /dev/null
+++ b/Themes/default/templates/Packages/package_confirm.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Confirm package operation
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Utils::$context['confirm_message'] ?></p>
+			<a href="<?= Utils::$context['proceed_href'] ?>" class="button floatnone"><?= Lang::getTxt('package_confirm_proceed', file: 'Packages') ?></a> <a href="JavaScript:history.go(-1);" class="button floatnone"><?= Lang::getTxt('package_confirm_go_back', file: 'Packages') ?></a>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/package_list.php b/Themes/default/templates/Packages/package_list.php
new file mode 100644
index 00000000000..9bae5d75c29
--- /dev/null
+++ b/Themes/default/templates/Packages/package_list.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * List packages.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="windowbg"><?php /* No packages, as yet. */ ?><?php if (empty(Utils::$context['package_list'])): ?>
+			<ul>
+				<li><?= Lang::getTxt('no_packages', file: 'Packages') ?></li>
+			</ul><?php /* List out the packages... */ ?><?php else: ?>
+			<ul id="package_list"><?php foreach (Utils::$context['package_list'] as $i => $packageSection): ?>
+				<li>
+					<strong><span id="ps_img_<?= $i ?>" class="toggle_up" alt="*" style="display: none;"></span> <?= $packageSection['title'] ?></strong><?php if (!empty($packageSection['text'])): ?>
+					<div class="sub_bar">
+						<h3 class="subbg"><?= $packageSection['text'] ?></h3>
+					</div><?php endif; ?>
+					<<?= Utils::$context['list_type'] ?> id="package_section_<?= $i ?>" class="packages"><?php foreach ($packageSection['items'] as $id => $package): ?>
+						<li><?php /* Textual message. Could be empty just for a blank line... */ ?><?php if ($package['is_text']): ?>
+							<?= empty($package['name']) ? '&nbsp;' : $package['name'] ?><?php /* This is supposed to be a rule.. */ ?><?php elseif ($package['is_line']): ?>
+							<hr><?php /* A remote link. */ ?><?php elseif ($package['is_remote']): ?>
+							<strong><?= $package['link'] ?></strong><?php /* A title? */ ?><?php elseif ($package['is_heading'] || $package['is_title']): ?>
+							<strong><?= $package['name'] ?></strong><?php /* Otherwise, it's a package. */ ?><?php else: ?><?php /* 1. Some mod [ Download ]. */ ?>
+						<strong><span id="ps_img_<?= $i ?>_pkg_<?= $id ?>" class="toggle_up" alt="*" style="display: none;"></span> <?= $package['can_install'] || !empty($package['can_emulate_install']) ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '" class="button floatnone">' . Lang::getTxt('download', file: 'Packages') . '</a>' : $package['name'] ?></strong>
+						<ul id="package_section_<?= $i ?>_pkg_<?= $id ?>" class="package_section"><?php /* Show the mod type? */ ?><?php if ($package['type'] != ''): ?>
+							<li class="package_section">
+								<?= Lang::getTxt('package_type', ['type' => Utils::ucwords(Utils::strtolower($package['type']))], file: 'Packages') ?>
+							</li><?php endif; ?><?php /* Show the version number? */ ?><?php if ($package['version'] != ''): ?>
+							<li class="package_section">
+								<?= Lang::getTxt('package_version', $package, file: 'Packages') ?>
+							</li><?php endif; ?><?php /* How 'bout the author? */ ?><?php if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link'])): ?>
+							<li class="package_section">
+								<?= Lang::getTxt('package_author', ['author' => $package['author']['link']], file: 'Packages') ?>
+							</li><?php endif; ?><?php /* The homepage... */ ?><?php if ($package['author']['website']['link'] != ''): ?>
+							<li class="package_section">
+								<?= Lang::getTxt('author_website', $package['author']['website'], file: 'Packages') ?>
+							</li><?php endif; ?><?php
+// Description: bleh bleh!
+// Location of file: http://someplace/.
+?>
+							<li class="package_section">
+								<?= Lang::getTxt('file_location', ['link' => '<a href="' . $package['href'] . '">' . $package['href'] . '</a>'], file: 'Packages') ?>
+							</li>
+							<li class="package_section">
+								<?= Lang::getTxt('package_description', $package, file: 'Packages') ?>
+							</li>
+						</ul><?php endif; ?>
+					</li><?php endforeach; ?>
+				</<?= Utils::$context['list_type'] ?>>
+				</li><?php endforeach; ?>
+			</ul><?php endif; ?>
+		</div><!-- .windowbg --><?php /* Now go through and turn off all the sections. */ ?><?php if (!empty(Utils::$context['package_list'])): ?><?php $section_count = count(Utils::$context['package_list']); ?>
+	<script><?php foreach (Utils::$context['package_list'] as $section => $ps): ?>
+
+		var oPackageServerToggle_<?= $section ?> = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: <?= count($ps['items']) == 1 || $section_count == 1 ? 'false' : 'true' ?>,
+			aSwappableContainers: [
+				'package_section_<?= $section ?>'
+			],
+			aSwapImages: [
+				{
+					sId: 'ps_img_<?= $section ?>',
+					altExpanded: '*',
+					altCollapsed: '*'
+				}
+			]
+		});<?php foreach ($ps['items'] as $id => $package): ?><?php if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote']): ?>
+
+		var oPackageToggle_<?= $section ?>_pkg_<?= $id ?> = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: true,
+			aSwappableContainers: [
+				'package_section_<?= $section ?>_pkg_<?= $id ?>'
+			],
+			aSwapImages: [
+				{
+					sId: 'ps_img_<?= $section ?>_pkg_<?= $id ?>',
+					altExpanded: '*',
+					altCollapsed: '*'
+				}
+			]
+		});<?php endif; ?><?php endforeach; ?><?php endforeach; ?>
+
+	</script><?php endif; ?>
diff --git a/Themes/default/templates/Packages/permission_show_contents.php b/Themes/default/templates/Packages/permission_show_contents.php
new file mode 100644
index 00000000000..959c4b27384
--- /dev/null
+++ b/Themes/default/templates/Packages/permission_show_contents.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Shows permissions for items within a directory (called from template_file_permissions)
+ *
+ * @param string $ident A unique ID - typically the directory name
+ * @param array $contents An array of items within the directory
+ * @param int $level How far to go inside the directory
+ * @param bool $has_more Whether there are more files to display besides what's in $contents
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['has_more' => false], EXTR_SKIP);
+?><?php
+$js_ident = preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident);
+// Have we actually done something?
+$drawn_div = false;
+?><?php foreach ($contents as $name => $dir): ?><?php if (isset($dir['perms'])): ?><?php if (!$drawn_div): ?><?php $drawn_div = true; ?>
+			</tbody>
+			<tbody class="table_grid" id="<?= $js_ident ?>"><?php endif; ?><?php $cur_ident = preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident . '/' . $name); ?>
+				<tr class="windowbg" id="content_<?= $cur_ident ?>">
+					<td class="smalltext" width="30%"><?= str_repeat('&nbsp;', $level * 5) ?>
+					<?= (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '<a id="link_' . $cur_ident . '" href="' . Config::$scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident . '/' . $name) . ';back_look=' . Utils::$context['back_look_data'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '#fol_' . $cur_ident . '" onclick="return expandFolder(\'' . $cur_ident . '\', \'' . addcslashes($ident . '/' . $name, "'\\") . '\');">' : '' ?><?php if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')): ?>
+						<span class="main_icons folder"></span><?php endif; ?>
+						<?= $name ?>
+						<?= (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '</a>' : '' ?>
+					</td>
+					<td class="smalltext">
+						<span class="<?= ($dir['perms']['chmod'] ? 'success' : 'error') ?>"><?= Lang::getTxt($dir['perms']['chmod'] ? 'package_file_perms_writable' : 'package_file_perms_not_writable', file: 'Packages') ?></span>
+						<?= ($dir['perms']['perms'] ? ' (' . Lang::getTxt('package_file_perms_chmod', file: 'Packages') . ': ' . substr(sprintf('%o', $dir['perms']['perms']), -4) . ')' : '') ?>
+					</td>
+					<td class="centertext perm_read"><input type="radio" name="permStatus[<?= $ident ?>/<?= $name ?>]" value="read"></td>
+					<td class="centertext perm_writable"><input type="radio" name="permStatus[<?= $ident ?>/<?= $name ?>]" value="writable"></td>
+					<td class="centertext perm_execute"><input type="radio" name="permStatus[<?= $ident ?>/<?= $name ?>]" value="execute"></td>
+					<td class="centertext perm_custom"><input type="radio" name="permStatus[<?= $ident ?>/<?= $name ?>]" value="custom"></td>
+					<td class="centertext perm_no_change"><input type="radio" name="permStatus[<?= $ident ?>/<?= $name ?>]" value="no_change" checked></td>
+				</tr>
+				<tr id="insert_div_loc_<?= $cur_ident ?>" style="display: none;"><td></td></tr><?php if (!empty($dir['contents'])): ?><?php $this->subTemplate('permission_show_contents', ['ident' => $ident . '/' . $name, 'contents' => $dir['contents'], 'level' => $level + 1, 'has_more' => !empty($dir['more_files'])]); ?><?php endif; ?><?php endif; ?><?php endforeach; ?><?php /* We have more files to show? */ ?><?php if ($has_more): ?>
+				<tr class="windowbg" id="content_<?= $js_ident ?>_more">
+					<td class="smalltext" width="40%"><?= str_repeat('&nbsp;', $level * 5) ?>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=perms;find=<?= base64_encode($ident) ?>;fileoffset=<?= (Utils::$context['file_offset'] + Utils::$context['file_limit']) ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>#fol_<?= preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident) ?>"><?= Lang::getTxt('package_file_perms_more_files', file: 'Packages') ?></a>
+					</td>
+					<td colspan="6"></td>
+				</tr><?php endif; ?><?php if ($drawn_div): ?><?php
+// Hide anything too far down the tree.
+$isFound = false;
+?><?php foreach (Utils::$context['look_for'] as $tree): ?><?php if (str_starts_with($tree, $ident)): ?><?php $isFound = true; ?><?php endif; ?><?php endforeach; ?><?php if ($level > 1 && !$isFound): ?>
+		<script>
+			expandFolder('<?= $js_ident ?>', '');
+		</script><?php endif; ?><?php endif; ?>
diff --git a/Themes/default/templates/Packages/servers.php b/Themes/default/templates/Packages/servers.php
new file mode 100644
index 00000000000..474af7523cf
--- /dev/null
+++ b/Themes/default/templates/Packages/servers.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Url;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * List package servers
+ */
+?><?php if (!empty(Utils::$context['package_ftp']['error'])): ?>
+	<div class="errorbox">
+		<pre><?= Utils::$context['package_ftp']['error'] ?></pre>
+	</div><?php endif; ?>
+	<div id="admin_form_wrapper">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_upload_title', file: 'Packages') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=packages;get;sa=upload" method="post" accept-charset="UTF-8" enctype="multipart/form-data">
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('package_upload_select', file: 'Packages') ?></strong>
+					</dt>
+					<dd>
+						<input type="file" name="package" size="38">
+					</dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('upload', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a class="download_new_package">
+					<span class="toggle_down floatright" alt="*" title="<?= Lang::getTxt('show', file: 'General') ?>"></span>
+					<?= Lang::getTxt('download_new_package', file: 'Packages') ?>
+				</a>
+			</h3>
+		</div>
+		<div class="new_package_content"><?php if (Utils::$context['package_download_broken']): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('package_ftp_necessary', file: 'Packages') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p>
+					<?= Lang::getTxt('package_ftp_why_download', file: 'Packages') ?>
+				</p>
+				<form action="<?= Config::$scripturl ?>?action=admin;area=packages;get" method="post" accept-charset="UTF-8">
+					<dl class="settings">
+						<dt>
+							<label for="ftp_server"><?= Lang::getTxt('package_ftp_server', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="30" name="ftp_server" id="ftp_server" value="<?= Utils::$context['package_ftp']['server'] ?>">
+							<label for="ftp_port"><?= Lang::getTxt('package_ftp_port', file: 'Packages') ?></label>
+							<input type="text" size="3" name="ftp_port" id="ftp_port" value="<?= Utils::$context['package_ftp']['port'] ?>">
+						</dd>
+						<dt>
+							<label for="ftp_username"><?= Lang::getTxt('package_ftp_username', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="50" name="ftp_username" id="ftp_username" value="<?= Utils::$context['package_ftp']['username'] ?>">
+						</dd>
+						<dt>
+							<label for="ftp_password"><?= Lang::getTxt('package_ftp_password', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="password" size="50" name="ftp_password" id="ftp_password">
+						</dd>
+						<dt>
+							<label for="ftp_path"><?= Lang::getTxt('package_ftp_path', file: 'Packages') ?></label>
+						</dt>
+						<dd>
+							<input type="text" size="50" name="ftp_path" id="ftp_path" value="<?= Utils::$context['package_ftp']['path'] ?>">
+						</dd>
+					</dl>
+					<div class="righttext">
+						<input type="submit" value="<?= Lang::getTxt('package_proceed', file: 'Packages') ?>" class="button">
+					</div>
+				</form>
+			</div><!-- .windowbg --><?php endif; ?>
+			<div class="windowbg">
+				<fieldset>
+					<legend><?= Lang::getTxt('package_servers', file: 'Packages') ?></legend>
+					<ul class="package_servers"><?php foreach (Utils::$context['servers'] as $server): ?>
+						<li class="flow_auto">
+							<span class="floatleft"><?= $server['name'] ?></span>
+							<span class="package_server floatright"><a href="<?= Config::$scripturl ?>?action=admin;area=packages;get;sa=browse;server=<?= $server['id'] ?>" class="button"><?= Lang::getTxt('package_browse', file: 'Packages') ?></a></span>
+							<?= (!str_ends_with((new Url($server['url']))->host, '.simplemachines.org') ? '<span class="package_server floatright"><a href="' . Config::$scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" class="button">' . Lang::getTxt('delete', file: 'General') . '</a></span>' : '') ?>
+						</li><?php endforeach; ?>
+					</ul>
+				</fieldset>
+				<fieldset>
+					<legend><?= Lang::getTxt('add_server', file: 'Packages') ?></legend>
+					<form action="<?= Config::$scripturl ?>?action=admin;area=packages;get;sa=add" method="post" accept-charset="UTF-8">
+						<dl class="settings">
+							<dt>
+								<strong><?= Lang::getTxt('server_name', file: 'Packages') ?></strong>
+							</dt>
+							<dd>
+								<input type="text" name="servername" size="44" value="SMF">
+							</dd>
+							<dt>
+								<strong><?= Lang::getTxt('serverurl', file: 'Packages') ?></strong>
+							</dt>
+							<dd>
+								<input type="text" name="serverurl" size="44" value="https://">
+							</dd>
+						</dl>
+						<div class="righttext">
+							<input type="submit" value="<?= Lang::getTxt('add_server', file: 'Packages') ?>" class="button">
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						</div>
+					</form>
+				</fieldset>
+				<fieldset>
+					<legend><?= Lang::getTxt('package_download_by_url', file: 'Packages') ?></legend>
+					<form action="<?= Config::$scripturl ?>?action=admin;area=packages;get;sa=download;byurl;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" method="post" accept-charset="UTF-8">
+						<dl class="settings">
+							<dt>
+								<strong><?= Lang::getTxt('serverurl', file: 'Packages') ?></strong>
+							</dt>
+							<dd>
+								<input type="text" name="package" size="44" value="https://">
+							</dd>
+							<dt>
+								<strong><?= Lang::getTxt('package_download_filename', file: 'Packages') ?></strong>
+							</dt>
+							<dd>
+								<input type="text" name="filename" size="44"><br>
+								<span class="smalltext"><?= Lang::getTxt('package_download_filename_info', file: 'Packages') ?></span>
+							</dd>
+						</dl>
+						<input type="submit" value="<?= Lang::getTxt('download', file: 'Packages') ?>" class="button">
+					</form>
+				</fieldset>
+			</div><!-- .windowbg -->
+		</div><!-- .new_package_content -->
+	</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/view_operations.php b/Themes/default/templates/Packages/view_operations.php
new file mode 100644
index 00000000000..e3578e39f96
--- /dev/null
+++ b/Themes/default/templates/Packages/view_operations.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * View operation details.
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Lang::getTxt('operation_title', file: 'Packages') ?></title>
+		<?= Theme::template_css() ?><?php Theme::template_javascript(); ?>
+	</head>
+	<body>
+		<div class="padding windowbg">
+			<div class="padding">
+				<?= Utils::$context['operations']['search'] ?>
+			</div>
+			<div class="padding">
+				<?= Utils::$context['operations']['replace'] ?>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Packages/view_package.php b/Themes/default/templates/Packages/view_package.php
new file mode 100644
index 00000000000..4eb2c133e2b
--- /dev/null
+++ b/Themes/default/templates/Packages/view_package.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * View package details when installing/uninstalling
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt((Utils::$context['uninstalling'] ? 'uninstall' : ('install_' . Utils::$context['extract_type'])), file: 'Packages') ?></h3>
+		</div>
+		<div class="information"><?php if (Utils::$context['is_installed']): ?>
+			<strong><?= Lang::getTxt('package_installed_warning1', file: 'Packages') ?></strong><br>
+			<br>
+			<?= Lang::getTxt('package_installed_warning2', file: 'Packages') ?><br>
+			<br><?php endif; ?><?= Lang::getTxt('package_installed_warning3', file: 'Packages') ?>
+		</div>
+		<br><?php if (!empty(Utils::$context['package_blacklist_found'])): ?>
+		<div class="errorbox"><?= Lang::getTxt('package_validation_blacklist_found', file: 'Packages') ?>
+		</div><?php endif; ?><?php /* Do errors exist in the install? If so light them up like a christmas tree. */ ?><?php if (Utils::$context['has_failure']): ?>
+		<div class="errorbox">
+			<?= Lang::getTxt(
+			'package_will_fail_title',
+			[
+				Lang::getTxt(
+					'package_' . (Utils::$context['uninstalling'] ? 'uninstall' : 'install'),
+					file: 'Packages',
+				),
+			],
+			file: 'Packages',
+		) ?><br>
+			<?= Lang::getTxt(
+				'package_will_fail_warning',
+				[
+					Lang::getTxt(
+						'package_' . (Utils::$context['uninstalling'] ? 'uninstall' : 'install'),
+						file: 'Packages',
+					),
+				],
+				file: 'Packages',
+			) ?><?= !empty(Utils::$context['failure_details']) ? '<br><br><strong>' . Utils::$context['failure_details'] . '</strong>' : '' ?>
+		</div><?php endif; ?><?php /* Validation info? */ ?><?php if (!empty(Utils::$context['validation_tests'])): ?>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('package_validaiton_results', file: 'Packages') ?></h3>
+		</div>
+		<div id="package_validation">
+			<table class="table_grid"><?php foreach (Utils::$context['validation_tests'] as $id_server => $result): ?>
+			<tr>
+				<td><?= Utils::$context['package_servers'][$id_server]['name'] ?></td>
+				<td><?= Lang::getTxt($result[Utils::$context['package_sha256_hash']] ?? 'package_validation_status_unknown', file: 'Packages') ?></td>
+			</tr><?php endforeach; ?>
+			</table>
+		</div>
+		<br><?php endif; ?><?php /* Display the package readme if one exists */ ?><?php if (isset(Utils::$context['package_readme'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_' . (Utils::$context['uninstalling'] ? 'un' : '') . 'install_readme', file: 'Search') ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= Utils::adjustHeadingLevels(Utils::$context['package_readme'], 3) ?>
+			<span class="floatright"><?= Lang::getTxt('package_available_readme_language', file: 'Packages') ?>
+				<select name="readme_language" id="readme_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + '?action=admin;area=packages;sa=<?= Utils::$context['uninstalling'] ? 'uninstall' : 'install' ?>;package=<?= Utils::$context['filename'] ?>;license=' + this.options[this.selectedIndex].value + ';readme=' + get_selected('readme_language'));"><?php foreach (Utils::$context['readmes'] as $a => $b): ?>
+					<option value="<?= $b ?>"<?= $a === 'selected' ? ' selected' : '' ?>><?= $b == 'default' ? Lang::getTxt('package_readme_default', file: 'Packages') : ucfirst($b) ?></option><?php endforeach; ?>
+				</select>
+			</span>
+		</div>
+		<br><?php endif; ?><?php /* Did they specify a license to display? */ ?><?php if (isset(Utils::$context['package_license'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('package_install_license', file: 'Packages') ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= Utils::adjustHeadingLevels(Utils::$context['package_license'], 3) ?>
+			<span class="floatright"><?= Lang::getTxt('package_available_license_language', file: 'Packages') ?>
+				<select name="license_language" id="license_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + '?action=admin;area=packages;sa=install;package=<?= Utils::$context['filename'] ?>;readme=' + this.options[this.selectedIndex].value + ';license=' + get_selected('license_language'));"><?php foreach (Utils::$context['licenses'] as $a => $b): ?>
+					<option value="<?= $b ?>"<?= $a === 'selected' ? ' selected' : '' ?>><?= $b == 'default' ? Lang::getTxt('package_license_default', file: 'Packages') : ucfirst($b) ?></option><?php endforeach; ?>
+				</select>
+			</span>
+		</div>
+		<br><?php endif; ?>
+		<form action="<?= !empty(Utils::$context['post_url']) ? Utils::$context['post_url'] : '#' ?>" onsubmit="submitonce(this);" method="post" accept-charset="UTF-8" id="view_package">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt(Utils::$context['uninstalling'] ? 'package_uninstall_actions' : 'package_install_actions', Utils::$context, file: 'Packages') ?>
+				</h3>
+			</div><?php /* Are there data changes to be removed? */ ?><?php if (Utils::$context['uninstalling'] && !empty(Utils::$context['database_changes'])): ?><?php /* This is really a special case so we're adding style inline */ ?>
+			<div class="windowbg" style="margin: 0; border-radius: 0;">
+				<label><input type="checkbox" name="do_db_changes"><?= Lang::getTxt('package_db_uninstall', file: 'Packages') ?></label>
+				<div id="db_changes_div">
+					<?= Lang::getTxt('package_db_uninstall_actions', file: 'Packages') ?>
+					<ul class="normallist smalltext"><?php foreach (Utils::$context['database_changes'] as $change): ?>
+						<li><?= $change ?></li><?php endforeach; ?>
+					</ul>
+				</div>
+			</div><?php endif; ?>
+			<div class="information"><?php if (empty(Utils::$context['actions']) && empty(Utils::$context['database_changes'])): ?>
+				<br>
+				<div class="errorbox">
+					<?= Lang::getTxt('corrupt_compatible', file: 'Packages') ?>
+				</div>
+			</div><!-- .information --><?php else: ?>
+				<?= Lang::getTxt('perform_actions', file: 'Packages') ?>
+			</div><!-- .information -->
+			<br>
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th scope="col"></th>
+						<th scope="col" width="30"></th>
+						<th scope="col" class="lefttext"><?= Lang::getTxt('package_install_type', file: 'Packages') ?></th>
+						<th scope="col" class="lefttext" width="50%"><?= Lang::getTxt('package_install_action', file: 'Packages') ?></th>
+						<th class="lefttext" scope="col" width="20%"><?= Lang::getTxt('package_install_desc', file: 'Packages') ?></th>
+					</tr>
+				</thead>
+				<tbody><?php
+$i = 1;
+$j = 1;
+$action_num = 1;
+$js_operations = [];
+?><?php foreach (Utils::$context['actions'] as $packageaction): ?><?php
+// Did we pass or fail?  Need to now for later on.
+$js_operations[$action_num] = $packageaction['failed'] ?? 0;
+?>
+					<tr class="bg <?= $i % 2 == 0 ? 'even' : 'odd' ?>">
+						<td><?= isset($packageaction['operations']) ? '<img id="operation_img_' . $action_num . '" src="' . Theme::$current->settings['images_url'] . '/selected_open.png" alt="*" style="display: none;">' : '' ?></td>
+						<td style="width: 30px;"><?= $i++ ?>.</td>
+						<td style="width: 23%;"><?= $packageaction['type'] ?></td>
+						<td style="width: 50%;"><?= $packageaction['action'] ?></td>
+						<td style="width: 20%;"><strong<?= !empty($packageaction['failed']) ? ' class="error"' : '' ?>><?= $packageaction['description'] ?></strong></td>
+					</tr><?php /* Is there water on the knee? Operation! */ ?><?php if (isset($packageaction['operations'])): ?>
+					<tr id="operation_<?= $action_num ?>">
+						<td colspan="5">
+							<table class="full_width"><?php
+// Show the operations.
+$operation_num = 1;
+?><?php foreach ($packageaction['operations'] as $operation): ?><?php
+// Determine the position text.
+$operation_text = $operation['position'] == 'replace' ? 'operation_replace' : ($operation['position'] == 'before' ? 'operation_after' : 'operation_before');
+?>
+								<tr class="bg <?= $operation_num % 2 == 0 ? 'even' : 'odd' ?>">
+									<td class="righttext">
+										<a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=showoperations;operation_key=<?= $operation['operation_key'] ?><?= !empty(Utils::$context['install_id']) ? ';install_id=' . Utils::$context['install_id'] : '' ?>;package=<?= $_REQUEST['package'] ?>;filename=<?= $operation['filename'] ?><?= ($operation['is_diff'] ? ';diff' : '') ?><?= ($operation['is_boardmod'] ? ';boardmod' : '') ?><?= (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'uninstall' ? ';reverse' : '') ?>" onclick="return reqWin(this.href, 600, 400, false);">
+											<span class="main_icons package_ops"></span>
+										</a>
+									</td>
+									<td width="30"><?= $operation_num++ ?>.</td>
+									<td width="23%"><?= Lang::getTxt($operation_text, file: 'Packages') ?></td>
+									<td width="50%"><?= $operation['action'] ?></td>
+									<td width="20%"><strong<?= !empty($operation['failed']) ? ' class="error"' : '' ?>><?= !empty($operation['ignore_failure']) ? Lang::getTxt('operation_description_ignore', ['desc' => $operation['description']], file: 'Packages') : $operation['description'] ?></strong></td>
+								</tr><?php endforeach; ?>
+							</table>
+						</td>
+					</tr><?php
+// Increase it.
+$action_num++;
+?><?php endif; ?><?php endforeach; ?>
+				</tbody>
+			</table><?php /* What if we have custom themes we can install into? List them too! */ ?><?php if (!empty(Utils::$context['theme_actions'])): ?>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Utils::$context['uninstalling'] ? Lang::getTxt('package_other_themes_uninstall', file: 'Packages') : Lang::getTxt('package_other_themes', file: 'Packages') ?>
+				</h3>
+			</div>
+			<div id="custom_changes">
+				<div class="information">
+					<?= Lang::getTxt('package_other_themes_desc', file: 'Packages') ?>
+				</div>
+				<table class="table_grid"><?php /* Loop through each theme and display its name, and then it's details. */ ?><?php foreach (Utils::$context['theme_actions'] as $id => $theme): ?><?php
+// Pass?
+$js_operations[$action_num] = !empty($theme['has_failure']);
+?>
+					<tr class="title_bar">
+						<td class="righttext" colspan="2"><?php if (!empty(Utils::$context['themes_locked'])): ?>
+							<input type="hidden" name="custom_theme[]" value="<?= $id ?>"><?php endif; ?>
+							<input type="checkbox" name="custom_theme[]" id="custom_theme_<?= $id ?>" value="<?= $id ?>" onclick="<?= (!empty($theme['has_failure']) ? 'if (this.form.custom_theme_' . $id . '.checked && !confirm(\'' . Lang::getTxt('package_theme_failure_warning', file: 'Packages') . '\')) return false;' : '') ?>invertAll(this, this.form, 'dummy_theme_<?= $id ?>', true);"<?= !empty(Utils::$context['themes_locked']) ? ' disabled checked' : '' ?>>
+						</td>
+						<td colspan="3">
+							<?= $theme['name'] ?>
+						</td>
+					</tr><?php foreach ($theme['actions'] as $action): ?>
+					<tr class="bg <?= $j++ % 2 == 0 ? 'even' : 'odd' ?>">
+						<td colspan="2"><?= isset($packageaction['operations']) ?
+							'<img id="operation_img_' . $action_num . '" src="' . Theme::$current->settings['images_url'] . '/selected_open.png" alt="*" style="display: none;">' : '' ?>
+							<input type="checkbox" name="theme_changes[]" value="<?= !empty($action['value']) ? $action['value'] : '' ?>" id="dummy_theme_<?= $id ?>"<?= (!empty($action['not_mod']) ? '' : ' disabled') ?><?= !empty(Utils::$context['themes_locked']) ? ' checked' : '' ?> class="floatright">
+						</td>
+						<td width="23%"><?= $action['type'] ?></td>
+						<td width="50%"><?= $action['action'] ?></td>
+						<td width="20%"><strong<?= !empty($action['failed']) ? ' class="error"' : '' ?>><?= $action['description'] ?></strong></td>
+					</tr><?php /* Is there water on the knee? Operation! */ ?><?php if (isset($action['operations'])): ?>
+					<tr id="operation_<?= $action_num ?>">
+						<td colspan="5">
+							<table class="full_width"><?php $operation_num = 1; ?><?php foreach ($action['operations'] as $operation): ?><?php
+// Determine the position text.
+$operation_text = $operation['position'] == 'replace' ? 'operation_replace' : ($operation['position'] == 'before' ? 'operation_after' : 'operation_before');
+?>
+								<tr class="bg <?= $operation_num % 2 == 0 ? 'even' : 'odd' ?>">
+									<td class="righttext">
+										<a href="<?= Config::$scripturl ?>?action=admin;area=packages;sa=showoperations;operation_key=<?= $operation['operation_key'] ?><?= !empty(Utils::$context['install_id']) ? ';install_id=' . Utils::$context['install_id'] : '' ?>;package=<?= $_REQUEST['package'] ?>;filename=<?= $operation['filename'] ?><?= ($operation['is_diff'] ? ';diff' : '') ?><?= ($operation['is_boardmod'] ? ';boardmod' : '') ?><?= (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'uninstall' ? ';reverse' : '') ?>" onclick="return reqWin(this.href, 600, 400, false);">
+											<span class="main_icons package_ops"></span>
+										</a>
+									</td>
+									<td width="30"><?= $operation_num++ ?>.</td>
+									<td width="23%"><?= Lang::getTxt($operation_text, file: 'Packages') ?></td>
+									<td width="50%"><?= $operation['action'] ?></td>
+									<td width="20%"><strong<?= !empty($operation['failed']) ? ' class="error"' : '' ?>><?= !empty($operation['ignore_failure']) ? Lang::getTxt('operation_description_ignore', ['desc' => $operation['description']], file: 'Packages') : $operation['description'] ?></strong></td>
+								</tr><?php endforeach; ?>
+							</table>
+						</td>
+					</tr><?php
+// Increase it.
+$action_num++;
+?><?php endif; ?><?php endforeach; ?><?php endforeach; ?>
+				</table>
+			</div><!-- #custom_changes --><?php endif; ?><?php endif; ?><?php /* Are we effectively ready to install? */ ?><?php if (!Utils::$context['ftp_needed'] && (!empty(Utils::$context['actions']) || !empty(Utils::$context['database_changes']))): ?>
+			<div class="righttext padding">
+				<input type="submit" value="<?= Lang::getTxt(Utils::$context['uninstalling'] ? 'package_uninstall_now' : 'package_install_now', file: 'Packages') ?>" onclick="return <?= !empty(Utils::$context['has_failure']) ? '(submitThisOnce(this) &amp;&amp; confirm(\'' . Lang::getTxt(Utils::$context['uninstalling'] ? 'package_will_fail_popup_uninstall' : 'package_will_fail_popup', file: 'Packages') . '\'))' : 'submitThisOnce(this)' ?>;" class="button">
+			</div><?php /* If we need ftp information then demand it! */ ?><?php elseif (Utils::$context['ftp_needed']): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('package_ftp_necessary', file: 'Packages') ?></h3>
+			</div>
+			<div>
+				<?php $this->subTemplate('control_chmod'); ?>
+			</div><?php endif; ?>
+
+
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>"><?= (isset(Utils::$context['form_sequence_number']) && !Utils::$context['ftp_needed']) ? '
+			<input type="hidden" name="seqnum" value="' . Utils::$context['form_sequence_number'] . '">' : '' ?>
+		</form><?php /* Toggle options. */ ?>
+	<script><?php /* Operations. */ ?><?php if (!empty($js_operations)): ?><?php foreach ($js_operations as $key => $operation): ?>
+
+		new smc_Toggle({
+			bToggleEnabled: true,
+			bNoAnimate: true,
+			bCurrentlyCollapsed: <?= $operation ? 'false' : 'true' ?>,
+			aSwappableContainers: [
+				'operation_<?= $key ?>'
+			],
+			aSwapImages: [
+				{
+					sId: 'operation_img_<?= $key ?>',
+					srcExpanded: smf_images_url + '/selected_open.png',
+					altExpanded: '*',
+					srcCollapsed: smf_images_url + '/selected.png',
+					altCollapsed: '*'
+				}
+			]
+		});<?php endforeach; ?><?php endif; ?><?php /* Get the currently selected item from a select list */ ?>
+
+		function get_selected(id)
+		{
+			var aSelected = document.getElementById(id);
+			for (var i = 0; i < aSelected.options.length; i++)
+			{
+				if (aSelected.options[i].selected == true)
+					return aSelected.options[i].value;
+			}
+			return aSelected.options[0];
+		}<?php /* And a bit more for database changes. */ ?><?php if (Utils::$context['uninstalling'] && !empty(Utils::$context['database_changes'])): ?>
+
+		makeToggle(document.getElementById('db_changes_div'), <?= Utils::escapeJavaScript(Lang::getTxt('package_db_uninstall_details', file: 'Packages')) ?>);<?php endif; ?>
+
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/add_rule.php b/Themes/default/templates/PersonalMessage/add_rule.php
new file mode 100644
index 00000000000..f2a74b38428
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/add_rule.php
@@ -0,0 +1,241 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for adding/editing a rule.
+ */
+?>
+	<script>
+		var criteriaNum = 0;
+		var actionNum = 0;
+		var groups = new Array()
+		var labels = new Array()<?php foreach (Utils::$context['groups'] as $id => $title): ?>
+
+		groups[<?= $id ?>] = "<?= addslashes($title) ?>";<?php endforeach; ?><?php foreach (Utils::$context['labels'] as $label): ?><?php if ($label['id'] != -1): ?>
+
+		labels[<?= ($label['id']) ?>] = "<?= addslashes($label['name']) ?>";<?php endif; ?><?php endforeach; ?>
+
+		function addCriteriaOption()
+		{
+			if (criteriaNum == 0)
+			{
+				for (var i = 0; i < document.forms.addrule.elements.length; i++)
+					if (document.forms.addrule.elements[i].id.substr(0, 8) == "ruletype")
+						criteriaNum++;
+			}
+
+			if (criteriaNum++ >= <?= Utils::$context['rule_limiters']['criteria'] ?>)
+				return false;
+
+			setOuterHTML(document.getElementById("criteriaAddHere"), '<br><select name="ruletype[' + criteriaNum + ']" id="ruletype' + criteriaNum + '" onchange="updateRuleDef(' + criteriaNum + '); rebuildRuleDesc();"><option value=""><' + '/option><option value="mid"><?= addslashes(Lang::getTxt('pm_rule_mid', file: 'PersonalMessage')) ?><' + '/option><option value="gid"><?= addslashes(Lang::getTxt('pm_rule_gid', file: 'PersonalMessage')) ?><' + '/option><option value="sub"><?= addslashes(Lang::getTxt('pm_rule_sub', file: 'PersonalMessage')) ?><' + '/option><option value="msg"><?= addslashes(Lang::getTxt('pm_rule_msg', file: 'PersonalMessage')) ?><' + '/option><option value="bud"><?= addslashes(Lang::getTxt('pm_rule_bud', file: 'PersonalMessage')) ?><' + '/option><' + '/select>&nbsp;<span id="defdiv' + criteriaNum + '" style="display: none;"><input type="text" name="ruledef[' + criteriaNum + ']" id="ruledef' + criteriaNum + '" onkeyup="rebuildRuleDesc();" value=""><' + '/span><span id="defseldiv' + criteriaNum + '" style="display: none;"><select name="ruledefgroup[' + criteriaNum + ']" id="ruledefgroup' + criteriaNum + '" onchange="rebuildRuleDesc();"><option value=""><?= addslashes(Lang::getTxt('pm_rule_sel_group', file: 'PersonalMessage')) ?><' + '/option><?php foreach (Utils::$context['groups'] as $id => $group): ?><option value="<?= $id ?>"><?= strtr($group, ["'" => "\'"]) ?><' + '/option><?php endforeach; ?><' + '/select><' + '/span><span id="criteriaAddHere"><' + '/span>');
+
+				if (criteriaNum + 1 > <?= Utils::$context['rule_limiters']['criteria'] ?>)
+					document.getElementById('addonjs1').style.display = 'none';
+			}
+
+			function addActionOption()
+			{
+				if (actionNum == 0)
+				{
+					for (var i = 0; i < document.forms.addrule.elements.length; i++)
+						if (document.forms.addrule.elements[i].id.substr(0, 7) == "acttype")
+							actionNum++;
+				}
+				if (actionNum++ >= <?= Utils::$context['rule_limiters']['actions'] ?>)
+					return false;
+
+				setOuterHTML(document.getElementById("actionAddHere"), '<br><select name="acttype[' + actionNum + ']" id="acttype' + actionNum + '" onchange="updateActionDef(' + actionNum + '); rebuildRuleDesc();"><option value=""><?= addslashes(Lang::getTxt('pm_rule_do_nothing', file: 'PersonalMessage')) ?>:<' + '/option><option value="lab"><?= addslashes(Lang::getTxt('pm_rule_label', file: 'PersonalMessage')) ?><' + '/option><option value="del"><?= addslashes(Lang::getTxt('pm_rule_delete', file: 'PersonalMessage')) ?><' + '/option><' + '/select>&nbsp;<span id="labdiv' + actionNum + '" style="display: none;"><select name="labdef[' + actionNum + ']" id="labdef' + actionNum + '" onchange="rebuildRuleDesc();"><option value=""><?= addslashes(Lang::getTxt('pm_rule_sel_label', file: 'PersonalMessage')) ?><' + '/option><?php foreach (Utils::$context['labels'] as $label): ?><?php if ($label['id'] != -1): ?><option value="<?= ($label['id']) ?>"><?= addslashes($label['name']) ?><' + '/option><?php endif; ?><?php endforeach; ?><' + '/select><' + '/span><span id="actionAddHere"><' + '/span>');
+
+				if (actionNum + 1 > <?= Utils::$context['rule_limiters']['actions'] ?>)
+					document.getElementById('addonjs2').style.display = 'none';
+			}
+
+			// Rebuild the rule description!
+			function rebuildRuleDesc()
+			{
+				// Start with nothing.
+				var text = "";
+				var joinText = "";
+				var actionText = "";
+				var hadBuddy = false;
+				var foundCriteria = false;
+				var foundAction = false;
+				var curNum, curVal, curDef;
+
+				for (var i = 0; i < document.forms.addrule.elements.length; i++)
+				{
+					if (document.forms.addrule.elements[i].id.substr(0, 8) == "ruletype")
+					{
+						if (foundCriteria)
+							joinText = document.getElementById("logic").value == 'and' ? <?= Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_and', file: 'PersonalMessage') . '</em> ') ?> : <?= Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_or', file: 'PersonalMessage') . '</em> ') ?>;
+						else
+							joinText = '';
+						foundCriteria = true;
+
+						curNum = document.forms.addrule.elements[i].id.match(/\d+/);
+						curVal = document.forms.addrule.elements[i].value;
+						if (curVal == "gid")
+							curDef = document.getElementById("ruledefgroup" + curNum).value.php_htmlspecialchars();
+						else if (curVal != "bud")
+							curDef = document.getElementById("ruledef" + curNum).value.php_htmlspecialchars();
+						else
+							curDef = "";
+
+						// What type of test is this?
+						if (curVal == "mid" && curDef)
+							text += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_member', file: 'PersonalMessage')) ?>.replace("{MEMBER}", curDef);
+						else if (curVal == "gid" && curDef && groups[curDef])
+							text += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_group', file: 'PersonalMessage')) ?>.replace("{GROUP}", groups[curDef]);
+						else if (curVal == "sub" && curDef)
+							text += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_subject', file: 'PersonalMessage')) ?>.replace("{SUBJECT}", curDef);
+						else if (curVal == "msg" && curDef)
+							text += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_body', file: 'PersonalMessage')) ?>.replace("{BODY}", curDef);
+						else if (curVal == "bud" && !hadBuddy)
+						{
+							text += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_buddy', file: 'PersonalMessage')) ?>;
+							hadBuddy = true;
+						}
+					}
+					if (document.forms.addrule.elements[i].id.substr(0, 7) == "acttype")
+					{
+						if (foundAction)
+							joinText = <?= Utils::escapeJavaScript(' <em>' . Lang::getTxt('pm_readable_and', file: 'PersonalMessage') . '</em> ') ?>;
+						else
+							joinText = "";
+						foundAction = true;
+
+						curNum = document.forms.addrule.elements[i].id.match(/\d+/);
+						curVal = document.forms.addrule.elements[i].value;
+						if (curVal == "lab")
+							curDef = document.getElementById("labdef" + curNum).value.php_htmlspecialchars();
+						else
+							curDef = "";
+
+						// Now pick the actions.
+						if (curVal == "lab" && curDef && labels[curDef])
+							actionText += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_label', file: 'PersonalMessage')) ?>.replace("{LABEL}", labels[curDef]);
+						else if (curVal == "del")
+							actionText += joinText + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_delete', file: 'PersonalMessage')) ?>;
+					}
+				}
+
+				// If still nothing make it default!
+				if (text == "" || !foundCriteria)
+					text = "<?= Lang::getTxt('pm_rule_not_defined', file: 'PersonalMessage') ?>";
+				else
+				{
+					if (actionText != "")
+						text += <?= Utils::escapeJavaScript(' <strong>' . Lang::getTxt('pm_readable_then', file: 'PersonalMessage') . '</strong> ') ?> + actionText;
+					text = <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_start', file: 'PersonalMessage')) ?> + text + <?= Utils::escapeJavaScript(Lang::getTxt('pm_readable_end', file: 'PersonalMessage')) ?>;
+				}
+
+				// Set the actual HTML!
+				setInnerHTML(document.getElementById("ruletext"), text);
+			}
+	</script>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=manrules;save;rid=<?= Utils::$context['rid'] ?>" method="post" accept-charset="UTF-8" name="addrule" id="addrule" class="flow_hidden">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt(Utils::$context['rid'] == 0 ? 'pm_add_rule' : 'pm_edit_rule', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="addrules">
+				<dt class="floatleft">
+					<strong><?= Lang::getTxt('pm_rule_name', file: 'PersonalMessage') ?></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('pm_rule_name_desc', file: 'PersonalMessage') ?></span>
+				</dt>
+				<dd class="floatleft">
+					<input type="text" name="rule_name" value="<?= empty(Utils::$context['rule']->name) ? '' : Utils::$context['rule']->name ?>" size="50" required>
+				</dd>
+			</dl>
+			<fieldset>
+				<legend><?= Lang::getTxt('pm_rule_criteria', file: 'PersonalMessage') ?></legend><?php
+// Add a dummy criteria to allow expansion for none js users.
+Utils::$context['rule']->criteria[] = ['t' => '', 'v' => ''];
+?><?php /* For each criteria print it out. */ ?><?php $isFirst = true; ?><?php foreach (Utils::$context['rule']->criteria as $k => $criteria): ?><?php if (!$isFirst && $criteria['t'] == ''): ?><div id="removeonjs1"><?php elseif (!$isFirst): ?><br><?php endif; ?>
+				<select name="ruletype[<?= $k ?>]" id="ruletype<?= $k ?>" onchange="updateRuleDef(<?= $k ?>); rebuildRuleDesc();">
+					<option value="" selected></option><?php foreach (['mid', 'gid', 'sub', 'msg', 'bud'] as $cr): ?>
+					<option value="<?= $cr ?>"<?= $criteria['t'] == $cr ? ' selected' : '' ?>><?= Lang::getTxt('pm_rule_' . $cr, file: 'PersonalMessage') ?></option><?php endforeach; ?>
+				</select>
+				<span id="defdiv<?= $k ?>" <?= !in_array($criteria['t'], ['gid', 'bud']) ? '' : 'style="display: none;"' ?>>
+					<input type="text" name="ruledef[<?= $k ?>]" id="ruledef<?= $k ?>" onkeyup="rebuildRuleDesc();" value="<?= in_array($criteria['t'], ['mid', 'sub', 'msg']) ? $criteria['v'] : '' ?>">
+				</span>
+				<span id="defseldiv<?= $k ?>" <?= $criteria['t'] == 'gid' ? '' : 'style="display: none;"' ?>>
+					<select name="ruledefgroup[<?= $k ?>]" id="ruledefgroup<?= $k ?>" onchange="rebuildRuleDesc();">
+						<option value=""><?= Lang::getTxt('pm_rule_sel_group', file: 'PersonalMessage') ?></option><?php foreach (Utils::$context['groups'] as $id => $group): ?>
+						<option value="<?= $id ?>"<?= $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '' ?>><?= $group ?></option><?php endforeach; ?>
+					</select>
+				</span><?php /* If this is the dummy we add a means to hide for non js users. */ ?><?php if ($isFirst): ?><?php $isFirst = false; ?><?php elseif ($criteria['t'] == ''): ?></div><!-- .removeonjs1 --><?php endif; ?><?php endforeach; ?>
+				<span id="criteriaAddHere"></span><br>
+				<a href="#" onclick="addCriteriaOption(); return false;" id="addonjs1" style="display: none;">(<?= Lang::getTxt('pm_rule_criteria_add', file: 'PersonalMessage') ?>)</a>
+				<br><br>
+				<?= Lang::getTxt('pm_rule_logic', file: 'PersonalMessage') ?>
+				<select name="rule_logic" id="logic" onchange="rebuildRuleDesc();">
+					<option value="and"<?= Utils::$context['rule']->logic == 'and' ? ' selected' : '' ?>><?= Lang::getTxt('pm_rule_logic_and', file: 'PersonalMessage') ?></option>
+					<option value="or"<?= Utils::$context['rule']->logic == 'or' ? ' selected' : '' ?>><?= Lang::getTxt('pm_rule_logic_or', file: 'PersonalMessage') ?></option>
+				</select>
+			</fieldset>
+			<fieldset>
+				<legend><?= Lang::getTxt('pm_rule_actions', file: 'PersonalMessage') ?></legend><?php
+// As with criteria - add a dummy action for "expansion".
+Utils::$context['rule']->actions[] = ['t' => '', 'v' => ''];
+?><?php /* Print each action. */ ?><?php $isFirst = true; ?><?php foreach (Utils::$context['rule']->actions as $k => $action): ?><?php if (!$isFirst && $action['t'] == ''): ?><div id="removeonjs2"><?php elseif (!$isFirst): ?><br><?php endif; ?>
+				<select name="acttype[<?= $k ?>]" id="acttype<?= $k ?>" onchange="updateActionDef(<?= $k ?>); rebuildRuleDesc();">
+					<option value=""><?= Lang::getTxt('pm_rule_do_nothing', file: 'PersonalMessage') ?></option>
+					<option value="lab"<?= $action['t'] == 'lab' ? ' selected' : '' ?>><?= Lang::getTxt('pm_rule_label', file: 'PersonalMessage') ?></option>
+					<option value="del"<?= $action['t'] == 'del' ? ' selected' : '' ?>><?= Lang::getTxt('pm_rule_delete', file: 'PersonalMessage') ?></option>
+				</select>
+				<span id="labdiv<?= $k ?>">
+					<select name="labdef[<?= $k ?>]" id="labdef<?= $k ?>" onchange="rebuildRuleDesc();">
+						<option value=""><?= Lang::getTxt('pm_rule_sel_label', file: 'PersonalMessage') ?></option><?php foreach (Utils::$context['labels'] as $label): ?><?php if ($label['id'] != -1): ?>
+						<option value="<?= ($label['id']) ?>"<?= $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '' ?>><?= $label['name'] ?></option><?php endif; ?><?php endforeach; ?>
+					</select>
+				</span><?php if ($isFirst): ?><?php $isFirst = false; ?><?php elseif ($action['t'] == ''): ?></div><!-- .removeonjs2 --><?php endif; ?><?php endforeach; ?>
+				<span id="actionAddHere"></span><br>
+				<a href="#" onclick="addActionOption(); return false;" id="addonjs2" style="display: none;">(<?= Lang::getTxt('pm_rule_add_action', file: 'PersonalMessage') ?>)</a>
+			</fieldset>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('pm_rule_description', file: 'PersonalMessage') ?></h3>
+			</div>
+			<div class="information">
+				<div id="ruletext"><?= Lang::getTxt('pm_rule_js_disabled', file: 'PersonalMessage') ?></div>
+			</div>
+			<div class="righttext">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="submit" name="save" value="<?= Lang::getTxt('pm_rule_save', file: 'PersonalMessage') ?>" class="button">
+			</div>
+		</div><!-- .windowbg -->
+	</form><?php /* Now setup all the bits! */ ?>
+	<script><?php foreach (Utils::$context['rule']->criteria as $k => $c): ?>
+
+			updateRuleDef(<?= $k ?>);<?php endforeach; ?><?php foreach (Utils::$context['rule']->actions as $k => $c): ?>
+
+			updateActionDef(<?= $k ?>);<?php endforeach; ?>
+
+			rebuildRuleDesc();<?php /* If this isn't a new rule and we have JS enabled remove the JS compatibility stuff. */ ?><?php if (Utils::$context['rid']): ?>
+
+			document.getElementById("removeonjs1").style.display = "none";
+			document.getElementById("removeonjs2").style.display = "none";<?php endif; ?><?php if (count(Utils::$context['rule']->criteria) <= Utils::$context['rule_limiters']['criteria']): ?>
+
+			document.getElementById("addonjs1").style.display = "";<?php endif; ?><?php if (count(Utils::$context['rule']->actions) <= Utils::$context['rule_limiters']['actions']): ?>
+
+			document.getElementById("addonjs2").style.display = "";<?php endif; ?>
+
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/ask_delete.php b/Themes/default/templates/PersonalMessage/ask_delete.php
new file mode 100644
index 00000000000..d2b3d961d7c
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/ask_delete.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template asks the user whether they wish to empty out their folder/messages.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt(Utils::$context['delete_all'] ? 'delete_message' : 'delete_all', file: 'PersonalMessage') ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('delete_all_confirm', file: 'PersonalMessage') ?></p>
+			<br>
+			<strong><a href="<?= Config::$scripturl ?>?action=pm;sa=removeall2;f=<?= Utils::$context['folder'] ?>;<?= Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '' ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('yes', file: 'General') ?></a> - <a href="javascript:history.go(-1);"><?= Lang::getTxt('no', file: 'General') ?></a></strong>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/folder.php b/Themes/default/templates/PersonalMessage/folder.php
new file mode 100644
index 00000000000..18bf9cee2a7
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/folder.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Shows a particular folder (eg inbox or outbox), all the PMs in it, etc.
+ */
+?><?php /* The every helpful javascript! */ ?>
+		<script>
+			var allLabels = {};
+			var currentLabels = {};
+			function loadLabelChoices()
+			{
+				var listing = document.forms.pmFolder.elements;
+				var theSelect = document.forms.pmFolder.pm_action;
+				var add, remove, toAdd = {length: 0}, toRemove = {length: 0};
+
+				if (theSelect.childNodes.length == 0)
+					return;
+
+				// This is done this way for internationalization reasons.
+				if (!('-1' in allLabels))
+				{
+					for (var o = 0; o < theSelect.options.length; o++)
+						if (theSelect.options[o].value.substr(0, 4) == "rem_")
+							allLabels[theSelect.options[o].value.substr(4)] = theSelect.options[o].text;
+				}
+
+				for (var i = 0; i < listing.length; i++)
+				{
+					if (listing[i].name != "pms[]" || !listing[i].checked)
+						continue;
+
+					var alreadyThere = [], x;
+					for (x in currentLabels[listing[i].value])
+					{
+						if (!(x in toRemove))
+						{
+							toRemove[x] = allLabels[x];
+							toRemove.length++;
+						}
+						alreadyThere[x] = allLabels[x];
+					}
+
+					for (x in allLabels)
+					{
+						if (!(x in alreadyThere))
+						{
+							toAdd[x] = allLabels[x];
+							toAdd.length++;
+						}
+					}
+				}
+
+				while (theSelect.options.length > 2)
+					theSelect.options[2] = null;
+
+				if (toAdd.length != 0)
+				{
+					theSelect.options[theSelect.options.length] = new Option("<?= Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage') ?>", "");
+					setInnerHTML(theSelect.options[theSelect.options.length - 1], "<?= Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage') ?>");
+					theSelect.options[theSelect.options.length - 1].disabled = true;
+
+					for (i in toAdd)
+					{
+						if (i != "length")
+							theSelect.options[theSelect.options.length] = new Option(toAdd[i], "add_" + i);
+					}
+				}
+
+				if (toRemove.length != 0)
+				{
+					theSelect.options[theSelect.options.length] = new Option("<?= Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage') ?>", "");
+					setInnerHTML(theSelect.options[theSelect.options.length - 1], "<?= Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage') ?>");
+					theSelect.options[theSelect.options.length - 1].disabled = true;
+
+					for (i in toRemove)
+					{
+						if (i != "length")
+							theSelect.options[theSelect.options.length] = new Option(toRemove[i], "rem_" + i);
+					}
+				}
+			}
+		</script>
+		<form class="flow_hidden" action="<?= Config::$scripturl ?>?action=pm;sa=pmactions;<?= Utils::$context['display_mode'] == 2 ? 'conversation;' : '' ?>f=<?= Utils::$context['folder'] ?>;start=<?= Utils::$context['start'] ?><?= Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '' ?>" method="post" accept-charset="UTF-8" name="pmFolder" id="pmFolder"><?php /* If we are not in single display mode show the subjects on the top! */ ?><?php if (Utils::$context['display_mode'] != 1): ?><?php $this->subTemplate('subject_list'); ?>
+			<div class="clear_right"><br></div><?php endif; ?><?php /* Got some messages to display? */ ?><?php if (Utils::$context['get_pmessage']('message', true)): ?><?php /* Show a few buttons if we are in conversation mode and outputting the first message. */ ?><?php if (Utils::$context['display_mode'] == 2): ?><?php
+// This bit uses info set in template_subject_list, so it's wrapped
+// in an if just in case a mod or custom theme breaks it.
+?><?php if (!empty(Utils::$context['current_pm_subject'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span><?= Lang::getTxt('conversation', file: 'PersonalMessage') ?></span>
+				</h3>
+			</div>
+			<div class="roundframe">
+				<div class="display_title"><?= Utils::$context['current_pm_subject'] ?></div>
+				<p><?= Lang::getTxt('started_by_member_time', ['member' => Utils::$context['current_pm_author'], 'time' => Utils::$context['current_pm_time']], file: 'General') ?></p><?php else: ?>
+			<div class="roundframe"><?php endif; ?><?php /* Show the conversation buttons. */ ?><?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['conversation_buttons'], 'direction' => 'right']); ?>
+			</div><?php endif; ?><?php while ($message = Utils::$context['get_pmessage']('message')): ?><?php $this->subTemplate('single_pm', ['message' => $message]); ?><?php endwhile; ?><?php if (empty(Utils::$context['display_mode'])): ?>
+			<div class="pagesection">
+				<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+				<div class="floatright">
+					<input type="submit" name="del_selected" value="<?= Lang::getTxt('quickmod_delete_selected', file: 'General') ?>" data-confirm="<?= Lang::getTxt('delete_selected_confirm', file: 'PersonalMessage') ?>" class="button you_sure">
+				</div>
+			</div><?php /* Show a few buttons if we are in conversation mode and outputting the first message. */ ?><?php elseif (Utils::$context['display_mode'] == 2 && isset(Utils::$context['conversation_buttons'])): ?>
+			<div class="pagesection"><?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['conversation_buttons'], 'direction' => 'right']); ?>
+			</div><?php endif; ?>
+			<br><?php endif; ?><?php /* Individual messages = button list! */ ?><?php if (Utils::$context['display_mode'] == 1): ?><?php $this->subTemplate('subject_list'); ?><br><?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/index.php b/Themes/default/templates/PersonalMessage/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/PersonalMessage/labels.php b/Themes/default/templates/PersonalMessage/labels.php
new file mode 100644
index 00000000000..89caff1ae6b
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/labels.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Here we allow the user to setup labels, remove labels and change rules for labels (i.e, do quite a bit)
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=manlabels" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_manage_labels', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('pm_labels_desc', file: 'PersonalMessage') ?>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext">
+						<?= Lang::getTxt('pm_label_name', file: 'PersonalMessage') ?>
+					</th>
+					<th class="centertext table_icon">
+<?php if (count(Utils::$context['labels']) > 2): ?>
+						<input type="checkbox" onclick="invertAll(this, this.form);">
+<?php endif; ?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+<?php if (count(Utils::$context['labels']) < 2): ?>
+				<tr class="windowbg">
+					<td colspan="2"><?= Lang::getTxt('pm_labels_no_exist', file: 'PersonalMessage') ?></td>
+				</tr>
+<?php else: ?>
+<?php foreach (Utils::$context['labels'] as $label): ?>
+<?php if ($label['id'] == -1): ?>
+<?php continue; ?>
+<?php endif; ?>
+				<tr class="windowbg">
+					<td>
+						<input type="text" name="label_name[<?= $label['id'] ?>]" value="<?= $label['name'] ?>" size="30" maxlength="30">
+					</td>
+					<td class="table_icon"><input type="checkbox" name="delete_label[<?= $label['id'] ?>]"></td>
+				</tr>
+<?php endforeach; ?>
+<?php endif; ?>
+			</tbody>
+		</table>
+<?php if (!count(Utils::$context['labels']) < 2): ?>
+		<div class="block righttext">
+			<input type="submit" name="save" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+			<input type="submit" name="delete" value="<?= Lang::getTxt('quickmod_delete_selected', file: 'General') ?>" data-confirm="<?= Lang::getTxt('pm_labels_delete', file: 'PersonalMessage') ?>" class="button you_sure">
+		</div>
+<?php endif; ?>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=manlabels" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_label_add_new', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<strong><label for="add_label"><?= Lang::getTxt('pm_label_name', file: 'PersonalMessage') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" id="add_label" name="label" value="" size="30" maxlength="30">
+				</dd>
+			</dl>
+			<input type="submit" name="add" value="<?= Lang::getTxt('pm_label_add_new', file: 'PersonalMessage') ?>" class="button floatright">
+		</div>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<br>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/pm_above.php b/Themes/default/templates/PersonalMessage/pm_above.php
new file mode 100644
index 00000000000..e7c90b7e5a0
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/pm_above.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is for stuff above the menu in the personal messages section
+ */
+?>
+	<div id="personal_messages"><?php /* Show the capacity bar, if available. */ ?><?php if (!empty(Utils::$context['limit_bar'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="floatleft"><?= Lang::getTxt('pm_capacity', file: 'PersonalMessage') ?></span>
+				<span class="floatleft capacity_bar">
+					<span class="<?= Utils::$context['limit_bar']['percent'] > 85 ? 'full' : (Utils::$context['limit_bar']['percent'] > 40 ? 'filled' : 'empty') ?>" style="width: <?= Utils::$context['limit_bar']['percent'] / 10 ?>em;"></span>
+				</span>
+				<span class="floatright<?= Utils::$context['limit_bar']['percent'] > 90 ? ' alert' : '' ?>"><?= Utils::$context['limit_bar']['text'] ?></span>
+			</h3>
+		</div><?php endif; ?><?php /* Message sent? Show a small indication. */ ?><?php if (isset(Utils::$context['pm_sent'])): ?>
+		<div class="infobox">
+			<?= Lang::getTxt('pm_sent', file: 'PersonalMessage') ?>
+		</div><?php endif; ?>
diff --git a/Themes/default/templates/PersonalMessage/pm_below.php b/Themes/default/templates/PersonalMessage/pm_below.php
new file mode 100644
index 00000000000..c10eb0e4075
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/pm_below.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Just the end of the index bar, nothing special.
+ */
+?>
+	</div><!-- #personal_messages -->
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/pm_popup.php b/Themes/default/templates/PersonalMessage/pm_popup.php
new file mode 100644
index 00000000000..72860a94ec6
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/pm_popup.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays a popup with information about your personal messages
+ */
+?>
+
+<?php /* Unlike almost every other template, this is designed to be included into the HTML directly via $().load() */ ?>
+		<div class="pm_bar">
+			<div class="pm_sending block">
+				<?= Utils::$context['can_send_pm'] ? '<a href="' . Config::$scripturl . '?action=pm;sa=send">' . Lang::getTxt('pm_new_short', file: 'PersonalMessage') . '</a>' : '' ?>
+				<?= Utils::$context['can_draft'] ? ' | <a href="' . Config::$scripturl . '?action=pm;f=drafts">' . Lang::getTxt('pm_drafts_short', file: 'PersonalMessage') . '</a>' : '' ?>
+				<a href="<?= Config::$scripturl ?>?action=pm;sa=settings" class="floatright"><?= Lang::getTxt('pm_settings_short', file: 'PersonalMessage') ?></a>
+			</div>
+			<div class="pm_mailbox centertext">
+				<a href="<?= Config::$scripturl ?>?action=pm;f=inbox" class="button"><?= Lang::getTxt('inbox', file: 'PersonalMessage') ?></a>
+				<a href="<?= Config::$scripturl ?>?action=pm;f=sent" class="button"><?= Lang::getTxt('sent_items', file: 'PersonalMessage') ?></a>
+			</div>
+		</div>
+		<div class="pm_unread">
+<?php if (empty(Utils::$context['unread_pms'])): ?>
+			<div class="no_unread"><?= Lang::getTxt('pm_no_unread', file: 'PersonalMessage') ?></div>
+<?php else: ?>
+<?php foreach (Utils::$context['unread_pms'] as $id_pm => $pm_details): ?>
+			<div class="unread_notify">
+				<div class="unread_notify_image">
+					<?= !empty($pm_details['member']) ? $pm_details['member']['avatar']['image'] : '' ?>
+				</div>
+				<div class="details">
+					<div class="subject"><?= $pm_details['pm_link'] ?></div>
+					<div class="sender">
+						<?= $pm_details['replied_to_you'] ? '<span class="main_icons replied centericon" style="margin-right: 4px" title="' . Lang::getTxt('pm_you_were_replied_to', file: 'PersonalMessage') . '"></span>' : '<span class="main_icons im_off centericon" style="margin-right: 4px" title="' . Lang::getTxt('pm_was_sent_to_you', file: 'PersonalMessage') . '"></span>' ?><?= !empty($pm_details['member']) ? $pm_details['member']['link'] : $pm_details['member_from'] ?> - <?= $pm_details['time'] ?>
+					</div>
+				</div>
+			</div>
+<?php endforeach; ?>
+<?php endif; ?>
+		</div><!-- #pm_unread -->
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/prune.php b/Themes/default/templates/PersonalMessage/prune.php
new file mode 100644
index 00000000000..2022dab6ee8
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/prune.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template asks the user what messages they want to prune.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_prune', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=pm;sa=prune" method="post" accept-charset="UTF-8" onsubmit="return confirm('<?= Lang::getTxt('pm_prune_warning', file: 'PersonalMessage') ?>');">
+				<p><?= Lang::getTxt('pm_prune_desc1', file: 'PersonalMessage') ?> <input type="text" name="age" size="3" value="14"> <?= Lang::getTxt('pm_prune_desc2', file: 'PersonalMessage') ?></p>
+				<input type="submit" value="<?= Lang::getTxt('delete', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Config::$scripturl ?>?action=pm;sa=removeall2" method="post" onsubmit="return confirm('<?= Lang::getTxt('pm_remove_all_warning', file: 'PersonalMessage') ?>');">
+				<p><?= Lang::getTxt('pm_remove_all', file: 'PersonalMessage') ?></p>
+				<input type="submit" value="<?= Lang::getTxt('delete_all_prune', file: 'PersonalMessage') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</form>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/report_message.php b/Themes/default/templates/PersonalMessage/report_message.php
new file mode 100644
index 00000000000..768ddaac9fb
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/report_message.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for reporting a personal message.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=report;l=<?= Utils::$context['current_label_id'] ?>" method="post" accept-charset="UTF-8">
+		<input type="hidden" name="pmsg" value="<?= Utils::$context['pm_id'] ?>">
+		<div class="information">
+			<?= Lang::getTxt('pm_report_desc', file: 'PersonalMessage') ?>
+		</div>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_report_title', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<dl class="settings">
+<?php
+// If there is more than one admin on the forum, allow the user to choose the one they want to direct to.
+// @todo Why?
+?>
+<?php if (Utils::$context['admin_count'] > 1): ?>
+				<dt>
+					<strong><?= Lang::getTxt('pm_report_admins', file: 'PersonalMessage') ?></strong>
+				</dt>
+				<dd>
+					<select name="id_admin">
+						<option value="0"><?= Lang::getTxt('pm_report_all_admins', file: 'PersonalMessage') ?></option>
+<?php foreach (Utils::$context['admins'] as $id => $name): ?>
+						<option value="<?= $id ?>"><?= $name ?></option>
+<?php endforeach; ?>
+					</select>
+				</dd>
+<?php endif; ?>
+				<dt>
+					<strong><?= Lang::getTxt('pm_report_reason', file: 'PersonalMessage') ?></strong>
+				</dt>
+				<dd>
+					<textarea name="reason" rows="4" cols="70" style="width: 80%;"></textarea>
+				</dd>
+			</dl>
+			<div class="righttext">
+				<input type="submit" name="report" value="<?= Lang::getTxt('pm_report_message', file: 'PersonalMessage') ?>" class="button">
+			</div>
+		</div><!-- .windowbg -->
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/report_message_complete.php b/Themes/default/templates/PersonalMessage/report_message_complete.php
new file mode 100644
index 00000000000..6e67000308b
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/report_message_complete.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Little template just to say "Yep, it's been submitted"
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_report_title', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('pm_report_done', file: 'PersonalMessage') ?></p>
+			<a href="<?= Config::$scripturl ?>?action=pm;l=<?= Utils::$context['current_label_id'] ?>"><?= Lang::getTxt('pm_report_return', file: 'PersonalMessage') ?></a>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/rules.php b/Themes/default/templates/PersonalMessage/rules.php
new file mode 100644
index 00000000000..4207042dbcc
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/rules.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Manage rules.
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=manrules" method="post" accept-charset="UTF-8" name="manRules" id="manrules">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_manage_rules', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('pm_manage_rules_desc', file: 'PersonalMessage') ?>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext">
+						<?= Lang::getTxt('pm_rule_title', file: 'PersonalMessage') ?>
+					</th>
+					<th class="centertext table_icon">
+<?php if (!empty(Utils::$context['rules'])): ?>
+						<input type="checkbox" onclick="invertAll(this, this.form);">
+<?php endif; ?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+<?php if (empty(Utils::$context['rules'])): ?>
+				<tr class="windowbg">
+					<td colspan="2">
+						<?= Lang::getTxt('pm_rules_none', file: 'PersonalMessage') ?>
+					</td>
+				</tr>
+<?php endif; ?>
+<?php foreach (Utils::$context['rules'] as $rule): ?>
+				<tr class="windowbg">
+					<td>
+						<a href="<?= Config::$scripturl ?>?action=pm;sa=manrules;add;rid=<?= $rule['id'] ?>"><?= $rule['name'] ?></a>
+					</td>
+					<td class="table_icon">
+						<input type="checkbox" name="delrule[<?= $rule['id'] ?>]">
+					</td>
+				</tr>
+<?php endforeach; ?>
+			</tbody>
+		</table>
+		<div class="righttext">
+			<a class="button" href="<?= Config::$scripturl ?>?action=pm;sa=manrules;add;rid=0"><?= Lang::getTxt('pm_add_rule', file: 'PersonalMessage') ?></a>
+<?php if (!empty(Utils::$context['rules'])): ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="submit" name="delselected" value="<?= Lang::getTxt('pm_delete_selected_rule', file: 'PersonalMessage') ?>" data-confirm="<?= Lang::getTxt('pm_js_delete_rule_confirm', file: 'PersonalMessage') ?>" class="button smalltext you_sure">
+<?php endif; ?>
+<?php if (!empty(Utils::$context['rules'])): ?>
+			<a href="<?= Config::$scripturl ?>?action=pm;sa=manrules;apply;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" data-confirm="<?= Lang::getTxt('pm_js_apply_rules_confirm', file: 'PersonalMessage') ?>" class="button you_sure"><?= Lang::getTxt('pm_apply_rules', file: 'PersonalMessage') ?></a>
+<?php endif; ?>
+		</div>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/search.php b/Themes/default/templates/PersonalMessage/search.php
new file mode 100644
index 00000000000..7a92f19ef40
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/search.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for the PM search feature
+ */
+?><?php if (!empty(Utils::$context['search_errors'])): ?>
+		<div class="errorbox">
+			<?= implode('<br>', Utils::$context['search_errors']['messages']) ?>
+		</div><?php endif; ?>
+	<form action="<?= Config::$scripturl ?>?action=pm;sa=search2" method="post" accept-charset="UTF-8" name="searchform" id="searchform">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_search_title', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div id="advanced_search" class="roundframe">
+			<input type="hidden" name="advanced" value="1">
+			<dl id="search_options" class="settings">
+				<dt>
+					<strong><label for="searchfor"><?= Lang::getTxt('pm_search_text', file: 'PersonalMessage') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="search" name="search"<?= !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '' ?> size="40">
+					<script>
+						window.addEventListener("load", initSearch, false);
+					</script>
+				</dd>
+				<dt>
+					<label for="searchtype"><?= Lang::getTxt('search_match', file: 'General') ?></label>
+				</dt>
+				<dd>
+					<select name="searchtype">
+						<option value="1"<?= empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '' ?>><?= Lang::getTxt('pm_search_match_all', file: 'PersonalMessage') ?></option>
+						<option value="2"<?= !empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '' ?>><?= Lang::getTxt('pm_search_match_any', file: 'PersonalMessage') ?></option>
+					</select>
+				</dd>
+				<dt>
+					<label for="userspec"><?= Lang::getTxt('pm_search_user', file: 'PersonalMessage') ?></label>
+				</dt>
+				<dd>
+					<input type="text" name="userspec" value="<?= empty(Utils::$context['search_params']['userspec']) ? '*' : Utils::$context['search_params']['userspec'] ?>" size="40">
+				</dd>
+				<dt>
+					<label for="sort"><?= Lang::getTxt('pm_search_order', file: 'PersonalMessage') ?></label>
+				</dt>
+				<dd>
+					<select name="sort">
+						<option value="relevance|desc"><?= Lang::getTxt('pm_search_orderby_relevant_first', file: 'PersonalMessage') ?></option>
+						<option value="id_pm|desc"><?= Lang::getTxt('pm_search_orderby_recent_first', file: 'PersonalMessage') ?></option>
+						<option value="id_pm|asc"><?= Lang::getTxt('pm_search_orderby_old_first', file: 'PersonalMessage') ?></option>
+					</select>
+				</dd>
+				<dt class="options">
+					<?= Lang::getTxt('pm_search_options', file: 'PersonalMessage') ?>
+				</dt>
+				<dd class="options">
+					<label for="show_complete">
+						<input type="checkbox" name="show_complete" id="show_complete" value="1"<?= !empty(Utils::$context['search_params']['show_complete']) ? ' checked' : '' ?>> <?= Lang::getTxt('pm_search_show_complete', file: 'PersonalMessage') ?>
+					</label><br>
+					<label for="subject_only">
+						<input type="checkbox" name="subject_only" id="subject_only" value="1"<?= !empty(Utils::$context['search_params']['subject_only']) ? ' checked' : '' ?>> <?= Lang::getTxt('pm_search_subject_only', file: 'PersonalMessage') ?>
+					</label>
+				</dd>
+				<dt class="between">
+					<?= Lang::getTxt('pm_search_post_age', file: 'PersonalMessage') ?>
+				</dt>
+				<dd>
+					<?= Lang::getTxt(
+		'pm_search_age_range',
+		[
+			'min' => '<input type="number" name="minage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['minage']) ? '0' : Utils::$context['search_params']['minage']) . '">',
+			'max' => '<input type="number" name="maxage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['maxage']) ? '9999' : Utils::$context['search_params']['maxage']) . '">',
+		],
+		file: 'PersonalMessage',
+	) ?>
+				</dd>
+			</dl><?php if (!Utils::$context['currently_using_labels']): ?>
+				<input type="submit" name="pm_search" value="<?= Lang::getTxt('pm_search_go', file: 'PersonalMessage') ?>" class="button floatright"><?php endif; ?>
+		</div><!-- .roundframe --><?php /* Do we have some labels setup? If so offer to search by them! */ ?><?php if (Utils::$context['currently_using_labels']): ?>
+		<fieldset class="labels">
+			<div class="roundframe alt">
+				<div class="title_bar">
+					<h3 class="titlebg">
+						<a href="#" id="advanced_panel_link"><?= Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage') ?></a>
+					</h3>
+					<span id="advanced_panel_toggle" class="toggle_up" style="display: none;"></span>
+				</div>
+				<div id="advanced_panel_div">
+					<ul id="search_labels"><?php foreach (Utils::$context['search_labels'] as $label): ?>
+						<li>
+							<label for="searchlabel_<?= $label['id'] ?>"><input type="checkbox" id="searchlabel_<?= $label['id'] ?>" name="searchlabel[<?= $label['id'] ?>]" value="<?= $label['id'] ?>"<?= $label['checked'] ? ' checked' : '' ?>>
+							<?= $label['name'] ?></label>
+						</li><?php endforeach; ?>
+					</ul>
+				</div>
+				<br class="clear">
+				<div class="padding">
+					<input type="checkbox" name="all" id="check_all" value=""<?= Utils::$context['check_all'] ? ' checked' : '' ?> onclick="invertAll(this, this.form, 'searchlabel');">
+					<label for="check_all"><em><?= Lang::getTxt('check_all', file: 'General') ?></em></label>
+					<input type="submit" name="pm_search" value="<?= Lang::getTxt('pm_search_go', file: 'PersonalMessage') ?>" class="button floatright">
+				</div class="padding">
+			</div><!-- .roundframe -->
+		</fieldset><?php /* Some javascript for the advanced toggling */ ?>
+		<script>
+			var oAdvancedPanelToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: true,
+				aSwappableContainers: [
+					'advanced_panel_div'
+				],
+				aSwapImages: [
+					{
+						sId: 'advanced_panel_toggle',
+						altExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('hide', file: 'General')) ?>,
+						altCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show', file: 'General')) ?>
+
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'advanced_panel_link',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('pm_search_choose_label', file: 'PersonalMessage')) ?>
+
+					}
+				]
+			});
+		</script><?php endif; ?>
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/search_results.php b/Themes/default/templates/PersonalMessage/search_results.php
new file mode 100644
index 00000000000..bd2c0650f94
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/search_results.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays results from a PM search
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_search_results', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="roundframe noup">
+			<?= Lang::getTxt('pm_search_results_info', [Utils::$context['num_results'], Lang::sentenceList(Utils::$context['search_in'])], file: 'PersonalMessage') ?>
+		</div>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php /* Complete results? */ ?><?php if (empty(Utils::$context['search_params']['show_complete']) && !empty(Utils::$context['personal_messages'])): ?>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext quarter_table"><?= Lang::getTxt('date', file: 'General') ?></th>
+					<th class="lefttext half_table"><?= Lang::getTxt('subject', file: 'General') ?></th>
+					<th class="lefttext quarter_table"><?= Lang::getTxt('from', file: 'General') ?></th>
+				</tr>
+			</thead>
+			<tbody><?php endif; ?><?php /* Print each message out... */ ?><?php foreach (Utils::$context['personal_messages'] as $message): ?><?php /* Are we showing it all? */ ?><?php if (!empty(Utils::$context['search_params']['show_complete'])): ?><?php $this->subTemplate('single_pm', ['message' => $message]); ?><?php /* Otherwise just a simple list! */ ?><?php else: ?>
+				<tr class="windowbg">
+					<td><?= $message['time'] ?></td>
+					<td><?= $message['link'] ?></td>
+					<td><?= $message['member']['link'] ?></td>
+				</tr><?php endif; ?><?php endforeach; ?><?php /* Finish off the page... */ ?><?php if (empty(Utils::$context['search_params']['show_complete']) && !empty(Utils::$context['personal_messages'])): ?>
+			</tbody>
+		</table><?php endif; ?><?php /* No results? */ ?><?php if (empty(Utils::$context['personal_messages'])): ?>
+		<div class="windowbg">
+			<p class="centertext"><?= Lang::getTxt('pm_search_none_found', file: 'PersonalMessage') ?></p>
+		</div><?php endif; ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/send.php b/Themes/default/templates/PersonalMessage/send.php
new file mode 100644
index 00000000000..1795bd0a47b
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/send.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for sending a new PM
+ */
+?><?php /* Show which messages were sent successfully and which failed. */ ?><?php if (!empty(Utils::$context['send_log'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_send_report', file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg noup"><?php if (!empty(Utils::$context['send_log']['sent'])): ?><?php foreach (Utils::$context['send_log']['sent'] as $log_entry): ?>
+			<span class="error"><?= $log_entry ?></span><br><?php endforeach; ?><?php endif; ?><?php if (!empty(Utils::$context['send_log']['failed'])): ?><?php foreach (Utils::$context['send_log']['failed'] as $log_entry): ?>
+			<span class="error"><?= $log_entry ?></span><br><?php endforeach; ?><?php endif; ?>
+		</div>
+		<br><?php endif; ?><?php /* Show the preview of the personal message. */ ?>
+		<div id="preview_section"<?= isset(Utils::$context['preview_message']) ? '' : ' class="hidden"' ?>>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span id="preview_subject"><?= empty(Utils::$context['preview_subject']) ? '' : Utils::$context['preview_subject'] ?></span>
+				</h3>
+			</div>
+			<div class="windowbg noup">
+				<div class="post" id="preview_body">
+					<?= empty(Utils::$context['preview_message']) ? '<br>' : Utils::adjustHeadingLevels(Utils::$context['preview_message'], 3) ?>
+				</div>
+			</div>
+			<br class="clear">
+		</div><?php /* Main message editing box. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=pm;sa=send2" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" class="flow_hidden" onsubmit="submitonce(this);">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="main_icons inbox icon" title="<?= Lang::getTxt('new_message', file: 'PersonalMessage') ?>"></span> <?= Lang::getTxt('new_message', file: 'PersonalMessage') ?>
+				</h3>
+			</div>
+			<div class="roundframe noup"><?php /* If there were errors for sending the PM, show them. */ ?>
+				<div class="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox' ?><?= empty(Utils::$context['post_error']['messages']) ? ' hidden' : '' ?>" id="errors">
+					<dl>
+						<dt>
+							<strong id="error_serious"><?= Lang::getTxt('error_while_submitting', file: 'General') ?></strong>
+						</dt>
+						<dd class="error" id="error_list">
+							<?= empty(Utils::$context['post_error']['messages']) ? '' : implode('<br>', Utils::$context['post_error']['messages']) ?>
+						</dd>
+					</dl>
+				</div><?php if (!empty(Config::$modSettings['drafts_pm_enabled'])): ?>
+				<div id="draft_section" class="infobox"<?= isset(Utils::$context['draft_saved']) ? '' : ' style="display: none;"' ?>><?= Lang::getTxt('draft_pm_saved', ['url' => Config::$scripturl . '?action=pm;sa=showpmdrafts'], file: 'Drafts') ?>
+					<?= (!empty(Config::$modSettings['drafts_keep_days']) ? ' <strong>' . Lang::getTxt('draft_save_warning', [Config::$modSettings['drafts_keep_days']], file: 'Drafts') . '</strong>' : '') ?>
+				</div><?php endif; ?>
+				<dl id="post_header"><?php /* To and bcc. Include a button to search for members. */ ?>
+					<dt>
+						<label<?= (isset(Utils::$context['post_error']['no_to']) || isset(Utils::$context['post_error']['bad_to']) ? ' class="error"' : '') ?> for="to_control" id="caption_to"><?= trim(Lang::getTxt('pm_to', ['list' => ''], file: 'PersonalMessage')) ?></label>
+					</dt><?php /* Autosuggest will be added by the JavaScript later on. */ ?>
+					<dd id="pm_to" class="clear_right">
+						<input type="text" name="to" id="to_control" value="<?= Utils::$context['to_value'] ?>" size="20"><?php /* A link to add BCC, only visible with JavaScript enabled. */ ?>
+						<span class="smalltext" id="bcc_link_container" style="display: none;"></span><?php /* A div that'll contain the items found by the autosuggest. */ ?>
+						<div id="to_item_list_container"></div>
+					</dd><?php /* This BCC row will be hidden by default if JavaScript is enabled. */ ?>
+					<dt  class="clear_left" id="bcc_div">
+						<label<?= (isset(Utils::$context['post_error']['no_to']) || isset(Utils::$context['post_error']['bad_bcc']) ? ' class="error"' : '') ?> for="bcc_control" id="caption_bbc"><?= trim(Lang::getTxt('pm_bcc', ['list' => ''], file: 'PersonalMessage')) ?></label>
+					</dt>
+					<dd id="bcc_div2">
+						<input type="text" name="bcc" id="bcc_control" value="<?= Utils::$context['bcc_value'] ?>" size="20">
+						<div id="bcc_item_list_container"></div>
+					</dd><?php /* The subject of the PM. */ ?>
+					<dt class="clear_left">
+						<label<?= (isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '') ?> for="subject" id="caption_subject"><?= Lang::getTxt('subject', file: 'General') ?></label>
+					</dt>
+					<dd id="pm_subject">
+						<input type="text" name="subject" id="subject" value="<?= Utils::$context['subject'] ?>" size="80" maxlength="80"<?= isset(Utils::$context['post_error']['no_subject']) ? ' class="error"' : '' ?>>
+					</dd>
+				</dl><?php $this->subTemplate('control_richedit', ['editor_id' => Utils::$context['post_box_name'], 'smiley_container' => true, 'bbc_container' => true]); ?><?php /* If the admin enabled the pm drafts feature, show a draft selection box */ ?><?php if (!empty(Utils::$context['drafts_save']) && !empty(Utils::$context['drafts']) && !empty(Theme::$current->options['drafts_show_saved_enabled'])): ?>
+				<div id="post_draft_options_header" class="title_bar">
+					<h4 class="titlebg">
+						<strong><a href="#" id="postDraftExpandLink"><?= Lang::getTxt('drafts_show', file: 'Drafts') ?></a></strong>
+					</h4>
+					<span id="postDraftExpand" class="toggle_up" style="display: none;"></span>
+				</div>
+				<div id="post_draft_options">
+					<dl class="settings">
+						<dt><strong><?= Lang::getTxt('subject', file: 'General') ?></strong></dt>
+						<dd><strong><?= trim(Lang::getTxt('draft_saved_on', ['date' => ''], file: 'Drafts')) ?></strong></dd><?php foreach (Utils::$context['drafts'] as $draft): ?>
+						<dt><?= $draft['link'] ?></dt>
+						<dd><?= $draft['poster_time'] ?></dd><?php endforeach; ?>
+					</dl>
+				</div><?php endif; ?><?php /* Require an image to be typed to save spamming? */ ?><?php if (Utils::$context['require_verification']): ?>
+				<div class="post_verification">
+					<strong><?= Lang::getTxt('pm_visual_verification_label', file: 'PersonalMessage') ?></strong>
+					<?php $this->subTemplate('control_verification', ['verify_id' => Utils::$context['visual_verification_id'], 'display_type' => 'all']); ?>
+				</div><?php endif; ?><?php /* Send, Preview, spellcheck buttons. */ ?>
+				<span id="post_confirm_buttons">
+					<?php $this->subTemplate('control_richedit_buttons', ['editor_id' => Utils::$context['post_box_name']]); ?>
+				</span>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="seqnum" value="<?= Utils::$context['form_sequence_number'] ?>">
+				<input type="hidden" name="replied_to" value="<?= !empty(Utils::$context['quoted_message']['id']) ? Utils::$context['quoted_message']['id'] : 0 ?>">
+				<input type="hidden" name="pm_head" value="<?= !empty(Utils::$context['quoted_message']['pm_head']) ? Utils::$context['quoted_message']['pm_head'] : 0 ?>">
+				<input type="hidden" name="f" value="<?= Utils::$context['folder'] ?? '' ?>">
+				<input type="hidden" name="l" value="<?= Utils::$context['current_label_id'] ?? -1 ?>">
+				<br class="clear_right">
+			</div><!-- .roundframe -->
+		</form>
+		<script><?php /* The functions used to preview a personal message without loading a new page. */ ?>
+
+			var txt_preview_title = "<?= Lang::getTxt('preview_title', file: 'General') ?>";
+			var txt_preview_fetch = "<?= Lang::getTxt('preview_fetch', file: 'General') ?>";
+			function previewPost()
+			{
+				if (window.XMLHttpRequest)
+				{
+					// Opera didn't support setRequestHeader() before 8.01.
+					// @todo Remove support for old browsers
+					if ('opera' in window)
+					{
+						var test = new XMLHttpRequest();
+						if (!('setRequestHeader' in test))
+							return submitThisOnce(document.forms.postmodify);
+					}
+					// @todo Currently not sending poll options and option checkboxes.
+					var x = new Array();
+					var textFields = ['subject', <?= Utils::escapeJavaScript(Utils::$context['post_box_name']) ?>, 'to', 'bcc'];
+					var numericFields = ['recipient_to[]', 'recipient_bcc[]'];
+					var checkboxFields = [];
+
+					for (var i = 0, n = textFields.length; i < n; i++)
+						if (textFields[i] in document.forms.postmodify)
+						{
+							// Handle the WYSIWYG editor.
+							if (textFields[i] == <?= Utils::escapeJavaScript(Utils::$context['post_box_name']) ?> && <?= Utils::escapeJavaScript('oEditorHandle_' . Utils::$context['post_box_name']) ?> in window && oEditorHandle_<?= Utils::$context['post_box_name'] ?>.bRichTextEnabled)
+								x[x.length] = 'message_mode=1&' + textFields[i] + '=' + oEditorHandle_<?= Utils::$context['post_box_name'] ?>.getText(false).php_to8bit().php_urlencode();
+							else
+								x[x.length] = textFields[i] + '=' + document.forms.postmodify[textFields[i]].value.php_to8bit().php_urlencode();
+						}
+					for (var i = 0, n = numericFields.length; i < n; i++)
+						if (numericFields[i] in document.forms.postmodify && 'value' in document.forms.postmodify[numericFields[i]])
+							x[x.length] = numericFields[i] + '=' + parseInt(document.forms.postmodify.elements[numericFields[i]].value);
+					for (var i = 0, n = checkboxFields.length; i < n; i++)
+						if (checkboxFields[i] in document.forms.postmodify && document.forms.postmodify.elements[checkboxFields[i]].checked)
+							x[x.length] = checkboxFields[i] + '=' + document.forms.postmodify.elements[checkboxFields[i]].value;
+
+					sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=pm;sa=send2;preview;xml', x.join('&'), onDocSent);
+
+					document.getElementById('preview_section').style.display = '';
+					setInnerHTML(document.getElementById('preview_subject'), txt_preview_title);
+					setInnerHTML(document.getElementById('preview_body'), txt_preview_fetch);
+
+					return false;
+				}
+				else
+					return submitThisOnce(document.forms.postmodify);
+			}
+			function onDocSent(XMLDoc)
+			{
+				if (!XMLDoc)
+				{
+					document.forms.postmodify.preview.onclick = new function ()
+					{
+						return true;
+					}
+					document.forms.postmodify.preview.click();
+				}
+
+				// Show the preview section.
+				var preview = XMLDoc.getElementsByTagName('smf')[0].getElementsByTagName('preview')[0];
+				setInnerHTML(document.getElementById('preview_subject'), preview.getElementsByTagName('subject')[0].firstChild.nodeValue);
+
+				var bodyText = '';
+				for (var i = 0, n = preview.getElementsByTagName('body')[0].childNodes.length; i < n; i++)
+					bodyText += preview.getElementsByTagName('body')[0].childNodes[i].nodeValue;
+
+				setInnerHTML(document.getElementById('preview_body'), bodyText);
+				document.getElementById('preview_body').className = 'post';
+
+				// Show a list of errors (if any).
+				var errors = XMLDoc.getElementsByTagName('smf')[0].getElementsByTagName('errors')[0];
+				var errorList = new Array();
+				for (var i = 0, numErrors = errors.getElementsByTagName('error').length; i < numErrors; i++)
+					errorList[errorList.length] = errors.getElementsByTagName('error')[i].firstChild.nodeValue;
+				document.getElementById('errors').style.display = numErrors == 0 ? 'none' : '';
+				setInnerHTML(document.getElementById('error_list'), numErrors == 0 ? '' : errorList.join('<br>'));
+
+				// Adjust the color of captions if the given data is erroneous.
+				var captions = errors.getElementsByTagName('caption');
+				for (var i = 0, numCaptions = errors.getElementsByTagName('caption').length; i < numCaptions; i++)
+					if (document.getElementById('caption_' + captions[i].getAttribute('name')))
+						document.getElementById('caption_' + captions[i].getAttribute('name')).className = captions[i].getAttribute('class');
+
+				if (errors.getElementsByTagName('post_error').length == 1)
+					document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>.style.border = '1px solid red';
+				else if (document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor == 'red' || document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor == 'red red red red')
+				{
+					if ('runtimeStyle' in document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>)
+						document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>.style.borderColor = '';
+					else
+						document.forms.postmodify.<?= Utils::$context['post_box_name'] ?>.style.border = null;
+				}
+				location.hash = '#' + 'preview_section';
+			}<?php /* Code for showing and hiding drafts */ ?><?php if (!empty(Utils::$context['drafts'])): ?>
+
+			var oSwapDraftOptions = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: true,
+				aSwappableContainers: [
+					'post_draft_options',
+				],
+				aSwapImages: [
+					{
+						sId: 'postDraftExpand',
+						altExpanded: '-',
+						altCollapsed: '+'
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'postDraftExpandLink',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('draft_hide', file: 'Drafts')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('drafts_show', file: 'Drafts')) ?>
+
+					}
+				]
+			});<?php endif; ?>
+
+		</script><?php /* Show the message you're replying to. */ ?><?php if (Utils::$context['reply']): ?>
+		<br><br>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('pm_subject', Utils::$context['quoted_message'], file: 'PersonalMessage') ?></h3>
+		</div>
+		<div class="windowbg">
+			<div class="clear">
+				<span class="smalltext floatright"><?= Utils::$context['quoted_message']['time'] ?></span>
+				<?= Lang::getTxt('pm_from', ['member' => Utils::$context['quoted_message']['member']['link']], file: 'PersonalMessage') ?>
+			</div>
+			<hr>
+			<?= Utils::adjustHeadingLevels(Utils::$context['quoted_message']['body'], 3) ?>
+		</div>
+		<br class="clear"><?php endif; ?>
+		<script>
+			var oPersonalMessageSend = new smf_PersonalMessageSend({
+				sSessionId: smf_session_id,
+				sSessionVar: smf_session_var,
+				sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+				sToControlId: 'to_control',
+				aToRecipients: [<?php foreach (Utils::$context['recipients']['to'] as $i => $member): ?>
+
+					{
+						sItemId: <?= Utils::escapeJavaScript($member['id']) ?>,
+						sItemName: <?= Utils::escapeJavaScript($member['name']) ?>
+
+					}<?= $i == count(Utils::$context['recipients']['to']) - 1 ? '' : ',' ?><?php endforeach; ?>
+
+				],
+				aBccRecipients: [<?php foreach (Utils::$context['recipients']['bcc'] as $i => $member): ?>
+
+					{
+						sItemId: <?= Utils::escapeJavaScript($member['id']) ?>,
+						sItemName: <?= Utils::escapeJavaScript($member['name']) ?>
+
+					}<?= $i == count(Utils::$context['recipients']['bcc']) - 1 ? '' : ',' ?><?php endforeach; ?>
+
+				],
+				sBccControlId: 'bcc_control',
+				sBccDivId: 'bcc_div',
+				sBccDivId2: 'bcc_div2',
+				sBccLinkId: 'bcc_link',
+				sBccLinkContainerId: 'bcc_link_container',
+				bBccShowByDefault: <?= empty(Utils::$context['recipients']['bcc']) && empty(Utils::$context['bcc_value']) ? 'false' : 'true' ?>,
+				sShowBccLinkTemplate: <?= Utils::escapeJavaScript(
+		'
+					<a href="#" id="bcc_link">' . Lang::getTxt('make_bcc', file: 'PersonalMessage') . '</a> <a href="' . Config::$scripturl . '?action=helpadmin;help=pm_bcc" onclick="return reqOverlayDiv(this.href);">(?)</a>',
+	) ?>
+
+			});
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/showPMDrafts.php b/Themes/default/templates/PersonalMessage/showPMDrafts.php
new file mode 100644
index 00000000000..0cf53bc1db5
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/showPMDrafts.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing all of a user's PM drafts.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons inbox"></span> <?= Lang::getTxt('drafts_show', file: 'Drafts') ?>
+			</h3>
+		</div>
+		<p class="information">
+			<?= Lang::getTxt('drafts_show_desc', file: 'Drafts') ?>
+		</p><?php /* No drafts? Just show an informative message. */ ?><?php if (empty(Utils::$context['drafts'])): ?>
+		<div class="windowbg centertext">
+			<?= Lang::getTxt('draft_none', file: 'Drafts') ?>
+		</div><?php else: ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php /* For every draft to be displayed, give it its own div, and show the important details of the draft. */ ?><?php foreach (Utils::$context['drafts'] as $draft): ?>
+		<div class="windowbg">
+			<div class="page_number floatright"> #<?= $draft['counter'] ?></div>
+			<div class="topic_details">
+				<h4>
+					<strong><?= $draft['subject'] ?></strong>
+				</h4>
+				<div class="smalltext">
+					<div class="recipient_to"><?= Lang::getTxt('pm_to', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $draft['recipients']['to'])]) ?></div><?php if (!empty($draft['recipients']['bcc'])): ?>
+					<div class="pm_bbc"><?= Lang::getTxt('pm_bcc', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $draft['recipients']['bcc'])]) ?></div><?php endif; ?>
+				</div>
+				<div class="smalltext">
+					<?= Lang::getTxt('draft_last_saved', ['age' => $draft['age'], 'remaining' => $draft['remaining']], file: 'Drafts') ?>
+				</div>
+			</div>
+			<div class="list_posts">
+				<?= Utils::adjustHeadingLevels($draft['body'], 4) ?>
+			</div><?php /* Draft buttons */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $draft['quickbuttons'], 'list_class' => 'pm_drafts']); ?>
+		</div><!-- .windowbg --><?php endforeach; ?><?php /* Show page numbers. */ ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php endif; ?>
diff --git a/Themes/default/templates/PersonalMessage/single_pm.php b/Themes/default/templates/PersonalMessage/single_pm.php
new file mode 100644
index 00000000000..820b838916f
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/single_pm.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for displaying a single personal message.
+ *
+ * @param array $message An array of information about the message to display.
+ */
+?>
+	<div class="windowbg" id="msg<?= $message['id'] ?>">
+		<div class="post_wrapper">
+			<div class="poster"><?php /* Are there any custom fields above the member name? */ ?><?php if (!empty($message['custom_fields']['above_member'])): ?>
+				<div class="custom_fields_above_member">
+					<ul class="nolist"><?php foreach ($message['custom_fields']['above_member'] as $custom): ?>
+						<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+					</ul>
+				</div><?php endif; ?>
+				<h4><?php /* Show online and offline buttons? */ ?><?php if (!empty(Config::$modSettings['onlineEnable']) && !$message['member']['is_guest']): ?>
+					<span class="<?= ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= $message['member']['online']['text'] ?>"></span><?php endif; ?><?php /* Custom fields BEFORE the username? */ ?><?php if (!empty($message['custom_fields']['before_member'])): ?><?php foreach ($message['custom_fields']['before_member'] as $custom): ?>
+					<span class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></span><?php endforeach; ?><?php endif; ?><?php /* Show a link to the member's profile. */ ?>
+		<?= $message['member']['link'] ?><?php /* Custom fields AFTER the username? */ ?><?php if (!empty($message['custom_fields']['after_member'])): ?><?php foreach ($message['custom_fields']['after_member'] as $custom): ?>
+					<span class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></span><?php endforeach; ?><?php endif; ?>
+				</h4>
+				<ul class="user_info"><?php /* Show the member's custom title, if they have one. */ ?><?php if (isset($message['member']['title']) && $message['member']['title'] != ''): ?>
+					<li class="title"><?= $message['member']['title'] ?></li><?php endif; ?><?php /* Show the member's primary group (like 'Administrator') if they have one. */ ?><?php if (isset($message['member']['group']) && $message['member']['group'] != ''): ?>
+					<li class="membergroup"><?= $message['member']['group'] ?></li><?php endif; ?><?php /* Show the user's avatar. */ ?><?php if (!empty(Config::$modSettings['show_user_images']) && empty(Theme::$current->options['show_no_avatars']) && !empty($message['member']['avatar']['image'])): ?>
+					<li class="avatar">
+						<a href="<?= Config::$scripturl ?>?action=profile;u=<?= $message['member']['id'] ?>"><?= $message['member']['avatar']['image'] ?></a>
+					</li><?php endif; ?><?php /* Are there any custom fields below the avatar? */ ?><?php if (!empty($message['custom_fields']['below_avatar'])): ?><?php foreach ($message['custom_fields']['below_avatar'] as $custom): ?>
+					<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php /* Don't show these things for guests. */ ?><?php if (!$message['member']['is_guest']): ?><?php /* Show the post group icons */ ?>
+					<li class="icons"><?= $message['member']['group_icons'] ?></li><?php /* Show the post group if and only if they have no other group or the option is on, and they are in a post group. */ ?><?php if ((empty(Config::$modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != ''): ?>
+					<li class="postgroup"><?= $message['member']['post_group'] ?></li><?php endif; ?><?php /* Show how many posts they have made. */ ?><?php if (!isset(Utils::$context['disabled_fields']['posts'])): ?>
+					<li class="postcount"><?= Lang::getTxt('member_postcount_num', [$message['member']['posts']], file: 'General') ?></li><?php endif; ?><?php /* Show their personal text? */ ?><?php if (!empty(Config::$modSettings['show_blurb']) && $message['member']['blurb'] != ''): ?>
+					<li class="blurb"><?= $message['member']['blurb'] ?></li><?php endif; ?><?php /* Any custom fields to show as icons? */ ?><?php if (!empty($message['custom_fields']['icons'])): ?>
+					<li class="im_icons">
+						<ol><?php foreach ($message['custom_fields']['icons'] as $custom): ?>
+							<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+						</ol>
+					</li><?php endif; ?><?php /* Show the IP to this user for this post - because you can moderate? */ ?><?php if (!empty(Utils::$context['can_moderate_forum']) && !empty($message['member']['ip'])): ?>
+					<li class="poster_ip">
+						<a href="<?= Config::$scripturl ?>?action=<?= !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'] ?>;searchip=<?= $message['member']['ip'] ?>"><?= $message['member']['ip'] ?></a> <a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
+					</li><?php /* Or, should we show it because this is you? */ ?><?php elseif ($message['can_see_ip']): ?>
+					<li class="poster_ip">
+						<a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help"><?= $message['member']['ip'] ?></a>
+					</li><?php /* Okay, you are logged in, then we can show something about why IPs are logged... */ ?><?php else: ?>
+					<li class="poster_ip">
+						<a href="<?= Config::$scripturl ?>?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help"><?= Lang::getTxt('logged', file: 'General') ?></a>
+					</li><?php endif; ?><?php /* Show the profile, website, email address, and personal message buttons. */ ?><?php if ($message['member']['show_profile_buttons']): ?>
+					<li class="profile">
+						<ol class="profile_icons"><?php /* Show the profile button */ ?><?php if ($message['member']['can_view_profile']): ?>
+							<li><a href="<?= $message['member']['href'] ?>" title="<?= Lang::getTxt('view_profile', file: 'General') ?>"><span class="main_icons members"></span></a></li><?php endif; ?><?php /* Don't show an icon if they haven't specified a website. */ ?><?php if ($message['member']['website']['url'] != '' && !isset(Utils::$context['disabled_fields']['website'])): ?>
+							<li><a href="<?= $message['member']['website']['url'] ?>" title="<?= $message['member']['website']['title'] ?>" target="_blank" rel="noopener"><span class="main_icons www centericon" title="<?= $message['member']['website']['title'] ?>"></span></a></li><?php endif; ?><?php /* Don't show the email address if they want it hidden. */ ?><?php if ($message['member']['show_email']): ?>
+							<li><a href="mailto:<?= $message['member']['email'] ?>" rel="nofollow"><span class="main_icons mail centericon" title="<?= Lang::getTxt('email', file: 'General') ?>"></span></a></li><?php endif; ?><?php /* Since we know this person isn't a guest, you *can* message them. */ ?><?php if (Utils::$context['can_send_pm'] && $message['member']['id'] != 0): ?>
+							<li><a href="<?= Config::$scripturl ?>?action=pm;sa=send;u=<?= $message['member']['id'] ?>" title="<?= Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') ?>"><span class="main_icons im_<?= ($message['member']['online']['is_online'] ? 'on' : 'off') ?> centericon" title="<?= Lang::getTxt($message['member']['online']['is_online'] ? 'pm_online' : 'pm_offline', file: 'General') ?>"></span></a></li><?php endif; ?>
+						</ol>
+					</li><?php endif; ?><?php /* Any custom fields for standard placement? */ ?><?php if (!empty($message['custom_fields']['standard'])): ?><?php foreach ($message['custom_fields']['standard'] as $custom): ?>
+					<li class="custom <?= $custom['col_name'] ?>"><?= $custom['title'] ?>: <?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php /* Are we showing the warning status? */ ?><?php if ($message['member']['can_see_warning']): ?>
+					<li class="warning"><?= Utils::$context['can_issue_warning'] ? '<a href="' . Config::$scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '' ?><span class="main_icons warning_<?= $message['member']['warning_status'] ?>"></span><?= Utils::$context['can_issue_warning'] ? '</a>' : '' ?><span class="warn_<?= $message['member']['warning_status'] ?>"><?= Lang::getTxt('warn_' . $message['member']['warning_status'], file: 'General') ?></span></li><?php endif; ?><?php /* Are there any custom fields to show at the bottom of the poster info? */ ?><?php if (!empty($message['custom_fields']['bottom_poster'])): ?><?php foreach ($message['custom_fields']['bottom_poster'] as $custom): ?>
+					<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?><?php endif; ?><?php endif; ?><?php /* Done with the information about the poster... on to the post itself. */ ?>
+				</ul>
+			</div><!-- .poster -->
+			<div class="postarea">
+				<div class="keyinfo">
+					<div id="subject_<?= $message['id'] ?>" class="subject_title">
+						<h5><?= $message['subject'] ?></h5>
+					</div>
+					<div class="postinfo"><?php /* Show who the message was sent to. */ ?>
+						<span class="smalltext"><?= Lang::getTxt(
+							'sent_to_date',
+							[
+								'list' => !empty($message['recipients']['to']) ? Lang::sentenceList($message['recipients']['to']) : Lang::getTxt('pm_undisclosed_recipients', file: 'PersonalMessage'),
+								'relative' => str_contains($message['time'], Lang::getTxt('today', file: 'General')) ? 'today' : (str_contains($message['time'], Lang::getTxt('yesterday', file: 'General')) ? 'yesterday' : 'false'),
+								'date' => $message['time'],
+							],
+							file: 'PersonalMessage',
+						) ?></span><?php /* If we're in the sent items, show who it was sent to besides the "To:" people. */ ?><?php if (!empty($message['recipients']['bcc'])): ?>
+						<span class="smalltext"><?= Lang::getTxt('pm_bcc', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', $message['recipients']['bcc'])]) ?> </span><?php endif; ?><?php if (!empty($message['is_replied_to'])): ?>
+						<span class="smalltext"><?= Lang::getTxt(Utils::$context['folder'] == 'sent' ? 'pm_sent_is_replied_to' : 'pm_is_replied_to', file: 'PersonalMessage') ?> </span><?php endif; ?>
+					</div><!-- .postinfo -->
+				</div><!-- .keyinfo -->
+				<div class="post">
+					<div class="inner" id="msg_<?= $message['id'] ?>">
+						<?= $message['body'] ?>
+					</div>
+				</div><!-- .post -->
+				<div class="under_message"><?php /* Add an extra line at the bottom if we have labels enabled. */ ?><?php if (Utils::$context['folder'] != 'sent' && !empty(Utils::$context['currently_using_labels']) && Utils::$context['display_mode'] != 2): ?>
+				<div class="labels floatleft"><?php /* Add the label drop down box. */ ?><?php if (!empty(Utils::$context['currently_using_labels'])): ?>
+					<select name="pm_actions[<?= $message['id'] ?>]" onchange="if (this.options[this.selectedIndex].value) form.submit();">
+						<option value=""><?= Lang::getTxt('pm_msg_label_title', file: 'PersonalMessage') ?></option>
+						<option value="" disabled>---------------</option><?php
+// Are there any labels which can be added to this?
+// The two lists below hold the same label IDs, so say which list
+// this one came from. That is what applyActions() reads, and what
+// loadLabelChoices() puts on the drop down for the whole folder.
+?><?php if (!$message['fully_labeled']): ?>
+						<option value="" disabled><?= Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage') ?></option><?php foreach (Utils::$context['labels'] as $label): ?><?php if (!isset($message['labels'][$label['id']])): ?>
+						<option value="add_<?= $label['id'] ?>"><?= $label['name'] ?></option><?php endif; ?><?php endforeach; ?><?php endif; ?><?php /* ... and are there any that can be removed? */ ?><?php if (!empty($message['labels']) && (count($message['labels']) > 1 || !isset($message['labels'][-1]))): ?>
+						<option value="" disabled><?= Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage') ?></option><?php foreach ($message['labels'] as $label): ?>
+						<option value="rem_<?= $label['id'] ?>">&nbsp;<?= $label['name'] ?></option><?php endforeach; ?><?php endif; ?>
+					</select>
+					<noscript>
+						<input type="submit" value="<?= Lang::getTxt('pm_apply', file: 'PersonalMessage') ?>" class="button">
+					</noscript><?php endif; ?>
+				</div><!-- .labels --><?php endif; ?><?php /* Message options */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $message['quickbuttons'], 'list_class' => 'pm']); ?>
+				</div><!-- .under_message -->
+			</div><!-- .postarea -->
+			<div class="moderatorbar"><?php /* Are there any custom profile fields for above the signature? */ ?><?php if (!empty($message['custom_fields']['above_signature'])): ?>
+				<div class="custom_fields_above_signature">
+					<ul class="nolist"><?php foreach ($message['custom_fields']['above_signature'] as $custom): ?>
+						<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+					</ul>
+				</div><?php endif; ?><?php /* Show the member's signature? */ ?><?php if (!empty($message['member']['signature']) && empty(Theme::$current->options['show_no_signatures']) && Utils::$context['signature_enabled']): ?>
+				<div class="signature">
+					<?= $message['member']['signature'] ?>
+				</div><?php endif; ?><?php /* Are there any custom profile fields for below the signature? */ ?><?php if (!empty($message['custom_fields']['below_signature'])): ?>
+				<div class="custom_fields_below_signature">
+					<ul class="nolist"><?php foreach ($message['custom_fields']['below_signature'] as $custom): ?>
+						<li class="custom <?= $custom['col_name'] ?>"><?= $custom['value'] ?></li><?php endforeach; ?>
+					</ul>
+				</div><?php endif; ?>
+			</div><!-- .moderatorbar -->
+		</div><!-- .post_wrapper -->
+	</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/PersonalMessage/subject_list.php b/Themes/default/templates/PersonalMessage/subject_list.php
new file mode 100644
index 00000000000..950a48b7a16
--- /dev/null
+++ b/Themes/default/templates/PersonalMessage/subject_list.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Just list all the personal message subjects - to make templates easier.
+ */
+?>
+	<div class="cat_bar">
+		<h3 class="catbg">
+			<?= Utils::$context['folder'] == 'sent' ? Lang::getTxt('sent_items', file: 'PersonalMessage') : Utils::$context['current_label'] ?>
+		</h3>
+	</div>
+	<table class="table_grid">
+		<thead>
+			<tr class="title_bar">
+				<th class="centercol table_icon pm_icon">
+					<a href="<?= Config::$scripturl ?>?action=pm;view;f=<?= Utils::$context['folder'] ?>;start=<?= Utils::$context['start'] ?>;sort=<?= Utils::$context['sort_by'] ?><?= (Utils::$context['sort_direction'] == 'up' ? '' : ';desc') ?><?= (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '') ?>"> <span class="main_icons switch" title="<?= Lang::getTxt('pm_change_view', file: 'PersonalMessage') ?>"></span></a>
+				</th>
+				<th class="lefttext quarter_table pm_time">
+					<a href="<?= Config::$scripturl ?>?action=pm;f=<?= Utils::$context['folder'] ?>;start=<?= Utils::$context['start'] ?>;sort=date<?= Utils::$context['sort_by'] == 'date' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?><?= Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '' ?>"><?= Lang::getTxt('date', file: 'General') ?><?= Utils::$context['sort_by'] == 'date' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a>
+				</th>
+				<th class="lefttext half_table pm_subject">
+					<a href="<?= Config::$scripturl ?>?action=pm;f=<?= Utils::$context['folder'] ?>;start=<?= Utils::$context['start'] ?>;sort=subject<?= Utils::$context['sort_by'] == 'subject' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?><?= Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '' ?>"><?= Lang::getTxt('subject', file: 'General') ?><?= Utils::$context['sort_by'] == 'subject' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a>
+				</th>
+				<th class="lefttext pm_from_to">
+					<a href="<?= Config::$scripturl ?>?action=pm;f=<?= Utils::$context['folder'] ?>;start=<?= Utils::$context['start'] ?>;sort=name<?= Utils::$context['sort_by'] == 'name' && Utils::$context['sort_direction'] == 'up' ? ';desc' : '' ?><?= Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '' ?>"><?= Lang::getTxt(Utils::$context['from_or_to'] == 'from' ? 'from' : 'to', file: 'General') ?><?= Utils::$context['sort_by'] == 'name' ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a>
+				</th>
+				<th class="centercol table_icon pm_moderation">
+					<input type="checkbox" onclick="invertAll(this, this.form);">
+				</th>
+			</tr>
+		</thead>
+		<tbody><?php if (!Utils::$context['show_delete']): ?>
+			<tr class="windowbg">
+				<td colspan="5"><?= Lang::getTxt('pm_alert_none', file: 'General') ?></td>
+			</tr><?php endif; ?><?php while ($message = Utils::$context['get_pmessage']('subject')): ?>
+			<tr class="windowbg<?= $message['is_unread'] ? ' unread_pm' : '' ?>">
+				<td class="table_icon pm_icon">
+					<script>
+						currentLabels[<?= $message['id'] ?>] = {<?php if (!empty($message['labels'])): ?><?php $first = true; ?><?php foreach ($message['labels'] as $label): ?><?= $first ? '' : ',' ?>
+
+				"<?= $label['id'] ?>": "<?= $label['name'] ?>"<?php $first = false; ?><?php endforeach; ?><?php endif; ?>
+
+						};
+					</script>
+					<?= $message['is_replied_to'] ? '<span class="main_icons replied" title="' . Lang::getTxt('pm_replied', file: 'PersonalMessage') . '"></span>' : '<span class="main_icons im_off" title="' . Lang::getTxt('pm_read', file: 'PersonalMessage') . '"></span>' ?>
+				</td>
+				<td class="pm_time"><?= $message['time'] ?></td>
+				<td class="pm_subject">
+					<?= (Utils::$context['display_mode'] != 0 && Utils::$context['current_pm'] == $message['id'] ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="*">' : '') ?><a href="<?= (Utils::$context['display_mode'] == 0 || Utils::$context['current_pm'] == $message['id'] ? '' : (Config::$scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . Utils::$context['folder'] . ';start=' . Utils::$context['start'] . ';sort=' . Utils::$context['sort_by'] . (Utils::$context['sort_direction'] == 'up' ? ';' : ';desc') . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : ''))) ?>#msg<?= $message['id'] ?>"><?= $message['subject'] ?><?= $message['is_unread'] ? '&nbsp;<span class="new_posts">' . Lang::getTxt('new', file: 'General') . '</span>' : '' ?></a>
+				</td>
+				<td class="pm_from_to">
+					<?= (Utils::$context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))) ?>
+				</td>
+				<td class="centercol table_icon pm_moderation">
+					<input type="checkbox" name="pms[]" id="deletelisting<?= $message['id'] ?>" value="<?= $message['id'] ?>"<?= $message['is_selected'] ? ' checked' : '' ?> onclick="if (document.getElementById('deletedisplay<?= $message['id'] ?>')) document.getElementById('deletedisplay<?= $message['id'] ?>').checked = this.checked;">
+				</td>
+			</tr><?php endwhile; ?>
+		</tbody>
+	</table>
+	<div class="pagesection">
+		<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		<div class="floatright">&nbsp;<?php if (Utils::$context['show_delete']): ?><?php if (!empty(Utils::$context['currently_using_labels']) && Utils::$context['folder'] != 'sent'): ?>
+			<select name="pm_action" onchange="if (this.options[this.selectedIndex].value) this.form.submit();" onfocus="loadLabelChoices();">
+				<option value=""><?= Lang::getTxt('pm_sel_label_title', file: 'PersonalMessage') ?></option>
+				<option value="" disabled>---------------</option>
+				<option value="" disabled><?= Lang::getTxt('pm_msg_label_apply', file: 'PersonalMessage') ?></option><?php foreach (Utils::$context['labels'] as $label): ?><?php if ($label['id'] != Utils::$context['current_label_id']): ?>
+				<option value="add_<?= $label['id'] ?>">&nbsp;<?= $label['name'] ?></option><?php endif; ?><?php endforeach; ?>
+				<option value="" disabled><?= Lang::getTxt('pm_msg_label_remove', file: 'PersonalMessage') ?></option><?php foreach (Utils::$context['labels'] as $label): ?>
+				<option value="rem_<?= $label['id'] ?>">&nbsp;<?= $label['name'] ?></option><?php endforeach; ?>
+			</select>
+			<noscript>
+				<input type="submit" value="<?= Lang::getTxt('pm_apply', file: 'PersonalMessage') ?>" class="button">
+			</noscript><?php endif; ?>
+			<input type="submit" name="del_selected" value="<?= Lang::getTxt('quickmod_delete_selected', file: 'General') ?>" data-confirm="<?= Lang::getTxt('delete_selected_confirm', file: 'PersonalMessage') ?>" class="button you_sure"><?php endif; ?>
+		</div><!-- .floatright -->
+	</div><!-- .pagesection -->
\ No newline at end of file
diff --git a/Themes/default/templates/Poll/index.php b/Themes/default/templates/Poll/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Poll/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Poll/main.php b/Themes/default/templates/Poll/main.php
new file mode 100644
index 00000000000..cb0039dac11
--- /dev/null
+++ b/Themes/default/templates/Poll/main.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A form for creating and/or editing a poll.
+ */
+?><?php if (!empty(Utils::$context['poll_error']['messages'])): ?>
+			<div class="errorbox">
+				<dl class="poll_error">
+					<dt>
+						<?= Lang::getTxt(Utils::$context['is_edit'] ? 'error_while_editing_poll' : 'error_while_adding_poll', file: 'Errors') ?>
+					</dt>
+					<dt>
+						<?= empty(Utils::$context['poll_error']['messages']) ? '' : implode('<br>', Utils::$context['poll_error']['messages']) ?>
+					</dt>
+				</dl>
+			</div><?php endif; ?><?php /* Start the main poll form. */ ?>
+	<div id="edit_poll">
+		<form action="<?= Config::$scripturl ?>?action=editpoll2<?= Utils::$context['is_edit'] ? '' : ';add' ?>;topic=<?= Utils::$context['current_topic'] ?>.<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8" onsubmit="submitonce(this);" name="postmodify" id="postmodify">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div>
+				<div class="roundframe noup">
+					<input type="hidden" name="poll" value="<?= Utils::$context['poll']['id'] ?>">
+					<fieldset id="poll_main">
+						<legend><span <?= (isset(Utils::$context['poll_error']['no_question']) ? ' class="error"' : '') ?>><?= Lang::getTxt('poll_question', file: 'General') ?></span></legend>
+						<dl class="settings poll_options" id="poll_choices" data-more-txt="<?= Lang::getTxt('poll_add_option', file: 'Post') ?>" data-option-txt="<?= Lang::getTxt('option_number', [999], file: 'Post') ?>">
+							<dt><?= Lang::getTxt('poll_question', file: 'General') ?></dt>
+							<dd><input type="text" name="question" size="80" value="<?= Utils::$context['poll']['question'] ?>"></dd><?php foreach (Utils::$context['choices'] as $choice): ?>
+							<dt>
+								<label for="options-<?= $choice['id'] ?>" <?= (isset(Utils::$context['poll_error']['poll_few']) ? ' class="error"' : '') ?>><?= Lang::getTxt('option_number', [$choice['number']], file: 'Post') ?></label>
+							</dt>
+							<dd>
+								<input type="text" name="options[<?= $choice['id'] ?>]" id="options-<?= $choice['id'] ?>" value="<?= $choice['label'] ?>" size="80" maxlength="255"><?php /* Does this option have a vote count yet, or is it new? */ ?><?php if ($choice['votes'] != -1): ?> (<?= Lang::getTxt('number_of_votes', [$choice['votes']], file: 'Post') ?>)<?php endif; ?>
+							</dd><?php endforeach; ?><?php /* poll.js puts the "add option" button here, after the list it appends to. */ ?>
+						</dl>
+					</fieldset>
+					<fieldset id="poll_options">
+						<legend><?= Lang::getTxt('poll_options', file: 'Post') ?></legend>
+						<dl class="settings poll_options"><?php if (Utils::$context['can_moderate_poll']): ?>
+							<dt>
+								<label for="poll_max_votes"><?= Lang::getTxt('poll_max_votes', file: 'Post') ?></label>
+							</dt>
+							<dd>
+								<input type="number" name="poll_max_votes" id="poll_max_votes" min="1" value="<?= Utils::$context['poll']['max_votes'] ?>">
+							</dd>
+							<dt>
+								<label for="poll_expire"><?= Lang::getTxt('poll_run', file: 'Post') ?></label><br>
+								<em class="smalltext"><?= Lang::getTxt('poll_run_limit', file: 'Post') ?></em>
+							</dt>
+							<dd>
+								<input type="number" name="poll_expire" id="poll_expire" min="0" max="9999" value="<?= intval(Utils::$context['poll']['expiration']) ?>">
+							</dd>
+							<dt>
+								<label for="poll_change_vote"><?= Lang::getTxt('poll_do_change_vote', file: 'Post') ?></label>
+							</dt>
+							<dd>
+								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"<?= !empty(Utils::$context['poll']['change_vote']) ? ' checked' : '' ?>>
+							</dd><?php if (Utils::$context['poll']['guest_vote_allowed']): ?>
+							<dt>
+								<label for="poll_guest_vote"><?= Lang::getTxt('poll_guest_vote', file: 'Post') ?></label>
+							</dt>
+							<dd>
+								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"<?= !empty(Utils::$context['poll']['guest_vote']) ? ' checked' : '' ?>>
+							</dd><?php endif; ?><?php endif; ?>
+							<dt>
+								<?= Lang::getTxt('poll_results_visibility', file: 'Post') ?>
+							</dt>
+							<dd>
+								<input type="radio" name="poll_hide" id="poll_results_anyone" value="0"<?= Utils::$context['poll']['hide_results'] == 0 ? ' checked' : '' ?>> <label for="poll_results_anyone"><?= Lang::getTxt('poll_results_anyone', file: 'Post') ?></label><br>
+								<input type="radio" name="poll_hide" id="poll_results_voted" value="1"<?= Utils::$context['poll']['hide_results'] == 1 ? ' checked' : '' ?>> <label for="poll_results_voted"><?= Lang::getTxt('poll_results_voted', file: 'Post') ?></label><br>
+								<input type="radio" name="poll_hide" id="poll_results_expire" value="2"<?= Utils::$context['poll']['hide_results'] == 2 ? ' checked' : '' ?><?= empty(Utils::$context['poll']['expiration']) ? ' disabled' : '' ?>> <label for="poll_results_expire"><?= Lang::getTxt('poll_results_after', file: 'Post') ?></label>
+							</dd>
+						</dl>
+					</fieldset><?php /* If this is an edit, we can allow them to reset the vote counts. */ ?><?php if (Utils::$context['is_edit']): ?>
+					<fieldset id="poll_reset">
+						<legend><?= Lang::getTxt('reset_votes', file: 'Post') ?></legend>
+						<input type="checkbox" name="resetVoteCount" value="on"> <?= Lang::getTxt('reset_votes_check', file: 'Post') ?>
+					</fieldset><?php endif; ?>
+					<input type="submit" name="post" value="<?= Lang::getTxt('save', file: 'General') ?>" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				</div><!-- .roundframe -->
+			</div>
+			<input type="hidden" name="seqnum" value="<?= Utils::$context['form_sequence_number'] ?>">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
+	</div><!-- #edit_poll -->
\ No newline at end of file
diff --git a/Themes/default/templates/Post/announce.php b/Themes/default/templates/Post/announce.php
new file mode 100644
index 00000000000..62bae7a64bb
--- /dev/null
+++ b/Themes/default/templates/Post/announce.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for sending out an announcement
+ */
+?>
+	<div id="announcement">
+		<form action="<?= Config::$scripturl ?>?action=announce;sa=send" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('announce_title', file: 'Post') ?></h3>
+			</div>
+			<div class="information">
+				<?= Lang::getTxt('announce_desc', file: 'Post') ?>
+			</div>
+			<div class="windowbg">
+				<p>
+					<?= Lang::getTxt('announce_this_topic', ['subject' => '<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.0">' . Utils::$context['topic_subject'] . '</a>'], file: 'Post') ?>
+				</p>
+				<ul>
+<?php foreach (Utils::$context['groups'] as $group): ?>
+					<li>
+						<label for="who_<?= $group['id'] ?>"><input type="checkbox" name="who[<?= $group['id'] ?>]" id="who_<?= $group['id'] ?>" value="<?= $group['id'] ?>" checked> <?= $group['name'] ?></label> <em>(<?= $group['member_count'] ?? Lang::getTxt('not_applicable', file: 'General') ?>)</em>
+					</li>
+<?php endforeach; ?>
+					<li>
+						<label for="checkall"><input type="checkbox" id="checkall" onclick="invertAll(this, this.form);" checked> <em><?= Lang::getTxt('check_all', file: 'General') ?></em></label>
+					</li>
+				</ul>
+				<hr>
+				<div id="confirm_buttons">
+					<input type="submit" value="<?= Lang::getTxt('post', file: 'General') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="topic" value="<?= Utils::$context['current_topic'] ?>">
+					<input type="hidden" name="move" value="<?= Utils::$context['move'] ?>">
+					<input type="hidden" name="goback" value="<?= Utils::$context['go_back'] ?>">
+				</div>
+				<br class="clear_right">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #announcement -->
+	<br>
\ No newline at end of file
diff --git a/Themes/default/templates/Post/announcement_send.php b/Themes/default/templates/Post/announcement_send.php
new file mode 100644
index 00000000000..11bee4ac989
--- /dev/null
+++ b/Themes/default/templates/Post/announcement_send.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The confirmation/progress page, displayed after the admin has clicked the button to send the announcement.
+ */
+?>
+	<div id="announcement">
+		<form action="<?= Config::$scripturl ?>?action=announce;sa=send" method="post" accept-charset="UTF-8" name="autoSubmit" id="autoSubmit">
+			<div class="windowbg">
+				<p>
+					<?= Lang::getTxt('announce_sending', ['subject' => '<a href="' . Config::$scripturl . '?topic=' . Utils::$context['current_topic'] . '.0" target="_blank" rel="noopener">' . Utils::$context['topic_subject'] . '</a>'], file: 'Post') ?>
+				</p>
+				<div class="progress_bar">
+					<span><?= Lang::getTxt('announce_done', Utils::$context, file: 'Post') ?></span>
+					<div class="bar" style="width: <?= Utils::$context['percentage_done'] ?>%;"></div>
+				</div>
+				<hr>
+				<div id="confirm_buttons">
+					<input type="submit" name="cont" value="<?= Lang::getTxt('announce_continue', file: 'Post') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="topic" value="<?= Utils::$context['current_topic'] ?>">
+					<input type="hidden" name="move" value="<?= Utils::$context['move'] ?>">
+					<input type="hidden" name="goback" value="<?= Utils::$context['go_back'] ?>">
+					<input type="hidden" name="start" value="<?= Utils::$context['start'] ?>">
+					<input type="hidden" name="membergroups" value="<?= Utils::$context['membergroups'] ?>">
+				</div>
+				<br class="clear_right">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #announcement -->
+	<br>
+	<script>
+		doAutoSubmit(2, <?= Utils::escapeJavaScript(Lang::getTxt('announce_continue', file: 'Post')) ?>);
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Post/index.php b/Themes/default/templates/Post/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Post/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Post/main.php b/Themes/default/templates/Post/main.php
new file mode 100644
index 00000000000..362aa33127d
--- /dev/null
+++ b/Themes/default/templates/Post/main.php
@@ -0,0 +1,382 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\BrowserDetector;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main template for the post page.
+ */
+?><?php /* Start the javascript... and boy is there a lot. */ ?>
+		<script><?php /* When using Go Back due to fatal_error, allow the form to be re-submitted with changes. */ ?><?php if (BrowserDetector::isBrowser('is_firefox')): ?>
+
+			window.addEventListener("pageshow", reActivate, false);<?php endif; ?><?php /* Start with message icons - and any missing from this theme. */ ?>
+
+			var icon_urls = <?= json_encode(array_column(Utils::$context['icons'], 'url', 'value'), JSON_UNESCAPED_SLASHES) ?>;<?php /* If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here. */ ?><?php if (Utils::$context['make_event']): ?>
+
+			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];<?php endif; ?><?php /* End of the javascript, start the form and display the link tree. */ ?>
+
+		</script>
+		<form action="<?= Config::$scripturl ?>?action=<?= Utils::$context['destination'] ?>;<?= empty(Utils::$context['current_board']) ? '' : 'board=' . Utils::$context['current_board'] ?>" method="post" accept-charset="UTF-8" name="postmodify" id="postmodify" class="flow_hidden" onsubmit="<?= (Utils::$context['becomes_approved'] ? '' : 'alert(\'' . Lang::getTxt('js_post_will_require_approval', file: 'Post') . '\');') ?>submitonce(this);" enctype="multipart/form-data"><?php /* If the user wants to see how their message looks - the preview section is where it's at! */ ?>
+			<div id="preview_section"<?= isset(Utils::$context['preview_message']) ? '' : ' style="display: none;"' ?>>
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<span id="preview_subject"><?= empty(Utils::$context['preview_subject']) ? '&nbsp;' : Utils::$context['preview_subject'] ?></span>
+					</h3>
+				</div>
+				<div id="preview_body" class="windowbg">
+					<?= empty(Utils::$context['preview_message']) ? '<br>' : Utils::adjustHeadingLevels(Utils::$context['preview_message'], 4) ?>
+				</div>
+			</div>
+			<br><?php if (Utils::$context['make_event'] && (!Utils::$context['event']->new || !empty(Utils::$context['current_board']))): ?>
+			<input type="hidden" name="eventid" value="<?= Utils::$context['event']->id ?>">
+			<input type="hidden" name="recurrenceid" value="<?= Utils::$context['event']->selected_occurrence->id ?>"><?php endif; ?><?php /* Start the main table. */ ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div id="post_area">
+				<div class="roundframe noup"><?= isset(Utils::$context['current_topic']) ? '
+					<input type="hidden" name="topic" value="' . Utils::$context['current_topic'] . '">' : '' ?><?php /* If an error occurred, explain what happened. */ ?>
+					<div class="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? 'noticebox' : 'errorbox' ?>"<?= empty(Utils::$context['post_error']) ? ' style="display: none"' : '' ?> id="errors">
+						<dl>
+							<dt>
+								<strong id="error_serious"><?= Lang::getTxt('error_while_submitting', file: 'General') ?></strong>
+							</dt>
+							<dd class="error" id="error_list">
+								<?= empty(Utils::$context['post_error']) ? '' : implode('<br>', Utils::$context['post_error']) ?>
+							</dd>
+						</dl>
+					</div><?php /* If this won't be approved let them know! */ ?><?php if (!Utils::$context['becomes_approved']): ?>
+					<div class="noticebox">
+						<em><?= Lang::getTxt('wait_for_approval', file: 'General') ?></em>
+						<input type="hidden" name="not_approved" value="1">
+					</div><?php endif; ?><?php /* If it's locked, show a message to warn the replier. */ ?><?php if (!empty(Utils::$context['locked'])): ?>
+					<div class="errorbox">
+						<?= Lang::getTxt('topic_locked_no_reply', file: 'Post') ?>
+					</div><?php endif; ?><?php if (!empty(Config::$modSettings['drafts_post_enabled'])): ?>
+					<div id="draft_section" class="infobox"<?= isset(Utils::$context['draft_saved']) ? '' : ' style="display: none;"' ?>><?= Lang::getTxt('draft_saved', ['url' => Config::$scripturl . '?action=profile;u=' . User::$me->id . ';area=showdrafts'], file: 'Drafts') ?>
+						<?= (!empty(Config::$modSettings['drafts_keep_days']) ? ' <strong>' . Lang::getTxt('draft_save_warning', [Config::$modSettings['drafts_keep_days']], file: 'Drafts') . '</strong>' : '') ?>
+					</div><?php endif; ?><?php /* The post header... important stuff */ ?><?php $this->subTemplate('post_header'); ?><?php /* Are you posting a calendar event? */ ?><?php if (Utils::$context['make_event']): ?>
+					<div id="post_event"><?php $this->subTemplate('event_options'); ?><?php if (!empty(Utils::$context['linked_calendar_events'])): ?><?php $this->subTemplate('linked_events'); ?><?php endif; ?>
+					</div><!-- #post_event --><?php endif; ?><?php /* If this is a poll then display all the poll options! */ ?><?php if (Utils::$context['make_poll']): ?>
+					<hr class="clear">
+					<div id="edit_poll">
+						<fieldset id="poll_main">
+							<legend><span <?= (isset(Utils::$context['poll_error']['no_question']) ? ' class="error"' : '') ?>><?= Lang::getTxt('poll_question', file: 'General') ?></span></legend>
+							<dl class="settings poll_options" id="poll_choices" data-more-txt="<?= Lang::getTxt('poll_add_option', file: 'Post') ?>" data-option-txt="<?= Lang::getTxt('option_number', [999], file: 'Post') ?>">
+								<dt><?= Lang::getTxt('poll_question', file: 'General') ?></dt>
+								<dd>
+									<input type="text" name="question" value="<?= Utils::$context['question'] ?? '' ?>" size="80">
+								</dd><?php /* Loop through all the choices and print them out. */ ?><?php foreach (Utils::$context['choices'] as $choice): ?>
+								<dt>
+									<label for="options-<?= $choice['id'] ?>"><?= Lang::getTxt('option_number', [$choice['number']], file: 'Post') ?></label>
+								</dt>
+								<dd>
+									<input type="text" name="options[<?= $choice['id'] ?>]" id="options-<?= $choice['id'] ?>" value="<?= $choice['label'] ?>" size="80" maxlength="255">
+								</dd><?php endforeach; ?><?php /* poll.js puts the "add option" button here, after the list it appends to. */ ?>
+							</dl>
+						</fieldset>
+						<fieldset id="poll_options">
+							<legend><?= Lang::getTxt('poll_options', file: 'Post') ?></legend>
+							<dl class="settings poll_options">
+								<dt>
+									<label for="poll_max_votes"><?= Lang::getTxt('poll_max_votes', file: 'Post') ?></label>
+								</dt>
+								<dd>
+									<input type="number" name="poll_max_votes" id="poll_max_votes" min="1" value="<?= Utils::$context['poll_options']['max_votes'] ?>">
+								</dd>
+								<dt>
+									<label for="poll_expire"><?= Lang::getTxt('poll_run', file: 'Post') ?></label><br>
+									<em class="smalltext"><?= Lang::getTxt('poll_run_limit', file: 'Post') ?></em>
+								</dt>
+								<dd>
+									<input type="number" name="poll_expire" id="poll_expire" min="0" max="9999" value="<?= intval(Utils::$context['poll_options']['expire'] ?? 0) ?>">
+								</dd>
+								<dt>
+									<label for="poll_change_vote"><?= Lang::getTxt('poll_do_change_vote', file: 'Post') ?></label>
+								</dt>
+								<dd>
+									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"<?= !empty(Utils::$context['poll']['change_vote']) ? ' checked' : '' ?>>
+								</dd><?php if (Utils::$context['poll_options']['guest_vote_enabled']): ?>
+								<dt>
+									<label for="poll_guest_vote"><?= Lang::getTxt('poll_guest_vote', file: 'Post') ?></label>
+								</dt>
+								<dd>
+									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"<?= !empty(Utils::$context['poll_options']['guest_vote']) ? ' checked' : '' ?>>
+								</dd><?php endif; ?>
+								<dt>
+									<?= Lang::getTxt('poll_results_visibility', file: 'Post') ?>
+								</dt>
+								<dd>
+									<input type="radio" name="poll_hide" id="poll_results_anyone" value="0"<?= Utils::$context['poll_options']['hide'] == 0 ? ' checked' : '' ?>> <label for="poll_results_anyone"><?= Lang::getTxt('poll_results_anyone', file: 'Post') ?></label><br>
+									<input type="radio" name="poll_hide" id="poll_results_voted" value="1"<?= Utils::$context['poll_options']['hide'] == 1 ? ' checked' : '' ?>> <label for="poll_results_voted"><?= Lang::getTxt('poll_results_voted', file: 'Post') ?></label><br>
+									<input type="radio" name="poll_hide" id="poll_results_expire" value="2"<?= Utils::$context['poll_options']['hide'] == 2 ? ' checked' : '' ?><?= empty(Utils::$context['poll_options']['expire']) ? ' disabled' : '' ?>> <label for="poll_results_expire"><?= Lang::getTxt('poll_results_after', file: 'Post') ?></label>
+								</dd>
+							</dl>
+						</fieldset>
+					</div><!-- #edit_poll --><?php endif; ?><?php /* Show the actual posting area... */ ?><?php $this->subTemplate('control_richedit', ['editor_id' => 'message', 'smiley_container' => true, 'bbc_container' => true]); ?><?php /* Show attachments. */ ?><?php if (!empty(Utils::$context['current_attachments']) || Utils::$context['can_post_attachment']): ?>
+					<div id="post_attachments_area" class="roundframe noup"><?php /* The non-JavaScript UI. */ ?>
+							<div id="postAttachment">
+								<div class="padding">
+									<div>
+										<strong><?= Lang::getTxt('attachments', file: 'Post') ?></strong>:<?php if (Utils::$context['can_post_attachment']): ?>
+										<input type="file" multiple="multiple" name="attachment[]"><?php endif; ?><?php if (!empty(Config::$modSettings['attachmentSizeLimit'])): ?>
+										<input type="hidden" name="MAX_FILE_SIZE" value="<?= Config::$modSettings['attachmentSizeLimit'] * 1024 ?>"><?php endif; ?>
+									</div><?php if (!empty(Utils::$context['attachment_restrictions'])): ?>
+									<div class="smalltext"><?= Lang::getTxt('attach_restrictions', ['list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['attachment_restrictions'])]) ?></div><?php endif; ?>
+									<div class="smalltext">
+										<input type="hidden" name="attach_del[]" value="0">
+										<?= Lang::getTxt('uncheck_unwatchd_attach', file: 'Post') ?>
+									</div>
+								</div>
+								<div class="attachments"><?php /* If this post already has attachments on it - give information about them. */ ?><?php if (!empty(Utils::$context['current_attachments'])): ?><?php foreach (Utils::$context['current_attachments'] as $attachment): ?>
+									<div class="attached">
+										<input type="checkbox" id="attachment_<?= $attachment['attachID'] ?>" name="attach_del[]" value="<?= $attachment['attachID'] ?>"<?= empty($attachment['unchecked']) ? ' checked' : '' ?>><?php if (!empty(Config::$modSettings['attachmentShowImages'])): ?><?php if (str_starts_with($attachment['mime_type'], 'image')): ?><?php $src = Config::$scripturl . '?action=dlattach;attach=' . (!empty($attachment['thumb']) ? $attachment['thumb'] : $attachment['attachID']) . ';preview;image'; ?><?php else: ?><?php $src = Theme::$current->settings['images_url'] . '/generic_attach.png'; ?><?php endif; ?>
+										<div class="attachments_top">
+											<img src="<?= $src ?>" alt="" loading="lazy" class="atc_img">
+										</div><?php endif; ?>
+										<div class="attachments_bot">
+											<span class="name"><?= $attachment['name'] ?></span><?= (empty($attachment['approved']) ? '
+											<br>(' . Lang::getTxt('awaiting_approval', file: 'General') . ')' : '') ?>
+											<br><?= $attachment['size'] < 1024000 ? Lang::getTxt('size_kilobyte', [round($attachment['size'] / 1024, 2)], file: 'General') : Lang::getTxt('size_megabyte', [round($attachment['size'] / 1024 / 1024, 2)], file: 'General') ?>
+										</div>
+									</div><?php endforeach; ?><?php endif; ?>
+								</div>
+							</div><?php if (!empty(Utils::$context['files_in_session_warning'])): ?>
+							<div class="smalltext"><em><?= Utils::$context['files_in_session_warning'] ?></em></div><?php endif; ?><?php /* Is the user allowed to post any additional ones? If so give them the boxes to do it! */ ?><?php if (Utils::$context['can_post_attachment']): ?><?php /* Print dropzone UI. */ ?>
+						<div id="attachment_upload">
+							<div id="drop_zone_ui" class="centertext">
+								<div class="attach_drop_zone_label">
+									<?= Lang::getTxt(Utils::$context['num_allowed_attachments'] <= count(Utils::$context['current_attachments']) ? 'attach_limit_nag' : 'attach_drop_zone', file: 'Post') ?>
+								</div>
+							</div>
+							<div class="files" id="attachment_previews">
+								<div id="au-template">
+									<div class="attachment_preview_wrapper">
+										<div class="attach-ui roundframe">
+											<a data-dz-remove class="main_icons delete floatright cancel"></a>
+											<div class="attached_BBC_width_height">
+												<div class="attached_BBC_width">
+													<label><span><?= Lang::getTxt('attached_insert_width', file: 'Post') ?></span> <input type="number" name="attached_BBC_width" min="0" value="" placeholder="<?= Lang::getTxt('attached_insert_placeholder', file: 'Post') ?>"></label>
+												</div>
+												<div class="attached_BBC_height">
+													<label><span><?= Lang::getTxt('attached_insert_height', file: 'Post') ?></span> <input type="number" name="attached_BBC_height" min="0" value="" placeholder="<?= Lang::getTxt('attached_insert_placeholder', file: 'Post') ?>"></label>
+												</div>
+											</div>
+										</div>
+										<div class="attach-preview">
+											<img data-dz-thumbnail />
+										</div>
+										<div class="attachment_info">
+											<span class="name" data-dz-name></span>
+											<span class="error" data-dz-errormessage></span>
+											<span class="size" data-dz-size></span>
+											<span class="message" data-dz-message></span>
+											<div class="progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">
+												<div class="bar"></div>
+											</div>
+										</div><!-- .attachment_info -->
+									</div>
+								</div><!-- #au-template -->
+								<div class="attachment_spacer">
+									<div class="fallback">
+											<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput('attachment1');"><?= Lang::getTxt('clean_attach', file: 'Post') ?></a>)<?php if (!empty(Config::$modSettings['attachmentSizeLimit'])): ?>
+											<input type="hidden" name="MAX_FILE_SIZE" value="<?= Config::$modSettings['attachmentSizeLimit'] * 1024 ?>"><?php endif; ?>
+									</div><!-- .fallback -->
+								</div>
+							</div><!-- #attachment_previews -->
+						</div>
+						<div id="max_files_progress" class="max_files_progress progress_bar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">
+							<div class="bar"></div>
+							<div id="max_files_progress_text"></div>
+						</div><?php endif; ?>
+					</div><?php endif; ?><?php
+// If the admin has enabled the hiding of the additional options, fold them
+// away behind a disclosure triangle. A details element remembers nothing by
+// itself, so the script further down copies its state into the hidden
+// additional_options field that gets posted back.
+?><?php if (!empty(Config::$modSettings['additional_options_collapsable'])): ?>
+					<details id="post_options_toggle"<?= Utils::$context['show_additional_options'] ? ' open' : '' ?>>
+						<summary><?= Lang::getTxt('post_additionalopt', file: 'Post') ?></summary><?php endif; ?><?php /* Display the checkboxes for all the standard options - if they are available to the user! */ ?><?php $this->subTemplate('post_options', ['post_options' => Utils::$context['post_options']]); ?><?php if (!empty(Config::$modSettings['additional_options_collapsable'])): ?>
+					</details><?php endif; ?><?php /* If the admin enabled the drafts feature, show a draft selection box */ ?><?php if (!empty(Config::$modSettings['drafts_post_enabled']) && !empty(Utils::$context['drafts']) && !empty(Config::$modSettings['drafts_show_saved_enabled']) && !empty(Theme::$current->options['drafts_show_saved_enabled'])): ?>
+					<div id="post_draft_options_header" class="title_bar">
+						<h4 class="titlebg">
+							<strong><a href="#" id="postDraftExpandLink"><?= Lang::getTxt('drafts_show', file: 'Drafts') ?></a></strong>
+						</h4>
+						<span id="postDraftExpand" class="toggle_up" style="display: none;"></span>
+					</div>
+					<div id="post_draft_options">
+						<dl class="settings">
+							<dt><strong><?= Lang::getTxt('subject', file: 'General') ?></strong></dt>
+							<dd><strong><?= trim(Lang::getTxt('draft_saved_on', ['date' => ''], file: 'Drafts')) ?></strong></dd><?php foreach (Utils::$context['drafts'] as $draft): ?>
+							<dt><?= $draft['link'] ?></dt>
+							<dd><?= $draft['poster_time'] ?></dd><?php endforeach; ?>
+						</dl>
+					</div><?php endif; ?><?php /* Is visual verification enabled? */ ?><?php if (Utils::$context['require_verification']): ?>
+					<div class="post_verification">
+						<span<?= !empty(Utils::$context['post_error']['need_qr_verification']) ? ' class="error"' : '' ?>>
+							<strong><?= Lang::getTxt('verification', file: 'General') ?></strong>
+						</span>
+						<?php $this->subTemplate('control_verification', ['verify_id' => Utils::$context['visual_verification_id'], 'display_type' => 'all']); ?>
+					</div><?php endif; ?><?php /* Finally, the submit buttons. */ ?>
+					<span id="post_confirm_buttons">
+						<?php $this->subTemplate('control_richedit_buttons', ['editor_id' => 'message']); ?>
+					</span>
+				</div><!-- .roundframe -->
+			</div><!-- #post_area -->
+			<br class="clear"><?php /* Assuming this isn't a new topic pass across the last message id. */ ?><?php if (isset(Utils::$context['topic_last_message'])): ?>
+			<input type="hidden" name="last_msg" value="<?= Utils::$context['topic_last_message'] ?>"><?php endif; ?>
+			<input type="hidden" name="additional_options" id="additional_options" value="<?= Utils::$context['show_additional_options'] ? '1' : '0' ?>">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="seqnum" value="<?= Utils::$context['form_sequence_number'] ?>">
+		</form>
+		<script><?php
+$newPostsHTML = '
+		<span id="new_replies"></span>
+		<div class="windowbg">
+			<div id="msg%PostID%">
+			<h5 class="floatleft">
+				' . Lang::getTxt('posted_by_member_time', ['member' => '%PosterName%', 'time' => '%PostTime%'], file: 'General') . '&nbsp;&#187; <span class="new_posts" id="image_new_%PostID%">' . Lang::getTxt('new', file: 'General') . '</span>
+			</h5>
+			<br class="clear">
+			<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">' . Lang::getTxt('ignoring_user', file: 'General') . '<a href="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">' . Lang::getTxt('show_ignore_user_post', file: 'General') . '</a></div>
+			<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%</div>';
+?><?php if (Utils::$context['can_quote']): ?><?php
+$newPostsHTML .= '
+			<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">
+				<li class="post_modify">
+					<a href="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"></span>' . Lang::getTxt('quote', file: 'General') . '</a>
+				</li>
+			</ul>';
+?><?php endif; ?><?php
+$newPostsHTML .= '
+		</div>';
+// The functions used to preview a posts without loading a new page.
+?>
+
+			var oPreviewPost = new smc_preview_post({
+				sPreviewSectionContainerID: "preview_section",
+				sPreviewSubjectContainerID: "preview_subject",
+				sPreviewBodyContainerID: "preview_body",
+				sErrorsContainerID: "errors",
+				sErrorsSeriousContainerID: "error_serious",
+				sErrorsListContainerID: "error_list",
+				sCaptionContainerID: "caption_%ID%",
+				sNewImageContainerID: "image_new_%ID%",
+				sPostBoxContainerID: <?= Utils::escapeJavaScript('message') ?>,
+				bMakePoll: <?= Utils::$context['make_poll'] ? 'true' : 'false' ?>,
+				sTxtPreviewTitle: <?= Utils::escapeJavaScript(Lang::getTxt('preview_title', file: 'General')) ?>,
+				sTxtPreviewFetch: <?= Utils::escapeJavaScript(Lang::getTxt('preview_fetch', file: 'General')) ?>,
+				sSessionVar: <?= Utils::escapeJavaScript(Utils::$context['session_var']) ?>,
+				newPostsTemplate:<?= Utils::escapeJavaScript($newPostsHTML) ?><?php if (!empty(Utils::$context['current_board'])): ?>,
+				iCurrentBoard: <?= Utils::$context['current_board'] ?><?php endif; ?>
+
+			});<?php
+// Remember whether the additional options were left open, so the next post
+// form comes back the same way round.
+?><?php if (!empty(Config::$modSettings['additional_options_collapsable'])): ?>
+
+			document.getElementById('post_options_toggle').addEventListener('toggle', function () {
+				document.getElementById('additional_options').value = this.open ? '1' : '0';
+			});<?php endif; ?><?php /* Code for showing and hiding drafts */ ?><?php if (!empty(Utils::$context['drafts'])): ?>
+
+			var oSwapDraftOptions = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: true,
+				aSwappableContainers: [
+					'post_draft_options',
+				],
+				aSwapImages: [
+					{
+						sId: 'postDraftExpand',
+						altExpanded: '-',
+						altCollapsed: '+'
+					}
+				],
+				aSwapLinks: [
+					{
+						sId: 'postDraftExpandLink',
+						msgExpanded: <?= Utils::escapeJavaScript(Lang::getTxt('draft_hide', file: 'Drafts')) ?>,
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('drafts_show', file: 'Drafts')) ?>
+
+					}
+				]
+			});<?php endif; ?>
+
+			var oEditorID = "<?= Utils::$context['post_box_name'] ?>";
+		</script><?php /* If the user is replying to a topic show the previous posts. */ ?><?php if (isset(Utils::$context['previous_posts']) && count(Utils::$context['previous_posts']) > 0): ?>
+		<div id="recent" class="flow_hidden main_section">
+			<div class="cat_bar cat_bar_round">
+				<h3 class="catbg"><?= Lang::getTxt('topic_summary', file: 'General') ?></h3>
+			</div>
+			<span id="new_replies"></span><?php $ignored_posts = []; ?><?php foreach (Utils::$context['previous_posts'] as $post): ?><?php $ignoring = false; ?><?php if (!empty($post['is_ignored'])): ?><?php $ignored_posts[] = $ignoring = $post['id']; ?><?php endif; ?>
+			<div class="windowbg">
+				<div id="msg<?= $post['id'] ?>">
+					<div>
+						<h5 class="floatleft">
+							<?= Lang::getTxt('posted_by_member_time', ['member' => $post['poster'], 'time' => $post['time']], file: 'General') ?>
+						</h5>
+					</div><?php if ($ignoring): ?>
+					<div id="msg_<?= $post['id'] ?>_ignored_prompt" class="smalltext">
+						<?= Lang::getTxt('ignoring_user', file: 'General') ?>
+						<a href="#" id="msg_<?= $post['id'] ?>_ignored_link" style="display: none;"><?= Lang::getTxt('show_ignore_user_post', file: 'General') ?></a>
+					</div><?php endif; ?>
+					<div class="list_posts smalltext" id="msg_<?= $post['id'] ?>_body" data-msgid="<?= $post['id'] ?>"><?= Utils::adjustHeadingLevels($post['message'], 5) ?></div><?php if (Utils::$context['can_quote']): ?>
+					<ul class="quickbuttons" id="msg_<?= $post['id'] ?>_quote">
+						<li style="display:none;" id="quoteSelected_<?= $post['id'] ?>" data-msgid="<?= $post['id'] ?>"><a href="javascript:void(0)"><span class="main_icons quote_selected"></span><?= Lang::getTxt('quote_selected_action', file: 'General') ?></a></li>
+						<li class="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(<?= $post['id'] ?>);"><span class="main_icons quote"></span><?= Lang::getTxt('quote', file: 'General') ?></a></li>
+					</ul><?php endif; ?>
+				</div><!-- #msg[id] -->
+			</div><!-- .windowbg --><?php endforeach; ?>
+		</div><!-- #recent -->
+		<script>
+			var aIgnoreToggles = new Array();<?php foreach ($ignored_posts as $post_id): ?>
+
+			aIgnoreToggles[<?= $post_id ?>] = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: true,
+				aSwappableContainers: [
+					'msg_<?= $post_id ?>_body',
+					'msg_<?= $post_id ?>_quote',
+				],
+				aSwapLinks: [
+					{
+						sId: 'msg_<?= $post_id ?>_ignored_link',
+						msgExpanded: '',
+						msgCollapsed: <?= Utils::escapeJavaScript(Lang::getTxt('show_ignore_user_post', file: 'General')) ?>
+
+					}
+				]
+			});<?php endforeach; ?>
+
+			function insertQuoteFast(messageid)
+			{
+				var e = document.getElementById("<?= Utils::$context['post_box_name'] ?>");
+				sceditor.instance(e).insertQuoteFast(messageid);
+
+				return true;
+			}
+			function onReceiveOpener(text)
+			{
+				var e = document.getElementById("<?= Utils::$context['post_box_name'] ?>");
+				sceditor.instance(e).insert(text);
+			}
+		</script><?php endif; ?>
diff --git a/Themes/default/templates/Post/post_header.php b/Themes/default/templates/Post/post_header.php
new file mode 100644
index 00000000000..a6fe763fb47
--- /dev/null
+++ b/Themes/default/templates/Post/post_header.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Prints the input fields in the form's header (subject, message icon, guest name & email, etc.)
+ *
+ * Mod authors can use the 'integrate_post_end' hook to modify or add to these (see Post.php).
+ *
+ * Theme authors can customize the output in a couple different ways:
+ * 1. Change specific values in the Utils::$context['posting_fields'] array.
+ * 2. Add an 'html' element to the 'label' and/or 'input' elements of the field they want to
+ *    change. This should contain the literal HTML string to be printed.
+ *
+ * See the documentation in Post.php for more info on the Utils::$context['posting_fields'] array.
+ */
+?><?php /* Sanity check: submitting the form won't work without at least a subject field */ ?><?php if (empty(Utils::$context['posting_fields']['subject']) || !is_array(Utils::$context['posting_fields']['subject'])): ?><?php
+Utils::$context['posting_fields']['subject'] = [
+	'label' => ['html' => '<label for="subject" id="caption_subject">' . Lang::getTxt('subject', file: 'General') . '</label>'],
+	'input' => ['html' => '<input type="text" id="subject" name="subject" value="' . Utils::$context['subject'] . '" size="80" maxlength="80" required>'],
+];
+?><?php endif; ?><?php
+// THEME AUTHORS: Above this line is a great place to make customizations to the posting_fields array
+// Start printing the header
+?>
+					<dl id="post_header"><?php foreach (Utils::$context['posting_fields'] as $pfid => $pf): ?><?php /* We need both a label and an input */ ?><?php if (empty($pf['label']) || empty($pf['input'])): ?><?php continue; ?><?php endif; ?><?php /* The labels are pretty simple... */ ?>
+						<dt class="clear pf_<?= $pfid ?>"><?php /* Any leading HTML before the label */ ?><?php if (!empty($pf['label']['before'])): ?>
+							<?= $pf['label']['before'] ?><?php endif; ?><?php if (!empty($pf['label']['html'])): ?><?= $pf['label']['html'] ?><?php else: ?>
+							<label<?= ($pf['input']['type'] === 'radio_select' ? '' : ' for="' . (!empty($pf['input']['attributes']['id']) ? $pf['input']['attributes']['id'] : $pfid) . '"') ?> id="caption_<?= $pfid ?>"<?= !empty($pf['label']['class']) ? ' class="' . $pf['label']['class'] . '"' : '' ?>><?= $pf['label']['text'] ?></label><?php endif; ?><?php /* Any trailing HTML after the label */ ?><?php if (!empty($pf['label']['after'])): ?>
+							<?= $pf['label']['after'] ?><?php endif; ?>
+						</dt><?php /* Here's where the fun begins... */ ?>
+						<dd class="pf_<?= $pfid ?>"><?php /* Any leading HTML before the main input */ ?><?php if (!empty($pf['input']['before'])): ?>
+							<?= $pf['input']['before'] ?><?php endif; ?><?php /* If there is a literal HTML string already defined, just print it. */ ?><?php if (!empty($pf['input']['html'])): ?><?= $pf['input']['html'] ?><?php /* Simple text inputs and checkboxes */ ?><?php elseif (in_array($pf['input']['type'], ['text', 'password', 'color', 'date', 'datetime-local', 'email', 'month', 'number', 'range', 'tel', 'time', 'url', 'week', 'checkbox'])): ?>
+							<input type="<?= $pf['input']['type'] ?>"<?php if (empty($pf['input']['attributes']['id'])): ?> id="<?= $pfid ?>"<?php endif; ?><?php if (empty($pf['input']['attributes']['name'])): ?> name="<?= $pfid ?>"<?php endif; ?><?php if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])): ?><?php foreach ($pf['input']['attributes'] as $attribute => $value): ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?><?php endif; ?>><?php /* textarea */ ?><?php elseif ($pf['input']['type'] === 'textarea'): ?>
+							<textarea<?php if (empty($pf['input']['attributes']['id'])): ?> id="<?= $pfid ?>"<?php endif; ?><?php if (empty($pf['input']['attributes']['name'])): ?> name="<?= $pfid ?>"<?php endif; ?><?php if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])): ?><?php foreach ($pf['input']['attributes'] as $attribute => $value): ?><?php if ($attribute === 'value'): ?><?php continue; ?><?php endif; ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?><?php endif; ?>><?= !empty($pf['input']['attributes']['value']) ? $pf['input']['attributes']['value'] : '' ?></textarea><?php /* Select menus are more complicated */ ?><?php elseif ($pf['input']['type'] === 'select' && is_array($pf['input']['options'])): ?><?php /* The select element itself */ ?>
+							<select<?php if (empty($pf['input']['attributes']['id'])): ?> id="<?= $pfid ?>"<?php endif; ?><?php if (empty($pf['input']['attributes']['name'])): ?> name="<?= $pfid ?><?= !empty($pf['input']['attributes']['multiple']) ? '[]' : '' ?>"<?php endif; ?><?php if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])): ?><?php foreach ($pf['input']['attributes'] as $attribute => $value): ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?><?php endif; ?>><?php /* The options */ ?><?php foreach ($pf['input']['options'] as $optlabel => $option): ?><?php /* An option containing options is an optgroup */ ?><?php if (!empty($option['options']) && is_array($option['options'])): ?>
+								<optgroup<?php if (empty($option['label'])): ?> label="<?= $optlabel ?>"<?php endif; ?><?php if (!empty($option) && is_array($option)): ?><?php foreach ($option as $attribute => $value): ?><?php if ($attribute === 'options'): ?><?php continue; ?><?php endif; ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?><?php endif; ?>><?php foreach ($option['options'] as $grouped_optlabel => $grouped_option): ?>
+									<option<?php foreach ($grouped_option as $attribute => $value): ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?>><?= $grouped_option['label'] ?></option><?php endforeach; ?>
+								</optgroup><?php /* Simple option */ ?><?php else: ?>
+								<option<?php foreach ($option as $attribute => $value): ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?>><?= $optlabel ?></option><?php endif; ?><?php endforeach; ?><?php /* Close the select element */ ?>
+							</select><?php /* Radio_select makes a div with some radio buttons in it */ ?><?php elseif ($pf['input']['type'] === 'radio_select' && is_array($pf['input']['options'])): ?>
+							<div<?php if (!empty($pf['input']['attributes']) && is_array($pf['input']['attributes'])): ?><?php foreach ($pf['input']['attributes'] as $attribute => $value): ?><?php if ($attribute === 'name'): ?><?php continue; ?><?php endif; ?><?php if (is_bool($value)): ?><?= $value ? ' ' . $attribute : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?><?php endif; ?>><?php foreach ($pf['input']['options'] as $optlabel => $option): ?>
+							<label style="margin-right:2ch"><input type="radio" name="<?= !empty($pf['input']['attributes']['name']) ? $pf['input']['attributes']['name'] : $pfid ?>"<?php foreach ($option as $attribute => $value): ?><?php if ($attribute === 'label'): ?><?php continue; ?><?php endif; ?><?php if (is_bool($value)): ?><?= $value ? ' ' . ($attribute === 'selected' ? 'checked' : $attribute) : '' ?><?php else: ?> <?= $attribute ?>="<?= $value ?>"<?php endif; ?><?php endforeach; ?>> <?= $option['label'] ?? $optlabel ?></label><?php endforeach; ?>
+							</div><?php endif; ?><?php /* Any trailing HTML after the main input */ ?><?php if (!empty($pf['input']['after'])): ?>
+							<?= $pf['input']['after'] ?><?php endif; ?>
+						</dd><?php endforeach; ?>
+					</dl>
\ No newline at end of file
diff --git a/Themes/default/templates/Post/post_options.php b/Themes/default/templates/Post/post_options.php
new file mode 100644
index 00000000000..f5892a9fea8
--- /dev/null
+++ b/Themes/default/templates/Post/post_options.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Draws the checkboxes that sit below the editor on the posting form.
+ *
+ * See Post::setupPostOptions() for what each option looks like. Anything an
+ * option lists under 'hidden' is written out just before its checkbox, because
+ * a checkbox that is not ticked submits nothing at all and the hidden field of
+ * the same name is what carries the "off" value.
+ *
+ * @param array $post_options The options to draw, in the order they go in.
+ */
+?>
+					<ul id="post_options" class="smalltext">
+<?php foreach ($post_options as $option): ?>
+<?php if (!$option['can_show']): ?>
+<?php continue; ?>
+<?php endif; ?>
+						<li>
+<?php foreach ($option['hidden'] ?? [] as $hidden_name => $hidden_value): ?>
+							<input type="hidden" name="<?= $hidden_name ?>" value="<?= $hidden_value ?>">
+<?php endforeach; ?>
+							<label for="<?= $option['id'] ?>">
+								<input type="checkbox" name="<?= $option['name'] ?>" id="<?= $option['id'] ?>" value="<?= $option['value'] ?? '1' ?>"<?= $option['checked'] ? ' checked' : '' ?>> <?= $option['label'] ?>
+							</label>
+						</li>
+<?php endforeach; ?>
+					</ul><!-- #post_options -->
\ No newline at end of file
diff --git a/Themes/default/templates/Post/quotefast.php b/Themes/default/templates/Post/quotefast.php
new file mode 100644
index 00000000000..2fc0339e03b
--- /dev/null
+++ b/Themes/default/templates/Post/quotefast.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for the AJAX quote feature
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Lang::getTxt('retrieving_quote', file: 'Post') ?></title>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/script.js<?= Utils::$context['browser_cache'] ?>"></script>
+	</head>
+	<body>
+		<?= Lang::getTxt('retrieving_quote', file: 'Post') ?>
+		<div id="temporary_posting_area" style="display: none;"></div>
+		<script><?php if (Utils::$context['close_window']): ?>
+
+			window.close();<?php else: ?><?php /* Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;) */ ?>
+
+			var quote = '<?= Utils::$context['quote']['text'] ?>';
+			var stage = 'createElement' in document ? document.createElement("DIV") : document.getElementById("temporary_posting_area");
+
+			if ('DOMParser' in window && !('opera' in window))
+			{
+				var xmldoc = new DOMParser().parseFromString("<temp>" + '<?= Utils::$context['quote']['mozilla'] ?>'.replace(/\n/g, "_SMF-BREAK_").replace(/\t/g, "_SMF-TAB_") + "</temp>", "text/xml");
+				quote = xmldoc.childNodes[0].textContent.replace(/_SMF-BREAK_/g, "\n").replace(/_SMF-TAB_/g, "\t");
+			}
+			else if ('innerText' in stage)
+			{
+				setInnerHTML(stage, quote.replace(/\n/g, "_SMF-BREAK_").replace(/\t/g, "_SMF-TAB_").replace(/</g, "&lt;").replace(/>/g, "&gt;"));
+				quote = stage.innerText.replace(/_SMF-BREAK_/g, "\n").replace(/_SMF-TAB_/g, "\t");
+			}
+
+			if ('opera' in window)
+				quote = quote.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
+
+			window.opener.onReceiveOpener(quote);
+
+			window.focus();
+			setTimeout(function() { window.close(); }, 400);<?php endif; ?>
+
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Post/spellcheck.php b/Themes/default/templates/Post/spellcheck.php
new file mode 100644
index 00000000000..8a3126c9255
--- /dev/null
+++ b/Themes/default/templates/Post/spellcheck.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for the spellchecker.
+ */
+?><?php /* The style information that makes the spellchecker look... like the forum hopefully! */ ?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Lang::getTxt('spell_check', file: 'General') ?></title>
+		<link rel="stylesheet" href="<?= Theme::$current->settings['theme_url'] ?>/css/index<?= Utils::$context['theme_variant'] ?>.css<?= Utils::$context['browser_cache'] ?>">
+		<style>
+			body, td {
+				font-size: small;
+				margin: 0;
+				background: #f0f0f0;
+				color: #000;
+				padding: 10px;
+			}
+			.highlight {
+				color: red;
+				font-weight: bold;
+			}
+			#spellview {
+				border-style: outset;
+				border: 1px solid black;
+				padding: 5px;
+				width: 95%;
+				height: 314px;
+				overflow: auto;
+				background: #ffffff;
+			}<?php /* As you may expect - we need a lot of javascript for this... load it from the separate files. */ ?>
+		</style>
+		<script>
+			var spell_formname = window.opener.spell_formname;
+			var spell_fieldname = window.opener.spell_fieldname;
+		</script>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/spellcheck.js<?= Utils::$context['browser_cache'] ?>"></script>
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/script.js<?= Utils::$context['browser_cache'] ?>"></script>
+		<script>
+			<?= Utils::$context['spell_js'] ?>
+
+		</script>
+	</head>
+	<body onload="nextWord(false);">
+		<form action="#" method="post" accept-charset="UTF-8" name="spellingForm" id="spellingForm" onsubmit="return false;">
+			<div id="spellview">&nbsp;</div>
+			<table width="100%">
+				<tr class="windowbg">
+					<td style="width: 50%; vertical-align: top">
+						<?= Lang::getTxt('spellcheck_change_to', file: 'Post') ?><br>
+						<input type="text" name="changeto" style="width: 98%;">
+					</td>
+					<td style="width: 50%">
+						<?= Lang::getTxt('spellcheck_suggest', file: 'Post') ?><br>
+						<select name="suggestions" style="width: 98%;" size="5" onclick="if (this.selectedIndex != -1) this.form.changeto.value = this.options[this.selectedIndex].text;" ondblclick="replaceWord();">
+						</select>
+					</td>
+				</tr>
+			</table>
+			<div class="righttext" style="padding: 4px;">
+				<input type="button" name="change" value="<?= Lang::getTxt('spellcheck_change', file: 'Post') ?>" onclick="replaceWord();" class="button">
+				<input type="button" name="changeall" value="<?= Lang::getTxt('spellcheck_change_all', file: 'Post') ?>" onclick="replaceAll();" class="button">
+				<input type="button" name="ignore" value="<?= Lang::getTxt('spellcheck_ignore', file: 'Post') ?>" onclick="nextWord(false);" class="button">
+				<input type="button" name="ignoreall" value="<?= Lang::getTxt('spellcheck_ignore_all', file: 'Post') ?>" onclick="nextWord(true);" class="button">
+			</div>
+		</form>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Printpage/index.php b/Themes/default/templates/Printpage/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Printpage/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Printpage/main.php b/Themes/default/templates/Printpage/main.php
new file mode 100644
index 00000000000..4a243c4ddc8
--- /dev/null
+++ b/Themes/default/templates/Printpage/main.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Topic;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main page. This shows the relevant info in a printer-friendly format
+ */
+?><?php if (!empty(Utils::$context['poll'])): ?>
+			<div id="poll_data">
+				<span><?= Lang::getTxt('poll', file: 'General') ?></span>
+				<div class="question">
+					<?= Lang::getTxt('poll_question', file: 'General') ?>: <strong><?= Utils::$context['poll']['question'] ?></strong>
+				</div><?php $options = 1; ?><?php foreach (Utils::$context['poll']['options'] as $option): ?>
+					<div>
+						<?= Lang::getTxt('option_number', [$options++], file: 'Post') ?>: <strong><?= $option['option'] ?></strong>
+						<?= Utils::$context['allow_results_view'] ? Lang::getTxt('number_of_votes', [$option['votes']], file: 'Post') : '' ?>
+					</div><?php endforeach; ?>
+			</div><?php endif; ?><?php foreach (Utils::$context['posts'] as $post): ?>
+			<div class="postheader">
+				<div><strong><?= $post['subject'] ?></strong></div>
+				<div><?= Lang::getTxt('posted_by_member_time', $post, file: 'General') ?></div>
+			</div>
+			<div class="postbody">
+				<?= Utils::adjustHeadingLevels($post['body'], 2) ?><?php /* Show attachment images */ ?><?php if (isset($_GET['images']) && !empty(Utils::$context['printattach'][$post['id_msg']])): ?>
+				<hr><?php foreach (Utils::$context['printattach'][$post['id_msg']] as $attach): ?>
+					<img width="<?= $attach['width'] ?>" height="<?= $attach['height'] ?>" src="<?= Config::$scripturl ?>?action=dlattach;topic=<?= Topic::$topic_id ?>.0;attach=<?= $attach['id_attach'] ?>" alt=""><?php endforeach; ?><?php endif; ?>
+			</div><!-- .postbody --><?php endforeach; ?>
diff --git a/Themes/default/templates/Printpage/print_above.php b/Themes/default/templates/Printpage/print_above.php
new file mode 100644
index 00000000000..b1c981cade8
--- /dev/null
+++ b/Themes/default/templates/Printpage/print_above.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The header. Defines the look and layout of the page as well as a form for choosing print options.
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="robots" content="noindex">
+		<link rel="canonical" href="<?= Utils::$context['canonical_url'] ?>">
+		<title><?= Lang::getTxt('print_page', file: 'General') ?> - <?= Utils::$context['topic_subject'] ?></title>
+		<style>
+			body, a {
+				color: #000;
+				background: #fff;
+			}
+			body, td, .normaltext {
+				font-family: Verdana, arial, helvetica, serif;
+				font-size: small;
+			}
+			h1#title {
+				font-size: large;
+				font-weight: bold;
+			}
+			h2#linktree {
+				margin: 1em 0 2.5em 0;
+				font-size: small;
+				font-weight: bold;
+			}
+			dl#posts {
+				width: 90%;
+				margin: 0;
+				padding: 0;
+				list-style: none;
+			}
+			div.postheader, #poll_data {
+				border: solid #000;
+				border-width: 1px 0;
+				padding: 4px 0;
+			}
+			div.postbody {
+				margin: 1em 0 2em 2em;
+			}
+			table {
+				empty-cells: show;
+			}
+			blockquote {
+				margin: 0 0 8px 0;
+				padding: 6px 10px;
+				font-size: small;
+				border: 1px solid #d6dfe2;
+				border-left: 2px solid #aaa;
+				border-right: 2px solid #aaa;
+			}
+			blockquote cite {
+				display: block;
+				border-bottom: 1px solid #aaa;
+				font-size: 0.9em;
+			}
+			blockquote cite:before {
+				color: #aaa;
+				font-size: 22px;
+				font-style: normal;
+				margin-right: 5px;
+			}
+			code {
+				border: 1px solid #000;
+				margin: 3px;
+				padding: 1px;
+				display: block;
+			}
+			code {
+				font: x-small monospace;
+			}
+			.smalltext, .codeheader {
+				font-size: x-small;
+			}
+			.largetext {
+				font-size: large;
+			}
+			.centertext {
+				text-align: center;
+			}
+			hr {
+				height: 1px;
+				border: 0;
+				color: black;
+				background-color: black;
+			}
+			.voted {
+				font-weight: bold;
+			}
+			#footer {
+				font-family: Verdana, sans-serif;
+			}
+			@media print {
+				.print_options {
+					display: none;
+				}
+			}
+			@media screen {
+				.print_options {
+					margin: 1em 0;
+				}
+			}<?php if (!empty(Config::$modSettings['max_image_width'])): ?>
+			.bbc_img {
+				max-width: <?= Config::$modSettings['max_image_width'] ?>px;
+			}<?php endif; ?><?php if (!empty(Config::$modSettings['max_image_height'])): ?>
+			.bbc_img {
+				max-height: <?= Config::$modSettings['max_image_height'] ?>px;
+			}<?php endif; ?>
+		</style>
+	</head>
+	<body><?php $this->subTemplate('print_options'); ?>
+		<h1 id="title"><?= Utils::$context['forum_name_html_safe'] ?></h1>
+		<h2 id="linktree"><?= Utils::$context['category_name'] ?> ▸ <?= (!empty(Utils::$context['parent_boards']) ? implode(' ▸ ', Utils::$context['parent_boards']) . ' ▸ ' : '') ?><?= Utils::$context['board_name'] ?> ▸ <?= Lang::getTxt('started_by_member_time', ['member' => Utils::$context['poster_name'], 'time' => Utils::$context['post_time']], file: 'General') ?></h2>
+		<div id="posts">
\ No newline at end of file
diff --git a/Themes/default/templates/Printpage/print_below.php b/Themes/default/templates/Printpage/print_below.php
new file mode 100644
index 00000000000..53622aad08c
--- /dev/null
+++ b/Themes/default/templates/Printpage/print_below.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The footer.
+ */
+?>
+		</div><!-- #posts --><?php $this->subTemplate('print_options'); ?>
+		<div id="footer" class="smalltext"><?= Theme::copyright() ?></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Printpage/print_options.php b/Themes/default/templates/Printpage/print_options.php
new file mode 100644
index 00000000000..8c71854980f
--- /dev/null
+++ b/Themes/default/templates/Printpage/print_options.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Topic;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays the print page options
+ */
+?>
+
+<?php
+$url_text = Config::$scripturl . '?action=printpage;topic=' . Topic::$topic_id . '.0';
+$url_images = $url_text . ';images';
+?>
+		<div class="print_options">
+<?php /* Which option is set, text or text&images */ ?>
+<?php if (isset($_REQUEST['images'])): ?>
+			<a href="<?= $url_text ?>"><?= Lang::getTxt('print_page_text', file: 'General') ?></a> | <strong><a href="<?= $url_images ?>"><?= Lang::getTxt('print_page_images', file: 'General') ?></a></strong>
+<?php else: ?>
+			<strong><a href="<?= $url_text ?>"><?= Lang::getTxt('print_page_text', file: 'General') ?></a></strong> | <a href="<?= $url_images ?>"><?= Lang::getTxt('print_page_images', file: 'General') ?></a>
+<?php endif; ?>
+		</div><!-- .print_options -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/alert_configuration.php b/Themes/default/templates/Profile/alert_configuration.php
new file mode 100644
index 00000000000..916a0200ecc
--- /dev/null
+++ b/Themes/default/templates/Profile/alert_configuration.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for configuring alerts
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('alert_prefs', file: 'Profile') ?>
+			</h3>
+		</div>
+		<p class="information">
+			<?= (empty(Utils::$context['description']) ? Lang::getTxt('alert_prefs_desc', file: 'Profile') : Utils::$context['description']) ?>
+		</p>
+		<form action="<?= Config::$scripturl ?>?<?= Utils::$context['action'] ?>" method="post" accept-charset="UTF-8" id="notify_options" class="flow_auto">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('notification_general', file: 'Profile') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for="notify_announcements"><?= Lang::getTxt('notify_important_email', file: 'Profile') ?></label><?= Utils::$context['id_member'] == 0 ? '
+						<br>
+						<span class="smalltext alert">' . Lang::getTxt('notify_announcements_desc', file: 'Admin') . '</span>' : '' ?>
+					</dt>
+					<dd>
+						<input type="hidden" name="notify_announcements" value="0">
+						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"<?= !empty(Utils::$context['member']['notify_announcements']) ? ' checked' : '' ?>>
+					</dd><?php if (!empty(Config::$modSettings['enable_ajax_alerts'])): ?>
+					<dt>
+						<label for="notify_alert_timeout"><?= Lang::getTxt('notify_alert_timeout', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" max="127" value="<?= Utils::$context['member']['alert_timeout'] ?>">
+					</dd><?php endif; ?>
+				</dl>
+			</div><!-- .windowbg -->
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('notify_what_how', file: 'Profile') ?>
+				</h3>
+			</div>
+			<table class="table_grid"><?php foreach (Utils::$context['alert_types'] as $alert_group => $alerts): ?>
+				<tr class="title_bar">
+					<th><?= Lang::getTxt('alert_group_' . $alert_group, file: 'Profile') ?></th>
+					<th><?= Lang::getTxt('receive_alert', file: 'Profile') ?></th>
+					<th><?= Lang::getTxt('receive_mail', file: 'Profile') ?></th>
+				</tr>
+				<tr class="windowbg"><?php if (isset(Utils::$context['alert_group_options'][$alert_group])): ?><?php foreach (Utils::$context['alert_group_options'][$alert_group] as $opts): ?><?php if ($opts[0] == 'hide'): ?><?php continue; ?><?php endif; ?>
+				<tr class="windowbg">
+					<td colspan="3"><?php
+$label = Lang::getTxt('alert_opt_' . $opts[1], file: 'Profile');
+$label_pos = $opts['label'] ?? '';
+?><?php if ($label_pos == 'before'): ?>
+						<label for="opt_<?= $opts[1] ?>"><?= $label ?></label><?php endif; ?><?php $this_value = Utils::$context['alert_prefs'][$opts[1]] ?? 0; ?><?php
+switch ($opts[0]) {
+					case 'check':
+						echo '
+						<input type="checkbox" name="opt_', $opts[1], '" id="opt_', $opts[1], '"', $this_value ? ' checked' : '', '>';
+						break;
+
+					case 'select':
+						echo '
+						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
+
+						foreach ($opts['opts'] as $k => $v) {
+							echo '
+							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
+						}
+						echo '
+						</select>';
+						break;
+				}
+?><?php if ($label_pos == 'after'): ?>
+						<label for="opt_<?= $opts[1] ?>"><?= $label ?></label><?php endif; ?>
+					</td>
+				</tr><?php endforeach; ?><?php endif; ?><?php foreach ($alerts as $alert_id => $alert_details): ?>
+				<tr class="windowbg">
+					<td>
+						<?= Lang::getTxt('alert_' . $alert_id, file: 'Profile') ?><?= isset($alert_details['help']) ? '<a href="' . Config::$scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="main_icons help" title="' . Lang::getTxt('help', file: 'General') . '"></span></a>' : '' ?>
+					</td><?php foreach (Utils::$context['alert_bits'] as $type => $bitmask): ?>
+					<td class="centercol"><?php $this_value = Utils::$context['alert_prefs'][$alert_id] ?? 0; ?><?php
+switch ($alert_details[$type]) {
+					case 'always':
+						echo '
+						<input type="checkbox" checked disabled>';
+						break;
+
+					case 'yes':
+						echo '
+						<input type="checkbox" name="', $type, '_', $alert_id, '"', ($this_value & $bitmask) ? ' checked' : '', '>';
+						break;
+
+					case 'never':
+						echo '
+						<input type="checkbox" disabled>';
+						break;
+				}
+?>
+					</td><?php endforeach; ?>
+				</tr><?php endforeach; ?><?php endforeach; ?>
+			</table>
+			<br>
+			<div>
+				<input id="notify_submit" type="submit" name="notify_submit" value="<?= Lang::getTxt('notify_save', file: 'Profile') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>"><?= !empty(Utils::$context['token_check']) ? '
+				<input type="hidden" name="' . Utils::$context[Utils::$context['token_check'] . '_token_var'] . '" value="' . Utils::$context[Utils::$context['token_check'] . '_token'] . '">' : '' ?>
+				<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+				<input type="hidden" name="sa" value="<?= Utils::$context['menu_item_selected'] ?>">
+			</div>
+		</form>
+		<br>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/alert_notifications_boards.php b/Themes/default/templates/Profile/alert_notifications_boards.php
new file mode 100644
index 00000000000..2f3f0b749fd
--- /dev/null
+++ b/Themes/default/templates/Profile/alert_notifications_boards.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing which boards you're subscribed to
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('watched_boards', file: 'Profile') ?>
+			</h3>
+		</div>
+		<p class="information"><?= Lang::getTxt('watched_boards_desc', file: 'Profile') ?></p>
+		<br><?php $this->subTemplate('show_list', ['list_id' => 'board_notification_list']); ?>
diff --git a/Themes/default/templates/Profile/alert_notifications_topics.php b/Themes/default/templates/Profile/alert_notifications_topics.php
new file mode 100644
index 00000000000..dbbab3b6b3d
--- /dev/null
+++ b/Themes/default/templates/Profile/alert_notifications_topics.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing which topics you're subscribed to
+ */
+?>
+
+<?php /* The main containing header. */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('watched_topics', file: 'Profile') ?>
+			</h3>
+		</div>
+		<p class="information"><?= Lang::getTxt('watched_topics_desc', file: 'Profile') ?></p>
+		<br><?php $this->subTemplate('show_list', ['list_id' => 'topic_notification_list']); ?>
diff --git a/Themes/default/templates/Profile/alerts_all_read.php b/Themes/default/templates/Profile/alerts_all_read.php
new file mode 100644
index 00000000000..36c42c369e6
--- /dev/null
+++ b/Themes/default/templates/Profile/alerts_all_read.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A simple template to say "You don't have any unread alerts".
+ */
+?><div class="no_unread"><?= Lang::getTxt('alerts_no_unread', file: 'Alerts') ?></div>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/alerts_popup.php b/Themes/default/templates/Profile/alerts_popup.php
new file mode 100644
index 00000000000..bb40bc8046a
--- /dev/null
+++ b/Themes/default/templates/Profile/alerts_popup.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The "popup" showing the user's alerts
+ */
+?><?php /* Unlike almost every other template, this is designed to be included into the HTML directly via $().load() */ ?>
+		<div class="alert_bar">
+			<div class="alerts_opts block">
+				<a href="<?= Config::$scripturl ?>?action=profile;area=notification;sa=markread;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" onclick="return markAlertsRead(this)"><?= Lang::getTxt('mark_alerts_read', file: 'Alerts') ?></a>
+				<a href="<?= Config::$scripturl ?>?action=profile;area=notification;sa=alerts" class="floatright"><?= Lang::getTxt('alert_settings', file: 'Alerts') ?></a>
+			</div>
+			<div class="alerts_box centertext">
+				<a href="<?= Config::$scripturl ?>?action=profile;area=showalerts" class="button"><?= Lang::getTxt('all_alerts', file: 'Alerts') ?></a>
+			</div>
+		</div>
+		<div class="alerts_unread"><?php if (empty(Utils::$context['unread_alerts'])): ?><?php $this->subTemplate('alerts_all_read'); ?><?php else: ?><?php foreach (Utils::$context['unread_alerts'] as $id_alert => $details): ?>
+			<<?= !$details['show_links'] ? 'a href="' . Config::$scripturl . '?action=profile;area=showalerts;alert=' . $id_alert . '" onclick="this.classList.add(\'alert_read\')"' : 'div' ?> class="unread_notify">
+				<div class="unread_notify_image">
+					<?= empty($details['sender']['avatar']['image']) ? '' : $details['sender']['avatar']['image'] . '
+					' ?><?= $details['icon'] ?>
+				</div>
+				<div class="details">
+					<span class="alert_text"><?= $details['text'] ?></span> - <span class="alert_time"><?= $details['time'] ?></span>
+				</div>
+			</<?= !$details['show_links'] ? 'a' : 'div' ?>><?php endforeach; ?><?php endif; ?>
+		</div><!-- .alerts_unread -->
+		<script>
+			function markAlertsRead(obj) {
+				ajax_indicator(true);
+				$.get(
+					obj.href,
+					function(data) {
+						ajax_indicator(false);
+						$("#alerts_menu_top span.amt").remove();
+						$("#alerts_menu div.alerts_unread").html(data);
+						if (typeof localStorage != "undefined")
+							localStorage.setItem("alertsCounter", 0);
+					}
+				);
+				return false;
+			}
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/deleteAccount.php b/Themes/default/templates/Profile/deleteAccount.php
new file mode 100644
index 00000000000..f4f7de3de6a
--- /dev/null
+++ b/Themes/default/templates/Profile/deleteAccount.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template to show for deleting a user's account - now with added delete post capability!
+ */
+?>
+
+<?php /* The main containing header. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=profile;area=deleteaccount;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
+			<div class="cat_bar">
+				<h3 class="catbg profile_hd">
+					<?= Lang::getTxt('deleteAccount', file: 'Profile') ?>
+				</h3>
+			</div>
+<?php /* If deleting another account give them a lovely info box. */ ?>
+<?php if (!Profile::$member->is_me): ?>
+			<p class="information"><?= Lang::getTxt('deleteAccount_desc', file: 'Profile') ?></p>
+<?php endif; ?>
+			<div class="windowbg">
+<?php /* If they are deleting their account AND the admin needs to approve it - give them another piece of info ;) */ ?>
+<?php if (Utils::$context['needs_approval']): ?>
+				<div class="noticebox"><?= Lang::getTxt('deleteAccount_approval', file: 'Profile') ?></div>
+<?php endif; ?>
+<?php /* If the user is deleting their own account warn them first - and require a password! */ ?>
+<?php if (Profile::$member->is_me): ?>
+				<div class="errorbox"><?= Lang::getTxt('own_profile_confirm', file: 'Profile') ?></div>
+				<fieldset>
+<?php if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])): ?>
+					<?= Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile') ?>
+
+<?php else: ?>
+					<label for="anonymize">
+						<input type="checkbox" name="anonymize" id="anonymize" value="1"> <?= Lang::getTxt('deleteAccount_anonymize', file: 'Profile') ?>
+					</label>
+<?php endif; ?>
+				</fieldset>
+				<fieldset>
+					<legend><?= Lang::getTxt('required_security_reasons', file: 'Profile') ?></legend>
+					<strong<?= (isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '') ?>><?= Lang::getTxt('current_password', file: 'Profile') ?></strong>
+					<input type="password" name="oldpasswrd" size="20">
+				</fieldset>
+				<input type="submit" value="<?= Lang::getTxt('delete', file: 'General') ?>" class="button floatright">
+<?php if (!empty(Utils::$context['token_check'])): ?>
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+<?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+				<input type="hidden" name="sa" value="<?= Utils::$context['menu_item_selected'] ?>">
+<?php /* Otherwise an admin doesn't need to enter a password - but they still get a warning - plus the option to delete lovely posts! */ ?>
+<?php else: ?>
+				<div class="errorbox"><?= Lang::getTxt('deleteAccount_warning', file: 'Profile') ?></div>
+<?php /* Only actually give these options if they are kind of important. */ ?>
+<?php if (Utils::$context['can_delete_posts']): ?>
+				<fieldset>
+					<label for="deleteVotes">
+						<input type="checkbox" name="deleteVotes" id="deleteVotes" value="1"> <?= Lang::getTxt('deleteAccount_votes', file: 'Profile') ?>
+					</label>
+				</fieldset>
+				<fieldset>
+					<label for="deletePosts">
+						<input type="checkbox" name="deletePosts" id="deletePosts" value="1"> <?= Lang::getTxt('deleteAccount_posts', file: 'Profile') ?>
+					</label>
+					<select name="remove_type">
+						<option value="posts"><?= Lang::getTxt('deleteAccount_all_posts', file: 'Profile') ?></option>
+						<option value="topics"><?= Lang::getTxt('deleteAccount_topics', file: 'Profile') ?></option>
+					</select>
+<?php if (Utils::$context['show_perma_delete']): ?>
+					<br>
+					<label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1"> <?= Lang::getTxt('deleteAccount_permanent', file: 'Profile') ?></label>
+<?php endif; ?>
+				</fieldset>
+<?php endif; ?>
+				<fieldset>
+					<label for="deleteAccount">
+						<input type="checkbox" name="deleteAccount" id="deleteAccount" value="1" onclick="if (this.checked) return confirm('<?= Lang::getTxt('deleteAccount_confirm', file: 'Profile') ?>');"> <?= Lang::getTxt('deleteAccount_member', file: 'Profile') ?>
+					</label>
+					<br>
+<?php if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])): ?>
+					<?= Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile') ?>
+
+<?php else: ?>
+					<label for="anonymize">
+						<input type="checkbox" name="anonymize" id="anonymize" value="1"> <?= Lang::getTxt('deleteAccount_anonymize', file: 'Profile') ?>
+					</label>
+<?php endif; ?>
+				</fieldset>
+				<div>
+					<input type="submit" value="<?= Lang::getTxt('delete', file: 'General') ?>" class="button floatright">
+<?php if (!empty(Utils::$context['token_check'])): ?>
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+<?php endif; ?>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+					<input type="hidden" name="sa" value="<?= Utils::$context['menu_item_selected'] ?>">
+				</div>
+<?php endif; ?>
+			</div><!-- .windowbg -->
+			<br>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/editBuddies.php b/Themes/default/templates/Profile/editBuddies.php
new file mode 100644
index 00000000000..e319faf55f1
--- /dev/null
+++ b/Themes/default/templates/Profile/editBuddies.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing and managing the buddy list.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+	<div class="infobox"><?= Lang::getTxt(Profile::$member->is_me ? 'profile_updated_own' : 'profile_updated_else', Utils::$context['member'], file: 'Profile') ?></div><?php elseif (!empty(Utils::$context['saved_failed'])): ?>
+	<div class="errorbox"><?= Utils::$context['saved_failed'] ?></div><?php endif; ?>
+	<div id="edit_buddies">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons people icon"></span> <?= Lang::getTxt('editBuddies', file: 'Profile') ?>
+			</h3>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th scope="col" class="quarter_table buddy_link"><?= Lang::getTxt('name', file: 'General') ?></th>
+					<th scope="col" class="buddy_status"><?= Lang::getTxt('status', file: 'General') ?></th><?php if (Utils::$context['can_moderate_forum']): ?>
+					<th scope="col" class="buddy_email"><?= Lang::getTxt('email', file: 'General') ?></th><?php endif; ?><?php if (!empty(Utils::$context['custom_pf'])): ?><?php foreach (Utils::$context['custom_pf'] as $column): ?>
+					<th scope="col" class="buddy_custom_fields"><?= $column['label'] ?></th><?php endforeach; ?><?php endif; ?>
+					<th scope="col" class="buddy_remove"><?= Lang::getTxt('remove', file: 'General') ?></th>
+				</tr>
+			</thead>
+			<tbody><?php /* If they don't have any buddies don't list them! */ ?><?php if (empty(Utils::$context['buddies'])): ?>
+				<tr class="windowbg">
+					<td colspan="<?= Utils::$context['can_moderate_forum'] ? '10' : '9' ?>">
+						<strong><?= Lang::getTxt('no_buddies', file: 'Profile') ?></strong>
+					</td>
+				</tr><?php /* Now loop through each buddy showing info on each. */ ?><?php else: ?><?php foreach (Utils::$context['buddies'] as $buddy): ?>
+				<tr class="windowbg">
+					<td class="buddy_link"><?= $buddy['link'] ?></td>
+					<td class="centertext buddy_status">
+						<a href="<?= $buddy['online']['href'] ?>"><span class="<?= ($buddy['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= $buddy['online']['text'] ?>"></span></a>
+					</td><?php if ($buddy['show_email']): ?>
+					<td class="buddy_email centertext">
+						<a href="mailto:<?= $buddy['email'] ?>" rel="nofollow"><span class="main_icons mail icon" title="<?= Lang::getTxt('email', file: 'General') ?> <?= $buddy['name'] ?>"></span></a>
+					</td><?php endif; ?><?php /* Show the custom profile fields for this user. */ ?><?php if (!empty(Utils::$context['custom_pf'])): ?><?php foreach (Utils::$context['custom_pf'] as $key => $column): ?>
+					<td class="centertext buddy_custom_fields"><?= $buddy['options'][$key] ?></td><?php endforeach; ?><?php endif; ?>
+					<td class="centertext buddy_remove">
+						<a href="<?= Config::$scripturl ?>?action=profile;area=lists;sa=buddies;u=<?= Utils::$context['id_member'] ?>;remove=<?= $buddy['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="main_icons delete" title="<?= Lang::getTxt('buddy_remove', file: 'Profile') ?>"></span></a>
+					</td>
+				</tr><?php endforeach; ?><?php endif; ?>
+			</tbody>
+		</table>
+	</div><!-- #edit_buddies --><?php /* Add a new buddy? */ ?>
+	<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=lists;sa=buddies" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('buddy_add', file: 'Profile') ?></h3>
+		</div>
+		<div class="information">
+			<dl class="settings">
+				<dt>
+					<label for="new_buddy"><strong><?= Lang::getTxt('who_member', file: 'General') ?>:</strong></label>
+				</dt>
+				<dd>
+					<input type="text" name="new_buddy" id="new_buddy" size="30">
+					<input type="submit" value="<?= Lang::getTxt('buddy_add_button', file: 'Profile') ?>" class="button floatnone">
+				</dd>
+			</dl>
+		</div><?php if (!empty(Utils::$context['token_check'])): ?>
+		<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?php endif; ?>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<script>
+		var oAddBuddySuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'new_buddy',
+			sControlId: 'new_buddy',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/editIgnoreList.php b/Themes/default/templates/Profile/editIgnoreList.php
new file mode 100644
index 00000000000..b8422838464
--- /dev/null
+++ b/Themes/default/templates/Profile/editIgnoreList.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing the ignore list of the current user.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+	<div class="infobox"><?= Lang::getTxt(Profile::$member->is_me ? 'profile_updated_own' : 'profile_updated_else', Utils::$context['member'], file: 'Profile') ?></div><?php elseif (!empty(Utils::$context['saved_failed'])): ?>
+	<div class="errorbox"><?= Utils::$context['saved_failed'] ?></div><?php endif; ?>
+	<div id="edit_buddies">
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt('editIgnoreList', file: 'Profile') ?>
+			</h3>
+		</div>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th scope="col" class="quarter_table buddy_link"><?= Lang::getTxt('name', file: 'General') ?></th>
+					<th scope="col" class="buddy_status"><?= Lang::getTxt('status', file: 'General') ?></th><?php if (Utils::$context['can_moderate_forum']): ?>
+					<th scope="col" class="buddy_email"><?= Lang::getTxt('email', file: 'General') ?></th><?php endif; ?>
+					<th scope="col" class="buddy_remove"><?= Lang::getTxt('ignore_remove', file: 'Profile') ?></th>
+				</tr>
+			</thead>
+			<tbody><?php /* If they don't have anyone on their ignore list, don't list it! */ ?><?php if (empty(Utils::$context['ignore_list'])): ?>
+				<tr class="windowbg">
+					<td colspan="<?= Utils::$context['can_moderate_forum'] ? '4' : '3' ?>">
+						<strong><?= Lang::getTxt('no_ignore', file: 'Profile') ?></strong>
+					</td>
+				</tr><?php endif; ?><?php /* Now loop through each buddy showing info on each. */ ?><?php foreach (Utils::$context['ignore_list'] as $member): ?>
+				<tr class="windowbg">
+					<td class="buddy_link"><?= $member['link'] ?></td>
+					<td class="centertext buddy_status">
+						<a href="<?= $member['online']['href'] ?>"><span class="<?= ($member['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= $member['online']['text'] ?>"></span></a>
+					</td><?php if (Utils::$context['can_moderate_forum']): ?>
+					<td class="centertext buddy_email">
+						<a href="mailto:<?= $member['email'] ?>" rel="nofollow"><span class="main_icons mail icon" title="<?= Lang::getTxt('email', file: 'General') ?> <?= $member['name'] ?>"></span></a>
+					</td><?php endif; ?>
+					<td class="centertext buddy_remove">
+						<a href="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=lists;sa=ignore;remove=<?= $member['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><span class="main_icons delete" title="<?= Lang::getTxt('ignore_remove', file: 'Profile') ?>"></span></a>
+					</td>
+				</tr><?php endforeach; ?>
+			</tbody>
+		</table>
+	</div><!-- #edit_buddies --><?php /* Add to the ignore list? */ ?>
+	<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=lists;sa=ignore" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('ignore_add', file: 'Profile') ?></h3>
+		</div>
+		<div class="information">
+			<dl class="settings">
+				<dt>
+					<label for="new_ignore"><strong><?= Lang::getTxt('who_member', file: 'General') ?></strong></label>
+				</dt>
+				<dd>
+					<input type="text" name="new_ignore" id="new_ignore" size="30">
+					<input type="submit" value="<?= Lang::getTxt('ignore_add_button', file: 'Profile') ?>" class="button">
+				</dd>
+			</dl>
+		</div><?php if (!empty(Utils::$context['token_check'])): ?>
+		<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?php endif; ?>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
+	<script>
+		var oAddIgnoreSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sSuggestId: 'new_ignore',
+			sControlId: 'new_ignore',
+			sSearchType: 'member',
+			sTextDeleteItem: '<?= Lang::getTxt('autosuggest_delete_item', file: 'General') ?>',
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/edit_options.php b/Themes/default/templates/Profile/edit_options.php
new file mode 100644
index 00000000000..d521693dda5
--- /dev/null
+++ b/Themes/default/templates/Profile/edit_options.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for editing profile options.
+ */
+?><?php
+// The main header!
+// because some browsers ignore autocomplete=off and fill username in display name and/ or email field, fake them out.
+$url = !empty(Utils::$context['profile_custom_submit_url']) ? Utils::$context['profile_custom_submit_url'] : Config::$scripturl . '?action=profile;area=' . Utils::$context['menu_item_selected'] . ';u=' . Utils::$context['id_member'];
+$url = Utils::$context['require_password'] && !empty(Config::$modSettings['force_ssl']) ? strtr($url, ['http://' => 'https://']) : $url;
+?>
+		<form action="<?= $url ?>" method="post" accept-charset="UTF-8" name="creator" id="creator" enctype="multipart/form-data"<?= (Utils::$context['menu_item_selected'] == 'account' ? ' autocomplete="off"' : '') ?>>
+			<div class="cat_bar">
+				<h3 class="catbg profile_hd"><?php /* Don't say "Profile" if this isn't the profile... */ ?><?php if (!empty(Utils::$context['profile_header_text'])): ?>
+					<?= Utils::$context['profile_header_text'] ?><?php else: ?>
+					<?= Lang::getTxt('profile', file: 'General') ?><?php endif; ?>
+				</h3>
+			</div><?php /* Have we some description? */ ?><?php if (Utils::$context['page_desc']): ?>
+			<p class="information"><?= Utils::$context['page_desc'] ?></p><?php endif; ?>
+			<div class="roundframe"><?php /* Any bits at the start? */ ?><?php if (!empty(Utils::$context['profile_prehtml'])): ?>
+				<div><?= Utils::$context['profile_prehtml'] ?></div><?php endif; ?><?php if (!empty(Utils::$context['profile_fields'])): ?>
+				<dl class="settings"><?php endif; ?><?php
+// Start the big old loop 'of love.
+$lastItem = 'hr';
+?><?php foreach (Utils::$context['profile_fields'] as $key => $field): ?><?php /* We add a little hack to be sure we never get more than one hr in a row! */ ?><?php if ($lastItem == 'hr' && $field['type'] == 'hr'): ?><?php continue; ?><?php endif; ?><?php $lastItem = $field['type']; ?><?php if ($field['type'] == 'hr'): ?>
+				</dl>
+				<hr>
+				<dl class="settings"><?php elseif ($field['type'] == 'callback'): ?><?php if (isset($field['callback_func']) && $this->hasSubTemplate('profile_' . $field['callback_func'])): ?><?php $this->subTemplate('profile_' . $field['callback_func']); ?><?php endif; ?><?php else: ?>
+					<dt>
+						<strong<?= !empty($field['is_error']) ? ' class="error"' : '' ?>><?= $field['type'] !== 'label' ? '<label for="' . $key . '">' : '' ?><?= $field['label'] ?><?= $field['type'] !== 'label' ? '</label>' : '' ?></strong><?php /* Does it have any subtext to show? */ ?><?php if (!empty($field['subtext'])): ?>
+						<br>
+						<span class="smalltext"><?= $field['subtext'] ?></span><?php endif; ?>
+					</dt>
+					<dd><?php /* Want to put something infront of the box? */ ?><?php if (!empty($field['preinput'])): ?>
+						<?= $field['preinput'] ?><?php endif; ?><?php /* What type of data are we showing? */ ?><?php if ($field['type'] == 'label'): ?>
+						<?= $field['value'] ?><?php /* Maybe it's a text box - very likely! */ ?><?php elseif (in_array($field['type'], ['int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url'])): ?><?php if ($field['type'] == 'int' || $field['type'] == 'float'): ?><?php $type = 'number'; ?><?php else: ?><?php $type = $field['type']; ?><?php endif; ?><?php $step = $field['type'] == 'float' ? ' step="0.1"' : ''; ?>
+						<input type="<?= $type ?>" name="<?= $key ?>" id="<?= $key ?>" size="<?= empty($field['size']) ? 30 : $field['size'] ?>"<?= isset($field['min']) ? ' min="' . $field['min'] . '"' : '' ?><?= isset($field['max']) ? ' max="' . $field['max'] . '"' : '' ?> value="<?= $field['value'] ?>" <?= $field['input_attr'] ?> <?= $step ?>><?php /* You "checking" me out? ;) */ ?><?php elseif ($field['type'] == 'check'): ?>
+						<input type="hidden" name="<?= $key ?>" value="0">
+						<input type="checkbox" name="<?= $key ?>" id="<?= $key ?>"<?= !empty($field['value']) ? ' checked' : '' ?> value="1" <?= $field['input_attr'] ?>><?php /* Always fun - select boxes! */ ?><?php elseif ($field['type'] == 'select'): ?>
+						<select name="<?= $key ?>" id="<?= $key ?>"><?php if (isset($field['options'])): ?><?php /* Is this some code to generate the options? */ ?><?php if (!is_array($field['options'])): ?><?php $field['options'] = $field['options'](); ?><?php endif; ?><?php /* Assuming we now have some! */ ?><?php if (is_array($field['options'])): ?><?php foreach ($field['options'] as $value => $name): ?>
+							<option value="<?= $value ?>"<?= (!empty($field['disabled_options']) && is_array($field['disabled_options']) && in_array($value, $field['disabled_options'], true) ? ' disabled' : ($value == $field['value'] ? ' selected' : '')) ?>><?= $name ?></option><?php endforeach; ?><?php endif; ?><?php endif; ?>
+						</select><?php endif; ?><?php /* Something to end with? */ ?><?php if (!empty($field['postinput'])): ?>
+						<?= $field['postinput'] ?><?php endif; ?>
+					</dd><?php endif; ?><?php endforeach; ?><?php if (!empty(Utils::$context['profile_fields'])): ?>
+				</dl><?php endif; ?><?php /* Are there any custom profile fields - if so print them! */ ?><?php if (!empty(Utils::$context['custom_fields'])): ?><?php if ($lastItem != 'hr'): ?>
+				<hr><?php endif; ?>
+				<dl class="settings"><?php foreach (Utils::$context['custom_fields'] as $field): ?>
+					<dt>
+						<strong><?= $field['name'] ?></strong><br>
+						<span class="smalltext"><?= $field['desc'] ?></span>
+					</dt>
+					<dd>
+						<?= $field['input_html'] ?>
+					</dd><?php endforeach; ?>
+				</dl><?php endif; ?><?php /* Any closing HTML? */ ?><?php if (!empty(Utils::$context['profile_posthtml'])): ?>
+				<div><?= Utils::$context['profile_posthtml'] ?></div><?php endif; ?><?php /* Only show the password box if it's actually needed. */ ?><?php if (Utils::$context['require_password']): ?>
+				<dl class="settings">
+					<dt>
+						<strong<?= isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '' ?>><label for="oldpasswrd"><?= Lang::getTxt('current_password', file: 'Profile') ?></label></strong><br>
+						<span class="smalltext"><?= Lang::getTxt('required_security_reasons', file: 'Profile') ?></span>
+					</dt>
+					<dd>
+						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20">
+					</dd>
+				</dl><?php endif; ?><?php /* The button shouldn't say "Change profile" unless we're changing the profile... */ ?><?php if (!empty(Utils::$context['submit_button_text'])): ?>
+				<input type="submit" name="save" value="<?= Utils::$context['submit_button_text'] ?>" class="button floatright"><?php else: ?>
+				<input type="submit" name="save" value="<?= Lang::getTxt('change_profile', file: 'Profile') ?>" class="button floatright"><?php endif; ?><?php if (!empty(Utils::$context['token_check'])): ?>
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+				<input type="hidden" name="sa" value="<?= Utils::$context['menu_item_selected'] ?>">
+			</div><!-- .roundframe -->
+		</form><?php /* Any final spellchecking stuff? */ ?><?php if (!empty(Utils::$context['show_spellchecking'])): ?>
+		<form name="spell_form" id="spell_form" method="post" accept-charset="UTF-8" target="spellWindow" action="<?= Config::$scripturl ?>?action=spellcheck"><input type="hidden" name="spellstring" value=""></form><?php endif; ?>
diff --git a/Themes/default/templates/Profile/error_message.php b/Themes/default/templates/Profile/error_message.php
new file mode 100644
index 00000000000..0a3f8316f7e
--- /dev/null
+++ b/Themes/default/templates/Profile/error_message.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Security;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Small template for showing an error message upon a save problem in the profile.
+ */
+?>
+		<div class="errorbox" <?= empty(Utils::$context['post_errors']) ? 'style="display:none" ' : '' ?>id="profile_error">
+<?php if (!empty(Utils::$context['post_errors'])): ?>
+			<span><?= !empty(Utils::$context['custom_error_title']) ? Utils::$context['custom_error_title'] : Lang::getTxt('profile_errors_occurred', file: 'Errors') ?></span>
+			<ul id="list_errors">
+<?php /* Cycle through each error and display an error message. */ ?>
+<?php foreach (Utils::$context['post_errors'] as $error): ?>
+<?php if ($error == 'password_short'): ?>
+<?php $error_message = Lang::getTxt('profile_error_' . $error, [Security::minimumPasswordLength()], file: 'Profile'); ?>
+<?php else: ?>
+<?php $error_message = Lang::txtExists('profile_error_' . $error, file: 'Profile') ? Lang::getTxt('profile_error_' . $error, file: 'Profile') : $error; ?>
+<?php endif; ?>
+				<li><?= $error_message ?></li>
+<?php endforeach; ?>
+			</ul>
+<?php endif; ?>
+		</div><!-- #profile_error -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/export_profile_data.php b/Themes/default/templates/Profile/export_profile_data.php
new file mode 100644
index 00000000000..f0e12f7e613
--- /dev/null
+++ b/Themes/default/templates/Profile/export_profile_data.php
@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for initiating and retrieving profile data exports
+ */
+?>
+
+<?php
+$default_settings = ['included' => [], 'format' => ''];
+$dltoken = '';
+// The main containing header.
+?>
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt('export_profile_data', file: 'Profile') ?>
+			</h3>
+		</div>
+		<div class="information"><?= Utils::$context['export_profile_data_desc'] ?></div>
+<?php if (!empty(Utils::$context['completed_exports'])): ?>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('completed_exports', file: 'Profile') ?></h3>
+		</div>
+		<div class="windowbg noup">
+<?php foreach (Utils::$context['completed_exports'] as $basehash_ext => $parts): ?>
+			<form action="<?= Config::$scripturl ?>?action=profile;area=getprofiledata;u=<?= Utils::$context['id_member'] ?>" method="post" accept-charset="UTF-8" class="<?= count(Utils::$context['completed_exports']) > 1 ? 'descbox' : 'padding' ?>">
+<?php if (!empty(Utils::$context['outdated_exports'][$basehash_ext])): ?>
+				<div class="noticebox">
+					<p><?= Lang::getTxt('export_outdated_warning', file: 'Profile') ?></p>
+					<ul class="bbc_list">
+<?php foreach (Utils::$context['outdated_exports'][$basehash_ext] as $datatype): ?>
+						<li><?= Lang::getTxt($datatype, file: 'General+Profile') ?></li>
+<?php endforeach; ?>
+					</ul>
+				</div>
+<?php endif; ?>
+				<p><?= Lang::getTxt(
+				'export_file_desc',
+				[
+					'list' => $parts[1]['included_desc'],
+					'format' => Utils::$context['export_formats'][$parts[1]['format']]['description'],
+				],
+				file: 'Profile',
+			) ?></p>
+<?php if (count($parts) > 10): ?>
+				<details>
+					<summary><?= Lang::getTxt('export_file_count', [count($parts)], file: 'Profile') ?></summary>
+<?php endif; ?>
+				<ul class="bbc_list" id="<?= $parts[1]['format'] ?>_export_files">
+<?php foreach ($parts as $part => $file): ?>
+<?php $dltoken = $file['dltoken']; ?>
+<?php if (empty($default_settings['included'])): ?>
+<?php $default_settings['included'] = $file['included']; ?>
+<?php endif; ?>
+<?php if (empty($default_settings['format'])): ?>
+<?php $default_settings['format'] = $file['format']; ?>
+<?php endif; ?>
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=profile;area=download;u=<?= Utils::$context['id_member'] ?>;format=<?= $file['format'] ?>;part=<?= $part ?>;t=<?= $dltoken ?>" class="bbc_link" download><?= $file['dlbasename'] ?></a> (<?= $file['size'] ?>, <?= $file['mtime'] ?>)
+					</li>
+<?php endforeach; ?>
+				</ul>
+<?php if (count($parts) > 10): ?>
+				</details>
+<?php endif; ?>
+				<div class="righttext">
+					<input type="submit" name="delete" value="<?= Lang::getTxt('delete', file: 'General') ?>" class="button you_sure">
+					<input type="hidden" name="format" value="<?= $parts[1]['format'] ?>">
+					<input type="hidden" name="t" value="<?= $dltoken ?>">
+					<button type="button" class="button export_download_all" style="display:none" onclick="export_download_all('<?= $parts[1]['format'] ?>');"><?= Lang::getTxt('export_download_all', file: 'Profile') ?></button>
+				</div>
+			</form>
+<?php endforeach; ?>
+		</div>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['active_exports'])): ?>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('active_exports', file: 'Profile') ?></h3>
+		</div>
+		<div class="windowbg noup">
+<?php foreach (Utils::$context['active_exports'] as $file): ?>
+<?php $dltoken = $file['dltoken']; ?>
+<?php if (empty($default_settings['included'])): ?>
+<?php $default_settings['included'] = $file['included']; ?>
+<?php endif; ?>
+<?php if (empty($default_settings['format'])): ?>
+<?php $default_settings['format'] = $file['format']; ?>
+<?php endif; ?>
+			<form action="<?= Config::$scripturl ?>?action=profile;area=getprofiledata;u=<?= Utils::$context['id_member'] ?>" method="post" accept-charset="UTF-8"<?= count(Utils::$context['active_exports']) > 1 ? ' class="descbox"' : '' ?>>
+				<p class="padding"><?= Lang::getTxt(
+				'export_file_desc',
+				[
+					'list' => $file['included_desc'],
+					'format' => Utils::$context['export_formats'][$file['format']]['description'],
+				],
+				file: 'Profile',
+			) ?></p>
+				<div class="righttext">
+					<input type="submit" name="delete" value="<?= Lang::getTxt('export_cancel', file: 'Profile') ?>" class="button you_sure">
+					<input type="hidden" name="format" value="<?= $file['format'] ?>">
+					<input type="hidden" name="t" value="<?= $dltoken ?>">
+				</div>
+			</form>
+<?php endforeach; ?>
+		</div>
+<?php endif; ?>
+		<div class="title_bar">
+			<h3 class="titlebg"><?= Lang::getTxt('export_settings', file: 'Profile') ?></h3>
+		</div>
+		<div class="windowbg noup">
+			<form action="<?= Config::$scripturl ?>?action=profile;area=getprofiledata;u=<?= Utils::$context['id_member'] ?>" method="post" accept-charset="UTF-8">
+				<dl class="settings">
+<?php foreach (Utils::$context['export_datatypes'] as $datatype => $datatype_settings): ?>
+<?php if (!empty($datatype_settings['label'])): ?>
+					<dt>
+						<strong><label for="<?= $datatype ?>"><?= $datatype_settings['label'] ?></label></strong>
+					</dt>
+					<dd>
+						<input type="checkbox" id="<?= $datatype ?>" name="<?= $datatype ?>"<?= in_array($datatype, $default_settings['included']) ? ' checked' : '' ?>>
+					</dd>
+<?php endif; ?>
+<?php endforeach; ?>
+				</dl>
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('export_format', file: 'Profile') ?></strong>
+					</dt>
+					<dd>
+						<select id="export_format_select" name="format">
+<?php foreach (Utils::$context['export_formats'] as $format => $format_settings): ?>
+							<option value="<?= $format ?>"<?= $format == $default_settings['format'] ? ' selected' : '' ?>><?= $format_settings['description'] ?></option>
+<?php endforeach; ?>
+						</select>
+					</dd>
+				</dl>
+				<div class="righttext">
+<?php /* At least one active or completed export exists. */ ?>
+<?php if (!empty($dltoken)): ?>
+					<div id="export_begin" style="display:none">
+						<input type="submit" name="export_begin" value="<?= Lang::getTxt('export_begin', file: 'Profile') ?>" class="button">
+					</div>
+					<div id="export_restart">
+						<input type="submit" name="export_begin" value="<?= Lang::getTxt('export_restart', file: 'Profile') ?>" class="button you_sure" data-confirm="<?= Lang::getTxt('export_restart_confirm', file: 'Profile') ?>">
+						<input type="hidden" name="delete">
+						<input type="hidden" name="t" value="<?= $dltoken ?>">
+					</div>
+<?php /* No existing exports. */ ?>
+<?php else: ?>
+					<input type="submit" name="export_begin" value="<?= Lang::getTxt('export_begin', file: 'Profile') ?>" class="button">
+<?php endif; ?>
+					<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				</div>
+			</form>
+		</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/groupMembership.php b/Themes/default/templates/Profile/groupMembership.php
new file mode 100644
index 00000000000..2110d11e4ef
--- /dev/null
+++ b/Themes/default/templates/Profile/groupMembership.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for choosing group membership.
+ */
+?>
+
+<?php /* The main containing header. */ ?>
+		<form action="<?= Config::$scripturl ?>?action=profile;area=groupmembership;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
+			<div class="cat_bar">
+				<h3 class="catbg profile_hd">
+					<?= Lang::getTxt('profile', file: 'General') ?>
+				</h3>
+			</div>
+			<p class="information"><?= Lang::getTxt('groupMembership_info', file: 'Profile') ?></p>
+<?php /* Do we have an update message? */ ?>
+<?php if (!empty(Utils::$context['update_message'])): ?>
+			<div class="infobox">
+				<?= Utils::$context['update_message'] ?>
+			</div>
+<?php endif; ?>
+			<div id="groups">
+<?php /* Requesting membership to a group? */ ?>
+<?php if (!empty(Utils::$context['group_request'])): ?>
+			<div class="groupmembership">
+				<div class="cat_bar">
+					<h3 class="catbg"><?= Lang::getTxt('request_group_membership', file: 'Profile') ?></h3>
+				</div>
+				<div class="roundframe">
+					<span><?= Lang::getTxt('request_group_membership_desc', file: 'Profile') ?></span>
+					<textarea name="reason" rows="4"></textarea>
+					<div class="righttext">
+						<input type="hidden" name="gid" value="<?= Utils::$context['group_request']['id'] ?>">
+						<input type="submit" name="req" value="<?= Lang::getTxt('submit_request', file: 'Profile') ?>" class="button">
+						</div>
+					</div>
+				</div><!-- .groupmembership -->
+<?php else: ?>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= Lang::getTxt('current_membergroups', file: 'Profile') ?></h3>
+				</div>
+<?php foreach (Utils::$context['groups']['member'] as $group): ?>
+				<div class="windowbg" id="primdiv_<?= $group['id'] ?>">
+<?php if (Utils::$context['can_edit_primary']): ?>
+					<input type="radio" name="primary" id="primary_<?= $group['id'] ?>" value="<?= $group['id'] ?>"<?= $group['is_primary'] ? ' checked' : '' ?><?= $group['can_be_primary'] ? '' : ' disabled' ?>>
+<?php endif; ?>
+					<label for="primary_<?= $group['id'] ?>"><strong><?= (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>') ?></strong><?= (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : '') ?></label>
+<?php /* Can they leave their group? */ ?>
+<?php if ($group['can_leave']): ?>
+					<a href="<?= Config::$scripturl ?>?action=profile;save;u=<?= Utils::$context['id_member'] ?>;area=groupmembership;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;gid=<?= $group['id'] ?>;<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>=<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?= Lang::getTxt('leave_group', file: 'Profile') ?></a>
+<?php endif; ?>
+				</div><!-- .windowbg -->
+<?php endforeach; ?>
+<?php if (Utils::$context['can_edit_primary']): ?>
+				<div class="padding righttext">
+					<input type="submit" value="<?= Lang::getTxt('make_primary', file: 'Profile') ?>" class="button">
+				</div>
+<?php endif; ?>
+<?php /* Any groups they can join? */ ?>
+<?php if (!empty(Utils::$context['groups']['available'])): ?>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= Lang::getTxt('available_groups', file: 'Profile') ?></h3>
+				</div>
+<?php foreach (Utils::$context['groups']['available'] as $group): ?>
+				<div class="windowbg">
+					<strong><?= (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>') ?></strong><?= (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : '') ?>
+
+<?php if ($group['type'] == 3): ?>
+					<a href="<?= Config::$scripturl ?>?action=profile;save;u=<?= Utils::$context['id_member'] ?>;area=groupmembership;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;gid=<?= $group['id'] ?>;<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>=<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>" class="button floatright"><?= Lang::getTxt('join_group', file: 'Profile') ?></a>
+<?php elseif ($group['type'] == 2 && $group['pending']): ?>
+					<span class="floatright"><?= Lang::getTxt('approval_pending', file: 'Profile') ?></span>
+<?php elseif ($group['type'] == 2): ?>
+					<a href="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=groupmembership;request=<?= $group['id'] ?>" class="button floatright"><?= Lang::getTxt('request_group', file: 'Profile') ?></a>
+<?php endif; ?>
+				</div><!-- .windowbg -->
+<?php endforeach; ?>
+<?php endif; ?>
+<?php endif; ?>
+			</div><!-- #groups -->
+<?php if (!empty(Utils::$context['token_check'])): ?>
+			<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+<?php endif; ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/ignoreboards.php b/Themes/default/templates/Profile/ignoreboards.php
new file mode 100644
index 00000000000..4824ef5a282
--- /dev/null
+++ b/Themes/default/templates/Profile/ignoreboards.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for managing ignored boards
+ */
+?><?php /* The main containing header. */ ?>
+	<form action="<?= Config::$scripturl ?>?action=profile;area=ignoreboards;save" method="post" accept-charset="UTF-8" name="creator" id="creator">
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt('profile', file: 'General') ?>
+			</h3>
+		</div>
+		<p class="information"><?= Lang::getTxt('ignoreboards_info', file: 'Profile') ?></p>
+		<div class="windowbg">
+			<div class="flow_hidden boardslist">
+				<ul><?php foreach (Utils::$context['categories'] as $category): ?>
+					<li>
+						<a href="javascript:void(0);" onclick="selectBoards([<?= implode(', ', $category['child_ids']) ?>], 'creator'); return false;"><?= $category['name'] ?></a>
+						<ul><?php $cat_boards = array_values($category['boards']); ?><?php foreach ($cat_boards as $key => $board): ?>
+							<li>
+								<label for="brd<?= $board['id'] ?>">
+									<input type="checkbox" id="brd<?= $board['id'] ?>" name="brd[<?= $board['id'] ?>]" value="<?= $board['id'] ?>"<?= $board['selected'] ? ' checked' : '' ?>>
+									<?= $board['name'] ?>
+								</label><?php
+// Nest child boards inside another list.
+$curr_child_level = $board['child_level'];
+$next_child_level = $cat_boards[$key + 1]['child_level'] ?? 0;
+?><?php if ($next_child_level > $curr_child_level): ?>
+								<ul style="margin-inline-start: 2.5ch;"><?php else: ?><?php
+// Close child board lists until we reach a common level
+// with the next board.
+?><?php while ($next_child_level < $curr_child_level--): ?>
+									</li>
+								</ul><?php endwhile; ?>
+							</li><?php endif; ?><?php endforeach; ?>
+						</ul>
+					</li><?php endforeach; ?>
+				</ul>
+			</div><!-- .flow_hidden boardslist --><?php /* Show the standard "Save Settings" profile button. */ ?><?php $this->subTemplate('profile_save'); ?>
+		</div><!-- .windowbg -->
+	</form>
+	<br>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/index.php b/Themes/default/templates/Profile/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Profile/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Profile/issueWarning.php b/Themes/default/templates/Profile/issueWarning.php
new file mode 100644
index 00000000000..8243e5ab93c
--- /dev/null
+++ b/Themes/default/templates/Profile/issueWarning.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for issuing warnings
+ */
+?><?php $this->subTemplate('load_warning_variables'); ?><?php
+// The bodies of the notification templates and the text for each warning
+// level. profile.js does the rest; all it needs from here is the data.
+?>
+	<script>
+		var notification_templates = <?= json_encode(array_column(Utils::$context['notification_templates'], 'body'), JSON_UNESCAPED_SLASHES) ?>;
+		var level_effects = <?= json_encode(Utils::$context['level_effects'], JSON_UNESCAPED_SLASHES | JSON_FORCE_OBJECT) ?>;
+	</script>
+	<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=issuewarning" method="post" class="flow_hidden" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt(Profile::$member->is_me ? 'profile_warning_level' : 'profile_issue_warning', file: 'Profile') ?>
+			</h3>
+		</div><?php if (!Profile::$member->is_me): ?>
+		<p class="information"><?= Lang::getTxt('profile_warning_desc', file: 'Profile') ?></p><?php endif; ?>
+		<div class="windowbg">
+			<dl class="settings"><?php if (!Profile::$member->is_me): ?>
+				<dt>
+					<strong><?= Lang::getTxt('profile_warning_name', file: 'Profile') ?></strong>
+				</dt>
+				<dd>
+					<strong><?= Utils::$context['member']['name'] ?></strong>
+				</dd><?php endif; ?>
+				<dt>
+					<strong><?= Lang::getTxt('profile_warning_level', file: 'Profile') ?></strong><?php /* Is there only so much they can apply? */ ?><?php if (Utils::$context['warning_limit']): ?>
+					<br>
+					<span class="smalltext"><?= Lang::getTxt('profile_warning_limit_attribute', [Utils::$context['warning_limit'] / 100], file: 'Profile') ?></span><?php endif; ?>
+				</dt>
+				<dd>
+					<?= Lang::formatText('{0, number, :: percent}', [0]) ?> <input name="warning_level" id="warning_level" type="range" min="0" max="100" step="5" value="<?= Utils::$context['member']['warning'] ?>"> <?= Lang::formatText('{0, number, :: percent}', [100]) ?>
+					<div class="clear_left">
+						<?= Lang::getTxt('profile_warning_impact', file: 'Profile') ?>: <output name="cur_level" for="warning_level" data-format="<?= Lang::getTxt('percent_format', file: 'General') ?>"><?= Lang::formatText('{0, number, :: percent}', [Utils::$context['member']['warning']]) ?> (<?= Utils::$context['level_effects'][Utils::$context['current_level']] ?>)</output>
+					</div>
+				</dd><?php if (!Profile::$member->is_me): ?>
+				<dt>
+					<strong><?= Lang::getTxt('profile_warning_reason', file: 'Profile') ?></strong><br>
+					<span class="smalltext"><?= Lang::getTxt('profile_warning_reason_desc', file: 'Profile') ?></span>
+				</dt>
+				<dd>
+					<input type="text" name="warn_reason" id="warn_reason" value="<?= Utils::$context['warning_data']['reason'] ?>" size="50">
+				</dd>
+			</dl>
+			<hr>
+			<div id="box_preview"<?= !empty(Utils::$context['warning_data']['body_preview']) ? '' : ' style="display:none"' ?>>
+				<dl class="settings">
+					<dt>
+						<strong><?= Lang::getTxt('preview', file: 'General') ?></strong>
+					</dt>
+					<dd id="body_preview">
+						<?= !empty(Utils::$context['warning_data']['body_preview']) ? Utils::adjustHeadingLevels(Utils::$context['warning_data']['body_preview'], 3) : '' ?>
+					</dd>
+				</dl>
+				<hr>
+			</div>
+			<dl class="settings">
+				<dt>
+					<strong><label for="warn_notify"><?= Lang::getTxt('profile_warning_notify', file: 'Profile') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="checkbox" name="warn_notify" id="warn_notify"<?= Utils::$context['warning_data']['notify'] ? ' checked' : '' ?>>
+				</dd>
+				<dt>
+					<strong><label for="warn_sub"><?= Lang::getTxt('profile_warning_notify_subject', file: 'Profile') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="text" name="warn_sub" id="warn_sub" value="<?= empty(Utils::$context['warning_data']['notify_subject']) ? Lang::getTxt('profile_warning_notify_template_subject', file: 'Profile') : Utils::$context['warning_data']['notify_subject'] ?>" size="50">
+				</dd>
+				<dt>
+					<strong><label for="warn_temp"><?= Lang::getTxt('profile_warning_notify_body', file: 'Profile') ?></label></strong>
+				</dt>
+				<dd>
+					<select name="warn_temp" id="warn_temp" disabled>
+						<option value="-1"><?= Lang::getTxt('profile_warning_notify_template', file: 'Profile') ?></option>
+						<option value="-1" disabled>------------------------------</option><?php foreach (Utils::$context['notification_templates'] as $id_template => $template): ?>
+						<option value="<?= $id_template ?>"><?= $template['title'] ?></option><?php endforeach; ?>
+					</select>
+					<span id="new_template_link" hidden><a href="<?= Config::$scripturl ?>?action=moderate;area=warnings;sa=templateedit;tid=0" class="button floatnone" target="_blank" rel="noopener"><?= Lang::getTxt('profile_warning_new_template', file: 'Profile') ?></a></span>
+					<br>
+					<textarea name="warn_body" id="warn_body" cols="40" rows="8"><?= Utils::$context['warning_data']['notify_body'] ?></textarea>
+				</dd><?php endif; ?>
+			</dl>
+			<div class="righttext"><?php if (!empty(Utils::$context['token_check'])): ?>
+				<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>"><?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="button" name="preview" id="preview_button" value="<?= Lang::getTxt('preview', file: 'General') ?>" class="button">
+				<input type="submit" name="save" value="<?= Lang::getTxt(Profile::$member->is_me ? 'change_profile' : 'profile_warning_issue', file: 'Profile') ?>" class="button">
+			</div><!-- .righttext -->
+		</div><!-- .windowbg -->
+	</form><?php /* Previous warnings? */ ?><?php $this->subTemplate('show_list', ['list_id' => 'view_warnings']); ?>
diff --git a/Themes/default/templates/Profile/load_warning_variables.php b/Themes/default/templates/Profile/load_warning_variables.php
new file mode 100644
index 00000000000..59c7c0257ea
--- /dev/null
+++ b/Themes/default/templates/Profile/load_warning_variables.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Simply loads some theme variables common to several warning templates.
+ */
+?><?php
+// Setup the warning mode
+Utils::$context['warning_mode'] = [
+	0 => 'none',
+	Config::$modSettings['warning_watch'] => 'watched',
+	Config::$modSettings['warning_moderate'] => 'moderated',
+	Config::$modSettings['warning_mute'] => 'muted',
+];
+// Work out the starting warning.
+Utils::$context['current_warning_mode'] = Utils::$context['warning_mode'][0];
+?><?php foreach (Utils::$context['warning_mode'] as $limit => $warning): ?><?php if (Utils::$context['member']['warning'] >= $limit): ?><?php Utils::$context['current_warning_mode'] = $warning; ?><?php endif; ?><?php endforeach; ?>
diff --git a/Themes/default/templates/Profile/max_size.php b/Themes/default/templates/Profile/max_size.php
new file mode 100644
index 00000000000..8c592c3f498
--- /dev/null
+++ b/Themes/default/templates/Profile/max_size.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is just a really little helper to avoid duplicating code unnecessarily
+ *
+ * @param string $type The type of avatar
+ */
+?><?php
+$w = !empty(Config::$modSettings['avatar_max_width_' . $type]) ? Lang::numberFormat(Config::$modSettings['avatar_max_width_' . $type]) : 0;
+$h = !empty(Config::$modSettings['avatar_max_height_' . $type]) ? Lang::numberFormat(Config::$modSettings['avatar_max_height_' . $type]) : 0;
+$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
+?><?php if (empty($suffix)): ?><?php return; ?><?php endif; ?>
+								<div class="smalltext"><?= Lang::getTxt('avatar_max_size_' . $suffix, ['w' => $w, 'h' => $h], file: 'Profile') ?></div>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_above.php b/Themes/default/templates/Profile/profile_above.php
new file mode 100644
index 00000000000..5a4df939099
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_above.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\BrowserDetector;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Minor stuff shown above the main profile - mostly used for error messages and showing that the profile update was successful.
+ */
+?><?php /* Prevent Chrome from auto completing fields when viewing/editing other members profiles */ ?><?php if (BrowserDetector::isBrowser('is_chrome') && !Profile::$member->is_me): ?>
+			<script>
+				disableAutoComplete();
+			</script><?php endif; ?><?php /* If an error occurred while trying to save previously, give the user a clue! */ ?>
+			<?php $this->subTemplate('error_message'); ?><?php /* If the profile was update successfully, let the user know this. */ ?><?php if (!empty(Utils::$context['profile_updated'])): ?>
+			<div class="infobox">
+				<?= Utils::$context['profile_updated'] ?>
+			</div><?php endif; ?>
diff --git a/Themes/default/templates/Profile/profile_avatar_select.php b/Themes/default/templates/Profile/profile_avatar_select.php
new file mode 100644
index 00000000000..b4ae7418ae1
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_avatar_select.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for selecting an avatar
+ */
+?>
+
+<?php /* Start with the upper menu */ ?>
+							<dt>
+								<strong id="personal_picture">
+									<label for="avatar_upload_box"><?= Lang::getTxt('personal_picture', file: 'Profile') ?></label>
+								</strong>
+<?php if (empty(Config::$modSettings['gravatarEnabled']) || empty(Config::$modSettings['gravatarOverride'])): ?>
+								<input type="radio" name="avatar_choice" id="avatar_choice_none" value="none"<?= (Utils::$context['member']['avatar']['choice'] == 'none' ? ' checked="checked"' : '') ?>>
+								<label for="avatar_choice_none"<?= (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') ?>>
+									<?= Lang::getTxt('no_avatar', file: 'Profile') ?>
+								</label><br>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_server_stored'])): ?>
+								<input type="radio" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"<?= (Utils::$context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') ?>>
+								<label for="avatar_choice_server_stored"<?= (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') ?>>
+									<?= Lang::getTxt('choose_avatar_gallery', file: 'Profile') ?>
+								</label><br>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_external'])): ?>
+								<input type="radio" name="avatar_choice" id="avatar_choice_external" value="external"<?= (Utils::$context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') ?>>
+								<label for="avatar_choice_external"<?= (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') ?>>
+									<?= Lang::getTxt('my_own_pic', file: 'Profile') ?>
+								</label><br>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_upload'])): ?>
+								<input type="radio" name="avatar_choice" id="avatar_choice_upload" value="upload"<?= (Utils::$context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') ?>>
+								<label for="avatar_choice_upload"<?= (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') ?>>
+									<?= Lang::getTxt('avatar_will_upload', file: 'Profile') ?>
+								</label><br>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_gravatar'])): ?>
+								<input type="radio" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"<?= (Utils::$context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') ?>>
+								<label for="avatar_choice_gravatar"<?= (isset(Utils::$context['modify_error']['bad_avatar']) ? ' class="error"' : '') ?>><?= Lang::getTxt('use_gravatar', file: 'Profile') ?></label>
+								<span class="smalltext"><a href="<?= Config::$scripturl ?>?action=helpadmin;help=gravatar" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help"></span></a></span>
+<?php endif; ?>
+							</dt>
+							<dd>
+<?php /* If users are allowed to choose avatars stored on the server show selection boxes to choice them from. */ ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_server_stored'])): ?>
+								<div id="avatar_server_stored" data-avatar-choice="server_stored">
+									<div>
+										<select name="cat" id="cat" size="10" data-avatardir="<?= Config::$modSettings['avatar_url'] ?>/">
+<?php
+// One entry per avatar, with the directories as groups. Nothing here is
+// nested more than one deep, because that is all the picker can show.
+?>
+<?php foreach (Utils::$context['avatars'] as $avatar): ?>
+<?php if (!empty($avatar['is_dir'])): ?>
+											<optgroup label="<?= $avatar['name'] ?>">
+<?php foreach ($avatar['files'] as $file): ?>
+												<option value="<?= $avatar['filename'] ?>/<?= $file['filename'] ?>"<?= $file['checked'] ? ' selected' : '' ?>><?= $file['name'] ?></option>
+<?php endforeach; ?>
+											</optgroup>
+<?php else: ?>
+											<option value="<?= $avatar['filename'] ?>"<?= $avatar['checked'] ? ' selected' : '' ?>><?= $avatar['name'] ?></option>
+<?php endif; ?>
+<?php endforeach; ?>
+										</select>
+									</div>
+									<div class="edit_avatar_img">
+										<img id="avatar" src="<?= Utils::$context['member']['avatar']['choice'] == 'server_stored' ? Utils::$context['member']['avatar']['href'] : Config::$modSettings['avatar_url'] . '/blank.png' ?>" alt="">
+									</div>
+								</div><!-- #avatar_server_stored -->
+<?php endif; ?>
+<?php /* If the user can link to an off server avatar, show them a box to input the address. */ ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_external'])): ?>
+								<div id="avatar_external" data-avatar-choice="external">
+									<?= Utils::$context['member']['avatar']['choice'] == 'external' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt="" class="avatar"></div>' : '' ?>
+									<div class="smalltext"><?= Lang::getTxt('avatar_by_url', file: 'Profile') ?></div><?= !empty(Config::$modSettings['avatar_action_too_large']) && Config::$modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? $this->fetchSubTemplate('max_size', ['type' => 'external']) : '' ?>
+									<input type="text" name="userpicpersonal" size="45" value="<?= ((stristr(Utils::$context['member']['avatar']['external'], 'http://') || stristr(Utils::$context['member']['avatar']['external'], 'https://')) ? Utils::$context['member']['avatar']['external'] : 'http://') ?>"><br>
+								</div>
+<?php endif; ?>
+<?php /* If the user is able to upload avatars to the server show them an upload box. */ ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_upload'])): ?>
+								<div id="avatar_upload" data-avatar-choice="upload">
+									<?= Utils::$context['member']['avatar']['choice'] == 'upload' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt=""></div>' : '' ?>
+									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" accept="image/gif, image/jpeg, image/jpg, image/png, image/svg+xml, image/webp"><?php $this->subTemplate('max_size', ['type' => 'upload']); ?>
+									<?= (!empty(Utils::$context['member']['avatar']['id_attach']) ? '<br><input type="hidden" name="id_attach" value="' . Utils::$context['member']['avatar']['id_attach'] . '">' : '') ?>
+								</div>
+<?php endif; ?>
+<?php /* if the user is able to use Gravatar avatars show then the image preview */ ?>
+<?php if (!empty(Utils::$context['member']['avatar']['allow_gravatar'])): ?>
+								<div id="avatar_gravatar" data-avatar-choice="gravatar"<?= !empty(Config::$modSettings['gravatarAllowExtraEmail']) && (Utils::$context['member']['avatar']['external'] == Utils::$context['member']['email'] || str_contains(Utils::$context['member']['avatar']['external'], 'http://') || str_contains(Utils::$context['member']['avatar']['external'], 'https://')) ? ' data-clear-email' : '' ?>>
+									<?= Utils::$context['member']['avatar']['choice'] == 'gravatar' ? '<div class="edit_avatar_img"><img src="' . Utils::$context['member']['avatar']['href'] . '" alt=""></div>' : '' ?>
+
+<?php if (empty(Config::$modSettings['gravatarAllowExtraEmail'])): ?>
+									<div class="smalltext"><?= Lang::getTxt('gravatar_noAlternateEmail', file: 'Profile') ?></div>
+<?php else: ?>
+<?php /* Depending on other stuff, the stored value here might have some odd things in it from other areas. */ ?>
+<?php if (Utils::$context['member']['avatar']['external'] == Utils::$context['member']['email']): ?>
+<?php $textbox_value = ''; ?>
+<?php else: ?>
+<?php $textbox_value = Utils::$context['member']['avatar']['external']; ?>
+<?php endif; ?>
+									<div class="smalltext"><?= Lang::getTxt('gravatar_alternateEmail', file: 'Profile') ?></div>
+									<input type="text" name="gravatarEmail" id="gravatarEmail" size="45" value="<?= $textbox_value ?>">
+<?php endif; ?>
+								</div><!-- #avatar_gravatar -->
+<?php endif; ?>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_below.php b/Themes/default/templates/Profile/profile_below.php
new file mode 100644
index 00000000000..ae356186437
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_below.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for any HTML needed below the profile (closing off divs/tables, etc.)
+ */
diff --git a/Themes/default/templates/Profile/profile_group_manage.php b/Themes/default/templates/Profile/profile_group_manage.php
new file mode 100644
index 00000000000..4d9a01c8823
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_group_manage.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Display a load of drop down selectors for allowing the user to change group.
+ */
+?>
+							<dt>
+								<label for="id_group"><strong><?= Lang::getTxt('primary_membergroup', file: 'Profile') ?></strong></label><br>
+								<span class="smalltext"><a href="<?= Config::$scripturl ?>?action=helpadmin;help=moderator_why_missing" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help"></span> <?= Lang::getTxt('moderator_why_missing', file: 'Profile') ?></a></span>
+							</dt>
+							<dd>
+								<select name="id_group" id="id_group" <?= (Profile::$member->is_me && Utils::$context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . Lang::getTxt('deadmin_confirm', file: 'Profile') . '\')) this.value = 1;"' : '') ?>>
+<?php /* Fill the select box with all primary member groups that can be assigned to a member. */ ?>
+<?php foreach (Utils::$context['member_groups'] as $member_group): ?>
+<?php if (!empty($member_group['can_be_primary'])): ?>
+									<option value="<?= $member_group['id'] ?>"<?= $member_group['is_primary'] ? ' selected' : '' ?>>
+										<?= $member_group['name'] ?>
+									</option>
+<?php endif; ?>
+<?php endforeach; ?>
+								</select>
+							</dd>
+							<dt>
+								<strong><?= Lang::getTxt('additional_membergroups', file: 'Profile') ?></strong>
+							</dt>
+							<dd>
+								<span id="additional_groupsList">
+									<input type="hidden" name="additional_groups[]" value="0">
+<?php /* For each membergroup show a checkbox so members can be assigned to more than one group. */ ?>
+<?php foreach (Utils::$context['member_groups'] as $member_group): ?>
+<?php if ($member_group['can_be_additional']): ?>
+									<label for="additional_groups-<?= $member_group['id'] ?>"><input type="checkbox" name="additional_groups[]" value="<?= $member_group['id'] ?>" id="additional_groups-<?= $member_group['id'] ?>"<?= $member_group['is_additional'] ? ' checked' : '' ?>> <?= $member_group['name'] ?></label><br>
+<?php endif; ?>
+<?php endforeach; ?>
+								</span>
+								<a href="javascript:void(0);" onclick="document.getElementById('additional_groupsList').style.display = 'block'; document.getElementById('additional_groupsLink').style.display = 'none'; return false;" id="additional_groupsLink" style="display: none;" class="toggle_down"><?= Lang::getTxt('additional_membergroups_show', file: 'Profile') ?></a>
+								<script>
+									document.getElementById("additional_groupsList").style.display = "none";
+									document.getElementById("additional_groupsLink").style.display = "";
+								</script>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_pm_settings.php b/Themes/default/templates/Profile/profile_pm_settings.php
new file mode 100644
index 00000000000..0e73926f16a
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_pm_settings.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Personal Message settings.
+ */
+?>
+					<dt>
+						<label for="pm_prefs"><?= Lang::getTxt('pm_display_mode', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<select name="pm_prefs" id="pm_prefs">
+							<option value="0"<?= Utils::$context['display_mode'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('pm_display_mode_all', file: 'Profile') ?></option>
+							<option value="1"<?= Utils::$context['display_mode'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('pm_display_mode_one', file: 'Profile') ?></option>
+							<option value="2"<?= Utils::$context['display_mode'] == 2 ? ' selected' : '' ?>><?= Lang::getTxt('pm_display_mode_linked', file: 'Profile') ?></option>
+						</select>
+					</dd>
+					<dt>
+						<label for="view_newest_pm_first"><?= Lang::getTxt('recent_pms_at_top', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" name="default_options[view_newest_pm_first]" value="0">
+						<input type="checkbox" name="default_options[view_newest_pm_first]" id="view_newest_pm_first" value="1"<?= !empty(Utils::$context['member']['options']['view_newest_pm_first']) ? ' checked' : '' ?>>
+					</dd>
+				</dl>
+				<hr>
+				<dl class="settings">
+					<dt>
+						<label for="pm_receive_from"><?= Lang::getTxt('pm_receive_from', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<select name="pm_receive_from" id="pm_receive_from">
+							<option value="0"<?= empty(Utils::$context['receive_from']) || (empty(Config::$modSettings['enable_buddylist']) && Utils::$context['receive_from'] < 3) ? ' selected' : '' ?>><?= Lang::getTxt('pm_receive_from_everyone', file: 'Profile') ?></option>
+<?php if (!empty(Config::$modSettings['enable_buddylist'])): ?>
+							<option value="1"<?= !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] == 1 ? ' selected' : '' ?>><?= Lang::getTxt('pm_receive_from_ignore', file: 'Profile') ?></option>
+							<option value="2"<?= !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] == 2 ? ' selected' : '' ?>><?= Lang::getTxt('pm_receive_from_buddies', file: 'Profile') ?></option>
+<?php endif; ?>
+							<option value="3"<?= !empty(Utils::$context['receive_from']) && Utils::$context['receive_from'] > 2 ? ' selected' : '' ?>><?= Lang::getTxt('pm_receive_from_admins', file: 'Profile') ?></option>
+						</select>
+					</dd>
+					<dt>
+						<label for="popup_messages"><?= Lang::getTxt('popup_messages', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" name="default_options[popup_messages]" value="0">
+						<input type="checkbox" name="default_options[popup_messages]" id="popup_messages" value="1"<?= !empty(Utils::$context['member']['options']['popup_messages']) ? ' checked' : '' ?>>
+					</dd>
+				</dl>
+				<hr>
+				<dl class="settings">
+					<dt>
+						<label for="pm_remove_inbox_label"><?= Lang::getTxt('pm_remove_inbox_label', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" name="default_options[pm_remove_inbox_label]" value="0">
+						<input type="checkbox" name="default_options[pm_remove_inbox_label]" id="pm_remove_inbox_label" value="1"<?= !empty(Utils::$context['member']['options']['pm_remove_inbox_label']) ? ' checked' : '' ?>>
+					</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_popup.php b/Themes/default/templates/Profile/profile_popup.php
new file mode 100644
index 00000000000..b393e3dd99d
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_popup.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing off the spiffy popup of the menu
+ */
+?>
+
+<?php /* Unlike almost every other template, this is designed to be included into the HTML directly via $().load() */ ?>
+		<div class="profile_user_avatar floatleft">
+			<a href="<?= Config::$scripturl ?>?action=profile;u=<?= User::$me->id ?>"><?= Utils::$context['member']['avatar']['image'] ?></a>
+		</div>
+		<div class="profile_user_info floatleft">
+			<span class="profile_username"><a href="<?= Config::$scripturl ?>?action=profile;u=<?= User::$me->id ?>"><?= User::$me->name ?></a></span>
+			<span class="profile_group"><?= Utils::$context['member']['group'] ?></span>
+		</div>
+		<div class="profile_user_links">
+			<ol>
+<?php $menu_context = &Utils::$context[Utils::$context['profile_menu_name']]; ?>
+<?php foreach (Utils::$context['profile_items'] as $item): ?>
+<?php
+$area = $menu_context['sections'][$item['menu']]['areas'][$item['area']];
+$item_url = ($item['url'] ?? ($area['url'] ?? $menu_context['base_url'] . ';area=' . $item['area'])) . $menu_context['extra_parameters'];
+?>
+				<li>
+					<?= $area['icon'] ?><a href="<?= $item_url ?>"><?= !empty($item['title']) ? $item['title'] : $area['label'] ?></a>
+				</li>
+<?php endforeach; ?>
+			</ol>
+		</div><!-- .profile_user_links -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_save.php b/Themes/default/templates/Profile/profile_save.php
new file mode 100644
index 00000000000..43820137c13
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_save.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for the password box/save button stuck at the bottom of every profile page.
+ */
+?>
+
+
+					<hr>
+<?php /* Only show the password box if it's actually needed. */ ?>
+<?php if (Utils::$context['require_password']): ?>
+					<dl class="settings">
+						<dt>
+							<strong<?= isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '' ?>><?= Lang::getTxt('current_password', file: 'Profile') ?></strong><br>
+							<span class="smalltext"><?= Lang::getTxt('required_security_reasons', file: 'Profile') ?></span>
+						</dt>
+						<dd>
+							<input type="password" name="oldpasswrd" size="20">
+						</dd>
+					</dl>
+<?php endif; ?>
+					<div class="righttext">
+<?php if (!empty(Utils::$context['token_check'])): ?>
+						<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+<?php endif; ?>
+						<input type="submit" value="<?= Lang::getTxt('change_profile', file: 'Profile') ?>" class="button">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+						<input type="hidden" name="sa" value="<?= Utils::$context['menu_item_selected'] ?>">
+					</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_signature_modify.php b/Themes/default/templates/Profile/profile_signature_modify.php
new file mode 100644
index 00000000000..e327be28dee
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_signature_modify.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show the signature editing box?
+ */
+?>
+							<dt id="current_signature" style="display:none">
+								<strong><?= Lang::getTxt('current_signature', file: 'Profile') ?></strong>
+							</dt>
+							<dd id="current_signature_display" style="display:none">
+								<hr>
+							</dd>
+
+							<dt id="preview_signature" style="display:none">
+								<strong><?= Lang::getTxt('signature_preview', file: 'Profile') ?></strong>
+							</dt>
+							<dd id="preview_signature_display" style="display:none">
+								<hr>
+							</dd>
+
+							<dt>
+								<label for="signature"><strong><?= Lang::getTxt('signature', file: 'Profile') ?></strong></label><br>
+								<span class="smalltext"><?= Lang::getTxt('sig_info', file: 'Profile') ?></span><br>
+								<br>
+<?php if (Utils::$context['show_spellchecking']): ?>
+								<input type="button" value="<?= Lang::getTxt('spell_check', file: 'General') ?>" onclick="spellCheck('creator', 'signature');" class="button">
+<?php endif; ?>
+							</dt>
+							<dd>
+								<textarea class="editor" id="signature" name="signature" rows="5" cols="50"<?= empty(Utils::$context['signature_limits']['max_length']) ? '' : ' data-max-length="' . (int) Utils::$context['signature_limits']['max_length'] . '"' ?>><?= Utils::$context['member']['signature'] ?></textarea><br>
+<?php /* If there is a limit at all! */ ?>
+<?php if (!empty(Utils::$context['signature_limits']['max_length'])): ?>
+								<span class="smalltext"><?= Lang::getTxt('max_sig_characters', Utils::$context['signature_limits'], file: 'Profile') ?></span><br>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['show_preview_button'])): ?>
+								<input type="button" name="preview_signature" id="preview_button" value="<?= Lang::getTxt('preview_signature', file: 'Profile') ?>" class="button floatright">
+<?php endif; ?>
+<?php if (Utils::$context['signature_warning']): ?>
+								<span class="smalltext"><?= Utils::$context['signature_warning'] ?></span>
+<?php endif; ?>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_smiley_pick.php b/Themes/default/templates/Profile/profile_smiley_pick.php
new file mode 100644
index 00000000000..3765c1703c8
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_smiley_pick.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Smiley set picker.
+ */
+?>
+							<dt>
+								<strong><label for="smiley_set"><?= Lang::getTxt('smileys_current', file: 'General') ?></label></strong>
+							</dt>
+							<dd>
+								<select name="smiley_set" id="smiley_set">
+<?php foreach (Utils::$context['smiley_sets'] as $set): ?>
+									<option data-preview="<?= $set['preview'] ?>" value="<?= $set['id'] ?>"<?= $set['selected'] ? ' selected' : '' ?>><?= $set['name'] ?></option>
+<?php endforeach; ?>
+								</select>
+								<img id="smileypr" class="centericon" src="<?= Utils::$context['member']['smiley_set']['preview'] ?>" alt=":)">
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_tfa.php b/Themes/default/templates/Profile/profile_tfa.php
new file mode 100644
index 00000000000..1584b59d3a0
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_tfa.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Simple template for showing the 2FA area when editing a profile.
+ */
+?>
+							<dt>
+								<strong><?= Lang::getTxt('tfa_profile_label', file: 'Profile') ?></strong><br>
+								<div class="smalltext"><?= Lang::getTxt('tfa_profile_desc', file: 'Profile') ?></div>
+							</dt>
+							<dd>
+<?php if (!Utils::$context['tfa_enabled'] && Profile::$member->is_me): ?>
+								<a href="<?= !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl ?>?action=profile;area=tfasetup" id="enable_tfa"><?= Lang::getTxt('tfa_profile_enable', file: 'Profile') ?></a>
+<?php elseif (!Utils::$context['tfa_enabled']): ?>
+								<?= Lang::getTxt('tfa_profile_disabled', file: 'Profile') ?>
+
+<?php else: ?>
+								<?= Lang::getTxt('tfa_profile_enabled', ['url' => (!empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl) . '?action=profile;u=' . Utils::$context['id_member'] . ';area=tfadisable'], file: 'Profile') ?>
+
+<?php endif; ?>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_theme_pick.php b/Themes/default/templates/Profile/profile_theme_pick.php
new file mode 100644
index 00000000000..704842a159f
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_theme_pick.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for picking a theme
+ */
+?>
+							<dt>
+								<strong><?= Lang::getTxt('current_theme', file: 'Profile') ?></strong>
+							</dt>
+							<dd>
+								<?= Utils::$context['member']['theme']['name'] ?> <a class="button" href="<?= Config::$scripturl ?>?action=themechooser;u=<?= Utils::$context['id_member'] ?>"><?= Lang::getTxt('change', file: 'Profile') ?></a>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_theme_settings.php b/Themes/default/templates/Profile/profile_theme_settings.php
new file mode 100644
index 00000000000..193e1290798
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_theme_settings.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing theme settings. Note: template_options() actually adds the theme specific options.
+ */
+?><?php
+$skeys = array_keys(Utils::$context['theme_options']);
+$first_option_key = array_shift($skeys);
+$titled_section = false;
+?><?php foreach (Utils::$context['theme_options'] as $i => $setting): ?><?php /* Just spit out separators and move on */ ?><?php if (empty($setting) || !is_array($setting)): ?><?php
+// Avoid double separators and empty titled sections
+$empty_section = true;
+?><?php for ($j = $i + 1; $j < count(Utils::$context['theme_options']); $j++): ?><?php /* Found another separator, so we're done */ ?><?php if (!is_array(Utils::$context['theme_options'][$j])): ?><?php break; ?><?php endif; ?><?php /* Once we know there's something to show in this section, we can stop */ ?><?php if (!isset(Utils::$context['theme_options'][$j]['enabled']) || !empty(Utils::$context['theme_options'][$j]['enabled'])): ?><?php
+$empty_section = false;
+break;
+?><?php endif; ?><?php endfor; ?><?php if ($empty_section): ?><?php if ($i === $first_option_key): ?><?php $first_option_key = array_shift($skeys); ?><?php endif; ?><?php continue; ?><?php endif; ?><?php /* Insert a separator (unless this is the first item in the list) */ ?><?php if ($i !== $first_option_key): ?>
+				</dl>
+				<hr>
+				<dl class="settings"><?php endif; ?><?php /* Should we give a name to this section? */ ?><?php if (is_string($setting) && !empty($setting)): ?><?php $titled_section = true; ?>
+					<dt><strong><?= $setting ?></strong></dt>
+					<dd></dd><?php else: ?><?php $titled_section = false; ?><?php endif; ?><?php continue; ?><?php endif; ?><?php /* Is this disabled? */ ?><?php if (isset($setting['enabled']) && $setting['enabled'] === false): ?><?php if ($i === $first_option_key): ?><?php $first_option_key = array_shift($skeys); ?><?php endif; ?><?php continue; ?><?php endif; ?><?php
+// Some of these may not be set...  Set to defaults here
+$opts = ['calendar_start_day', 'topics_per_page', 'messages_per_page', 'display_quick_mod'];
+?><?php if (in_array($setting['id'], $opts) && !isset(Utils::$context['member']['options'][$setting['id']])): ?><?php Utils::$context['member']['options'][$setting['id']] = 0; ?><?php endif; ?><?php if (!isset($setting['type']) || $setting['type'] == 'bool'): ?><?php $setting['type'] = 'checkbox'; ?><?php elseif ($setting['type'] == 'int' || $setting['type'] == 'integer'): ?><?php $setting['type'] = 'number'; ?><?php elseif ($setting['type'] == 'string'): ?><?php $setting['type'] = 'text'; ?><?php endif; ?><?php if (isset($setting['options'])): ?><?php $setting['type'] = 'list'; ?><?php endif; ?>
+					<dt>
+						<label for="<?= $setting['id'] ?>"><?= !$titled_section ? '<strong>' : '' ?><?= $setting['label'] ?><?= !$titled_section ? '</strong>' : '' ?></label><?php if (isset($setting['description'])): ?>
+						<br>
+						<span class="smalltext"><?= $setting['description'] ?></span><?php endif; ?>
+					</dt>
+					<dd><?php /* Display checkbox options */ ?><?php if ($setting['type'] == 'checkbox'): ?>
+						<input type="hidden" name="default_options[<?= $setting['id'] ?>]" value="0">
+						<input type="checkbox" name="default_options[<?= $setting['id'] ?>]" id="<?= $setting['id'] ?>"<?= !empty(Utils::$context['member']['options'][$setting['id']]) ? ' checked' : '' ?> value="1"><?php /* How about selection lists, we all love them */ ?><?php elseif ($setting['type'] == 'list'): ?>
+						<select name="default_options[<?= $setting['id'] ?>]" id="<?= $setting['id'] ?>"><?php foreach ($setting['options'] as $value => $label): ?>
+							<option value="<?= $value ?>"<?= isset(Utils::$context['member']['options'][$setting['id']]) && $value == Utils::$context['member']['options'][$setting['id']] ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+						</select><?php /* A textbox it is then */ ?><?php else: ?><?php if (isset($setting['type']) && $setting['type'] == 'number'): ?><?php
+$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
+$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
+$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
+?>
+						<input type="number"<?= $min ?><?= $max ?><?= $step ?><?php elseif (isset($setting['type']) && $setting['type'] == 'url'): ?>
+						<input type="url"<?php else: ?>
+						<input type="text"<?php endif; ?> name="default_options[<?= $setting['id'] ?>]" id="<?= $setting['id'] ?>" value="<?= Utils::$context['member']['options'][$setting['id']] ?? $setting['value'] ?>"<?= $setting['type'] == 'number' ? ' size="5"' : '' ?>><?php endif; ?><?php /* end of this definition */ ?>
+					</dd><?php endforeach; ?>
diff --git a/Themes/default/templates/Profile/profile_timeformat_modify.php b/Themes/default/templates/Profile/profile_timeformat_modify.php
new file mode 100644
index 00000000000..a076558ddc2
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_timeformat_modify.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Select the time format!
+ */
+?>
+							<dt>
+								<strong><label for="easyformat"><?= Lang::getTxt('time_format', file: 'Profile') ?></label></strong><br>
+								<a href="<?= Config::$scripturl ?>?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+								<span class="smalltext">
+									<label for="time_format"><?= Lang::getTxt('date_format', file: 'Profile') ?></label>
+								</span>
+							</dt>
+							<dd>
+								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">
+<?php
+// Help the user by showing a list of common time formats.
+$found = false;
+?>
+<?php foreach (Utils::$context['easy_timeformats'] as $time_format): ?>
+<?php $found = $found || $time_format['format'] == Utils::$context['member']['time_format']; ?>
+									<option value="<?= $time_format['format'] ?>"<?= $time_format['format'] == Utils::$context['member']['time_format'] ? ' selected' : '' ?>><?= $time_format['title'] ?></option>
+<?php endforeach; ?>
+									<option value="other"<?= !$found ? ' selected' : '' ?> disabled><?= Lang::getTxt('other', file: 'General') ?></option>
+								</select>
+								<input type="text" name="time_format" id="time_format" value="<?= Utils::$context['member']['time_format'] ?>" onchange="document.forms.creator.easyformat.value = 'other'" size="30">
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/profile_timezone.php b/Themes/default/templates/Profile/profile_timezone.php
new file mode 100644
index 00000000000..2fe2ad2a58c
--- /dev/null
+++ b/Themes/default/templates/Profile/profile_timezone.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Theme;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for allowing the member to choose their time zone.
+ */
+?><?php
+// Just in case...
+Theme::loadTemplate('TimeZoneSelect');
+?>
+							<dt>
+								<strong>
+									<label for="timezone"><?= Lang::getTxt('timezone', file: 'Profile') ?></label>
+								</strong>
+							</dt>
+							<dd><?php /* This part is easy enough. */ ?><?php $this->subTemplate('timezone_select', ['name' => 'timezone', 'selection' => Profile::$member->timezone]); ?>
+							</dd>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/showAlerts.php b/Themes/default/templates/Profile/showAlerts.php
new file mode 100644
index 00000000000..f7554c2d387
--- /dev/null
+++ b/Themes/default/templates/Profile/showAlerts.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing all alerts
+ */
+?><?php /* Do we have an update message? */ ?><?php if (!empty(Utils::$context['update_message'])): ?>
+		<div class="infobox">
+			<?= Utils::$context['update_message'] ?>
+		</div><?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+			<?= Lang::getTxt(!Profile::$member->is_me ? 'alerts_member' : 'alerts', ['member' => Utils::$context['member']['name']], file: 'General') ?>
+			</h3>
+		</div><?php if (empty(Utils::$context['alerts'])): ?>
+		<div class="information">
+			<?= Lang::getTxt('alerts_none', file: 'Alerts') ?>
+		</div><?php else: ?><?php /* Start the form if checkboxes are in use */ ?><?php if (Utils::$context['showCheckboxes']): ?>
+		<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=showalerts;save" method="post" accept-charset="UTF-8" id="mark_all"><?php endif; ?>
+			<table id="alerts" class="table_grid"><?php foreach (Utils::$context['alerts'] as $id => $alert): ?>
+				<tr class="windowbg">
+					<td class="alert_image">
+						<div>
+							<?= empty($alert['sender']['avatar']['image']) ? '' : $alert['sender']['avatar']['image'] . '
+							' ?><?= $alert['icon'] ?>
+						</div>
+					</td>
+					<td class="alert_text">
+						<div><?= $alert['text'] ?></div>
+						<time class="alert_inline_time" datetime="<?= $alert['alert_time'] ?>"><?= $alert['time'] ?></time>
+					</td>
+					<td class="alert_time">
+						<time datetime="<?= $alert['alert_time'] ?>"><?= $alert['time'] ?></time>
+					</td>
+					<td class="alert_buttons"><?php /* Alert options */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $alert['quickbuttons'], 'list_class' => 'profile_alerts']); ?>
+					</td>
+				</tr><?php endforeach; ?>
+			</table>
+			<div class="pagesection">
+				<div class="pagelinks"><?= Utils::$context['pagination'] ?></div>
+				<div class="floatright"><?php if (Utils::$context['showCheckboxes']): ?>
+					<?= Lang::getTxt('check_all', file: 'General') ?> <input type="checkbox" name="select_all" id="select_all">
+					<select name="mark_as">
+						<option value="read"><?= Lang::getTxt('quick_mod_markread', file: 'General') ?></option>
+						<option value="unread"><?= Lang::getTxt('quick_mod_markunread', file: 'General') ?></option>
+						<option value="remove"><?= Lang::getTxt('quick_mod_remove', file: 'General') ?></option>
+					</select>
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="start" value="<?= Utils::$context['start'] ?>">
+					<input type="submit" name="req" value="<?= Lang::getTxt('quick_mod_go', file: 'General') ?>" class="button you_sure"><?php endif; ?>
+					<a href="<?= Utils::$context['alert_purge_link'] ?>" class="button you_sure"><?= Lang::getTxt('alert_purge', file: 'Profile') ?></a>
+				</div>
+			</div><?php if (Utils::$context['showCheckboxes']): ?>
+		</form><?php endif; ?><?php endif; ?>
diff --git a/Themes/default/templates/Profile/showDrafts.php b/Themes/default/templates/Profile/showDrafts.php
new file mode 100644
index 00000000000..a8856e4819d
--- /dev/null
+++ b/Themes/default/templates/Profile/showDrafts.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing all of a user's drafts
+ */
+?>
+		<div class="cat_bar cat_bar_round">
+			<h3 class="catbg">
+				<?= !Profile::$member->is_me ? Lang::getTxt('drafts_member', ['member' => Utils::$context['member']['name']], file: 'Drafts') : Lang::getTxt('drafts', file: 'Drafts') ?>
+			</h3>
+		</div><?= !empty(Utils::$context['page_index']) ? '
+		<div class="pagesection">
+			<div class="pagelinks">' . Utils::$context['page_index'] . '</div>
+		</div>' : '' ?><?php /* No drafts? Just show an informative message. */ ?><?php if (empty(Utils::$context['drafts'])): ?>
+		<div class="windowbg centertext">
+			<?= Lang::getTxt('draft_none', file: 'Drafts') ?>
+		</div><?php else: ?><?php /* For every draft to be displayed, give it its own div, and show the important details of the draft. */ ?><?php foreach (Utils::$context['drafts'] as $draft): ?>
+		<div class="windowbg">
+			<div class="page_number floatright"> #<?= $draft['counter'] ?></div>
+			<div class="topic_details">
+				<h4>
+					<strong><a href="<?= Config::$scripturl ?>?board=<?= $draft['board']['id'] ?>.0"><?= $draft['board']['name'] ?></a> / <?= $draft['topic']['link'] ?></strong> &nbsp; &nbsp;<?php if (!empty($draft['sticky'])): ?>
+					<span class="main_icons sticky" title="<?= Lang::getTxt('sticky_topic', file: 'General') ?>"></span><?php endif; ?><?php if (!empty($draft['locked'])): ?>
+					<span class="main_icons lock" title="<?= Lang::getTxt('locked_topic', file: 'General') ?>"></span><?php endif; ?>
+				</h4>
+				<span class="smalltext"><?= Lang::getTxt('draft_saved_on', ['date' => $draft['time']], file: 'Drafts') ?></span>
+			</div><!-- .topic_details -->
+			<div class="list_posts">
+				<?= Utils::adjustHeadingLevels($draft['body'], 4) ?>
+			</div>
+			<div class="floatright"><?php /* Draft buttons */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $draft['quickbuttons'], 'list_class' => 'profile_drafts']); ?>
+			</div><!-- .floatright -->
+		</div><!-- .windowbg --><?php endforeach; ?><?php endif; ?><?php /* Show page numbers. */ ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/showPermissions.php b/Themes/default/templates/Profile/showPermissions.php
new file mode 100644
index 00000000000..6b6b5d90bef
--- /dev/null
+++ b/Themes/default/templates/Profile/showPermissions.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template shows an admin which permissions a user have and which group(s) give them each permission.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt('showPermissions', file: 'Profile') ?>
+			</h3>
+		</div><?php if (Utils::$context['member']['has_all_permissions']): ?>
+		<div class="information"><?= Lang::getTxt('showPermissions_all', file: 'Profile') ?></div><?php else: ?>
+		<div class="information"><?= Lang::getTxt('showPermissions_help', file: 'Profile') ?></div>
+		<div id="permissions" class="flow_hidden"><?php if (!empty(Utils::$context['no_access_boards'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('showPermissions_restricted_boards', file: 'Profile') ?></h3>
+			</div>
+			<div class="windowbg smalltext"><?= Lang::getTxt(
+				'showPermissions_restricted_boards_desc',
+				[
+					'list' => Lang::sentenceList(array_map(
+						fn($brd) => '<a href="' . Config::$scripturl . '?board=' . $brd['id'] . '.0" class="bbc_link">' . $brd['name'] . '</a>',
+						Utils::$context['no_access_boards'],
+					)),
+				],
+				file: 'Profile',
+			) ?>
+			</div><?php endif; ?><?php /* General Permissions section. */ ?>
+			<div class="tborder">
+				<div class="cat_bar">
+					<h3 class="catbg"><?= Lang::getTxt('showPermissions_general', file: 'Profile') ?></h3>
+				</div><?php if (!empty(Utils::$context['member']['permissions']['general'])): ?>
+				<table class="table_grid">
+					<thead>
+						<tr class="title_bar">
+							<th class="lefttext half_table"><?= Lang::getTxt('showPermissions_permission', file: 'Profile') ?></th>
+							<th class="lefttext half_table"><?= Lang::getTxt('showPermissions_status', file: 'Profile') ?></th>
+						</tr>
+					</thead>
+					<tbody><?php foreach (Utils::$context['member']['permissions']['general'] as $permission): ?>
+						<tr class="windowbg">
+							<td title="<?= $permission['id'] ?>">
+								<?= $permission['is_denied'] ? '<del>' . $permission['name'] . '</del>' : $permission['name'] ?>
+							</td>
+							<td class="smalltext"><?php if ($permission['is_denied']): ?>
+								<span class="alert"><?= Lang::getTxt('showPermissions_denied', ['list' => Lang::sentenceList($permission['groups']['denied'])], file: 'Profile') ?></span><?php else: ?>
+								<?= Lang::getTxt('showPermissions_given', ['list' => Lang::sentenceList($permission['groups']['allowed'])], file: 'Profile') ?><?php endif; ?>
+							</td>
+						</tr><?php endforeach; ?>
+					</tbody>
+				</table>
+			</div><!-- .tborder -->
+			<br><?php else: ?>
+			<p class="windowbg"><?= Lang::getTxt('showPermissions_none_general', file: 'Profile') ?></p><?php endif; ?><?php /* Board permission section. */ ?>
+			<form action="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=permissions#board_permissions" method="post" accept-charset="UTF-8">
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<span id="board_permissions"><?= Lang::getTxt('showPermissions_select', file: 'Profile') ?></span>
+						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
+							<option value="0"<?= Utils::$context['board'] == 0 ? ' selected' : '' ?>><?= Lang::getTxt('showPermissions_global', file: 'Profile') ?></option><?php if (!empty(Utils::$context['boards'])): ?>
+							<option value="" disabled>---------------------------</option><?php endif; ?><?php /* Fill the box with any local permission boards. */ ?><?php foreach (Utils::$context['boards'] as $board): ?>
+							<option value="<?= $board['id'] ?>"<?= $board['selected'] ? ' selected' : '' ?>><?= $board['name'] ?> (<?= $board['profile_name'] ?>)</option><?php endforeach; ?>
+						</select>
+					</h3>
+				</div><!-- .cat_bar -->
+			</form><?php if (!empty(Utils::$context['member']['permissions']['board'])): ?>
+			<table class="table_grid">
+				<thead>
+					<tr class="title_bar">
+						<th class="lefttext half_table"><?= Lang::getTxt('showPermissions_permission', file: 'Profile') ?></th>
+						<th class="lefttext half_table"><?= Lang::getTxt('showPermissions_status', file: 'Profile') ?></th>
+					</tr>
+				</thead>
+				<tbody><?php foreach (Utils::$context['member']['permissions']['board'] as $permission): ?>
+					<tr class="windowbg">
+						<td title="<?= $permission['id'] ?>">
+							<?= $permission['is_denied'] ? '<del class="error">' . $permission['name'] . '</del>' : $permission['name'] ?>
+						</td>
+						<td class="smalltext"><?php if ($permission['is_denied']): ?>
+							<span class="alert"><?= Lang::getTxt('showPermissions_denied', ['list' => Lang::sentenceList($permission['groups']['denied'])], file: 'Profile') ?></span><?php else: ?>
+							<?= Lang::getTxt('showPermissions_given', ['list' => Lang::sentenceList($permission['groups']['allowed'])], file: 'Profile') ?><?php endif; ?>
+						</td>
+					</tr><?php endforeach; ?>
+				</tbody>
+			</table><?php else: ?>
+			<p class="windowbg"><?= Lang::getTxt('showPermissions_none_board', file: 'Profile') ?></p><?php endif; ?>
+		</div><!-- #permissions --><?php endif; ?>
diff --git a/Themes/default/templates/Profile/showPosts.php b/Themes/default/templates/Profile/showPosts.php
new file mode 100644
index 00000000000..62acdd1d412
--- /dev/null
+++ b/Themes/default/templates/Profile/showPosts.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing all the posts of the user, in chronological order.
+ */
+?>
+		<div class="cat_bar<?= !isset(Utils::$context['attachments']) ? ' cat_bar_round' : '' ?>">
+			<h3 class="catbg">
+				<?= Lang::getTxt(
+		!isset(Utils::$context['attachments']) && empty(Utils::$context['is_topics'])
+					? 'showMessages'
+					: (
+						!empty(Utils::$context['is_topics'])
+						? 'showTopics'
+						: 'showAttachments'
+					),
+		file: 'Profile',
+	) ?><?= !Profile::$member->is_me ? ' - ' . Utils::$context['member']['name'] : '' ?>
+			</h3>
+		</div><?= !empty(Utils::$context['page_index']) ? '
+		<div class="pagesection">
+			<div class="pagelinks">' . Utils::$context['page_index'] . '</div>
+		</div>' : '' ?><?php /* Are we displaying posts or attachments? */ ?><?php if (!isset(Utils::$context['attachments'])): ?><?php /* For every post to be displayed, give it its own div, and show the important details of the post. */ ?><?php foreach (Utils::$context['posts'] as $post): ?>
+		<div class="<?= $post['css_class'] ?>">
+			<div class="page_number floatright"> #<?= $post['counter'] ?></div>
+			<div class="topic_details">
+				<h4>
+					<strong><a href="<?= Config::$scripturl ?>?board=<?= $post['board']['id'] ?>.0"><?= $post['board']['name'] ?></a> / <a href="<?= Config::$scripturl ?>?topic=<?= $post['topic'] ?>.<?= $post['start'] ?>#msg<?= $post['id'] ?>"><?= $post['subject'] ?></a></strong>
+				</h4>
+				<span class="smalltext"><?= $post['time'] ?></span>
+			</div><?php if (!$post['approved']): ?>
+			<div class="noticebox">
+				<?= Lang::getTxt('post_awaiting_approval', file: 'General') ?>
+			</div><?php endif; ?>
+			<div class="post">
+				<div class="inner">
+					<?= Utils::adjustHeadingLevels($post['body'], 4) ?>
+				</div>
+			</div><!-- .post --><?php /* Post options */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $post['quickbuttons'], 'list_class' => 'profile_showposts']); ?>
+		</div><!-- .<?= $post['css_class'] ?> --><?php endforeach; ?><?php else: ?><?php $this->subTemplate('show_list', ['list_id' => 'attachments']); ?><?php endif; ?><?php /* No posts? Just end with an informative message. */ ?><?php if ((isset(Utils::$context['attachments']) && empty(Utils::$context['attachments'])) || (!isset(Utils::$context['attachments']) && empty(Utils::$context['posts']))): ?>
+		<div class="windowbg">
+			<?= Lang::getTxt(
+			isset(Utils::$context['attachments'])
+				? 'show_attachments_none'
+				: (
+					Utils::$context['is_topics']
+					? 'show_topics_none'
+					: 'show_posts_none'
+				),
+			file: 'Profile',
+		) ?>
+		</div><?php endif; ?><?php /* Show more page numbers. */ ?><?php if (!empty(Utils::$context['page_index'])): ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php endif; ?>
diff --git a/Themes/default/templates/Profile/statPanel.php b/Themes/default/templates/Profile/statPanel.php
new file mode 100644
index 00000000000..f82548238d9
--- /dev/null
+++ b/Themes/default/templates/Profile/statPanel.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for user statistics, showing graphs and the like.
+ */
+?>
+
+<?php /* First, show a few text statistics such as post/topic count. */ ?>
+	<div id="profileview" class="roundframe noup">
+		<div id="generalstats">
+			<dl class="stats">
+<?php foreach (Utils::$context['text_stats'] as $key => $stat): ?>
+				<dt><?= Lang::getTxt('statPanel_' . $key, file: 'Profile') ?></dt>
+<?php if (!empty($stat['url'])): ?>
+				<dd><a href="<?= $stat['url'] ?>"><?= $stat['text'] ?></a></dd>
+<?php else: ?>
+				<dd><?= $stat['text'] ?></dd>
+<?php endif; ?>
+<?php endforeach; ?>
+			</dl>
+		</div>
+<?php /* This next section draws a graph showing what times of day they post the most. */ ?>
+		<div id="activitytime" class="flow_hidden">
+			<div class="title_bar">
+				<h3 class="titlebg">
+					<span class="main_icons history"></span> <?= Lang::getTxt('statPanel_activityTime', file: 'Profile') ?>
+				</h3>
+			</div>
+<?php /* If they haven't post at all, don't draw the graph. */ ?>
+<?php if (empty(Utils::$context['posts_by_time'])): ?>
+			<p class="centertext padding"><?= Lang::getTxt('statPanel_noPosts', file: 'Profile') ?></p>
+<?php /* Otherwise do! */ ?>
+<?php else: ?>
+			<ul class="activity_stats flow_hidden">
+<?php /* The labels. */ ?>
+<?php foreach (Utils::$context['posts_by_time'] as $time_of_day): ?>
+				<li>
+					<div class="generic_bar vertical">
+						<div class="bar" style="height: <?= (int) $time_of_day['relative_percent'] ?>%;">
+							<span><?= Lang::getTxt('statPanel_activityTime_posts', [$time_of_day['posts'], $time_of_day['posts_percent'] / 100], file: 'Profile') ?></span>
+						</div>
+					</div>
+					<span class="stats_hour"><?= $time_of_day['hour_format'] ?></span>
+				</li>
+<?php endforeach; ?>
+			</ul>
+<?php endif; ?>
+		</div><!-- #activitytime -->
+<?php /* Two columns with the most popular boards by posts and activity (activity = users posts / total posts). */ ?>
+		<div class="flow_hidden">
+			<div class="half_content">
+				<div class="title_bar">
+					<h3 class="titlebg">
+						<span class="main_icons replies"></span> <?= Lang::getTxt('statPanel_topBoards', file: 'Profile') ?>
+					</h3>
+				</div>
+<?php if (empty(Utils::$context['popular_boards'])): ?>
+				<p class="centertext padding"><?= Lang::getTxt('statPanel_noPosts', file: 'Profile') ?></p>
+<?php else: ?>
+				<dl class="stats">
+<?php /* Draw a bar for every board. */ ?>
+<?php foreach (Utils::$context['popular_boards'] as $board): ?>
+					<dt><?= $board['link'] ?></dt>
+					<dd>
+						<div class="profile_pie" style="background-position: -<?= ((int) ($board['posts_percent'] / 5) * 20) ?>px 0;" title="<?= Lang::getTxt('statPanel_topBoards_memberposts', [$board['posts'], $board['total_posts_member'], $board['posts_percent'] / 100], file: 'Profile') ?>">
+							<?= Lang::getTxt('statPanel_topBoards_memberposts', [$board['posts'], $board['total_posts_member'], $board['posts_percent'] / 100], file: 'Profile') ?>
+						</div>
+						<?= empty(Utils::$context['hide_num_posts']) ? $board['posts'] : '' ?>
+					</dd>
+<?php endforeach; ?>
+				</dl>
+<?php endif; ?>
+			</div><!-- .half_content -->
+			<div class="half_content">
+				<div class="title_bar">
+					<h3 class="titlebg">
+						<span class="main_icons replies"></span> <?= Lang::getTxt('statPanel_topBoardsActivity', file: 'Profile') ?>
+					</h3>
+				</div>
+<?php if (empty(Utils::$context['board_activity'])): ?>
+				<p class="centertext padding"><?= Lang::getTxt('statPanel_noPosts', file: 'Profile') ?></p>
+<?php else: ?>
+				<dl class="stats">
+<?php /* Draw a bar for every board. */ ?>
+<?php foreach (Utils::$context['board_activity'] as $activity): ?>
+					<dt><?= $activity['link'] ?></dt>
+					<dd>
+						<div class="profile_pie" style="background-position: -<?= ((int) ($activity['posts_percent'] / 5) * 20) ?>px 0;" title="<?= Lang::getTxt('statPanel_topBoards_posts', [$activity['posts'], $activity['total_posts'], $activity['posts_percent'] / 100], file: 'Profile') ?>">
+							<?= Lang::getTxt('statPanel_topBoards_posts', [$activity['posts'], $activity['total_posts'], $activity['posts_percent'] / 100], file: 'Profile') ?>
+						</div>
+						<?= Lang::formatText('{0, number, percent}', [$activity['percent'] / 100]) ?>
+					</dd>
+<?php endforeach; ?>
+				</dl>
+<?php endif; ?>
+			</div><!-- .half_content -->
+		</div><!-- .flow_hidden -->
+	</div><!-- #profileview -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/summary.php b/Themes/default/templates/Profile/summary.php
new file mode 100644
index 00000000000..b8114b6d959
--- /dev/null
+++ b/Themes/default/templates/Profile/summary.php
@@ -0,0 +1,316 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template displays a user's details without any option to edit them.
+ */
+?>
+
+<?php /* Display the basic information about the user */ ?>
+	<div id="profileview" class="roundframe flow_auto noup">
+		<div id="basicinfo">
+<?php /* Are there any custom profile fields for above the name? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['above_member'])): ?>
+<?php $fields = ''; ?>
+<?php foreach (Utils::$context['print_custom_fields']['above_member'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php
+$fields .= '
+					<li>' . $field['output_html'] . '</li>';
+?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (!empty($fields)): ?>
+			<div class="custom_fields_above_name">
+				<ul><?= $fields ?>
+				</ul>
+			</div>
+<?php endif; ?>
+<?php endif; ?>
+			<div class="username clear">
+				<h4>
+<?php if (!empty(Utils::$context['print_custom_fields']['before_member'])): ?>
+<?php foreach (Utils::$context['print_custom_fields']['before_member'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+					<span><?= $field['output_html'] ?></span>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
+					<?= Utils::$context['member']['name'] ?>
+
+<?php if (!empty(Utils::$context['print_custom_fields']['after_member'])): ?>
+<?php foreach (Utils::$context['print_custom_fields']['after_member'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+					<span><?= $field['output_html'] ?></span>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
+					<span class="position"><?= (!empty(Utils::$context['member']['group']) ? Utils::$context['member']['group'] : Utils::$context['member']['post_group']) ?></span>
+				</h4>
+			</div>
+			<?= Utils::$context['member']['avatar']['image'] ?>
+
+<?php /* Are there any custom profile fields for below the avatar? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['below_avatar'])): ?>
+<?php $fields = ''; ?>
+<?php foreach (Utils::$context['print_custom_fields']['below_avatar'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php
+$fields .= '
+					<li>' . $field['output_html'] . '</li>';
+?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (!empty($fields)): ?>
+			<div class="custom_fields_below_avatar">
+				<ul><?= $fields ?>
+				</ul>
+			</div>
+<?php endif; ?>
+<?php endif; ?>
+			<ul class="icon_fields clear">
+<?php /* Email is only visible if it's your profile or you have the moderate_forum permission */ ?>
+<?php if (Utils::$context['member']['show_email']): ?>
+				<li><a href="mailto:<?= Utils::$context['member']['email'] ?>" title="<?= Utils::$context['member']['email'] ?>" rel="nofollow"><span class="main_icons mail" title="<?= Lang::getTxt('email', file: 'General') ?>"></span></a></li>
+<?php endif; ?>
+<?php /* Don't show an icon if they haven't specified a website. */ ?>
+<?php if (Utils::$context['member']['website']['url'] !== '' && !isset(Utils::$context['disabled_fields']['website'])): ?>
+				<li><a href="<?= Utils::$context['member']['website']['url'] ?>" title="<?= Utils::$context['member']['website']['title'] ?>" target="_blank" rel="noopener"><span class="main_icons www" title="<?= Utils::$context['member']['website']['title'] ?>"></span></a></li>
+<?php endif; ?>
+<?php /* Are there any custom profile fields as icons? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['icons'])): ?>
+<?php foreach (Utils::$context['print_custom_fields']['icons'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+				<li class="custom_field"><?= $field['output_html'] ?></li>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
+			</ul>
+			<span id="userstatus">
+				<?= Utils::$context['can_send_pm'] ? '<a href="' . Utils::$context['member']['online']['href'] . '" title="' . Utils::$context['member']['online']['text'] . '" rel="nofollow">' : '' ?><span class="<?= (Utils::$context['member']['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= Utils::$context['member']['online']['text'] ?>"></span><?= Utils::$context['can_send_pm'] ? '</a>' : '' ?><span class="smalltext"> <?= Utils::$context['member']['online']['label'] ?></span>
+<?php /* Can they add this member as a buddy? */ ?>
+<?php if (!empty(Utils::$context['can_have_buddy']) && !Profile::$member->is_me): ?>
+				<br>
+				<a href="<?= Config::$scripturl ?>?action=buddy;u=<?= Utils::$context['id_member'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('buddy_' . (Utils::$context['member']['is_buddy'] ? 'remove' : 'add'), file: 'Profile') ?></a>
+<?php endif; ?>
+			</span>
+<?php if (!Profile::$member->is_me && Utils::$context['can_send_pm']): ?>
+			<a href="<?= Config::$scripturl ?>?action=pm;sa=send;u=<?= Utils::$context['id_member'] ?>" class="infolinks"><?= Lang::getTxt('profile_sendpm_short', file: 'Profile') ?></a>
+<?php endif; ?>
+			<a href="<?= Config::$scripturl ?>?action=profile;area=showposts;u=<?= Utils::$context['id_member'] ?>" class="infolinks"><?= Lang::getTxt('showPosts', file: 'Profile') ?></a>
+<?php if (Profile::$member->is_me && !empty(Config::$modSettings['drafts_post_enabled'])): ?>
+			<a href="<?= Config::$scripturl ?>?action=profile;area=showdrafts;u=<?= Utils::$context['id_member'] ?>" class="infolinks"><?= Lang::getTxt('drafts_show', file: 'Drafts') ?></a>
+<?php endif; ?>
+			<a href="<?= Config::$scripturl ?>?action=profile;area=statistics;u=<?= Utils::$context['id_member'] ?>" class="infolinks"><?= Lang::getTxt('statPanel', file: 'Profile') ?></a>
+<?php /* Are there any custom profile fields for bottom? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['bottom_poster'])): ?>
+<?php $fields = ''; ?>
+<?php foreach (Utils::$context['print_custom_fields']['bottom_poster'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php
+$fields .= '
+					<li>' . $field['output_html'] . '</li>';
+?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (!empty($fields)): ?>
+			<div class="custom_fields_bottom">
+				<ul class="nolist"><?= $fields ?>
+				</ul>
+			</div>
+<?php endif; ?>
+<?php endif; ?>
+		</div><!-- #basicinfo -->
+
+		<div id="detailedinfo">
+			<dl class="settings">
+<?php if (Profile::$member->is_me || User::$me->is_admin): ?>
+				<dt><?= Lang::getTxt('username', file: 'General') ?></dt>
+				<dd><?= Utils::$context['member']['username'] ?></dd>
+<?php endif; ?>
+<?php if (!isset(Utils::$context['disabled_fields']['posts'])): ?>
+				<dt><?= Lang::getTxt('profile_posts', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['posts'] ?> (<?= is_numeric(Utils::$context['member']['posts_per_day']) ? Lang::getTxt('posts_per_day', [Utils::$context['member']['posts_per_day']], file: 'Profile') : Utils::$context['member']['posts_per_day'] ?>)</dd>
+<?php endif; ?>
+<?php if (Utils::$context['member']['show_email']): ?>
+				<dt><?= Lang::getTxt('email', file: 'General') ?></dt>
+				<dd><a href="mailto:<?= Utils::$context['member']['email'] ?>"><?= Utils::$context['member']['email'] ?></a></dd>
+<?php endif; ?>
+<?php if (!empty(Config::$modSettings['titlesEnable']) && !empty(Utils::$context['member']['title'])): ?>
+				<dt><?= Lang::getTxt('custom_title', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['title'] ?></dd>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['blurb'])): ?>
+				<dt><?= Lang::getTxt('personal_text', file: 'General') ?></dt>
+				<dd><?= Utils::$context['member']['blurb'] ?></dd>
+<?php endif; ?>
+				<dt><?= Lang::getTxt('age', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['age'] ?><?= (Utils::$context['member']['today_is_birthday'] ? ' &nbsp; <img src="' . Theme::$current->settings['images_url'] . '/cake.png" alt="">' : '') ?></dd>
+			</dl>
+<?php /* Any custom fields for standard placement? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['standard'])): ?>
+<?php $fields = []; ?>
+<?php foreach (Utils::$context['print_custom_fields']['standard'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php $fields[] = $field; ?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (count($fields) > 0): ?>
+			<dl class="settings">
+<?php foreach ($fields as $field): ?>
+				<dt><?= $field['name'] ?>:</dt>
+				<dd><?= $field['output_html'] ?></dd>
+<?php endforeach; ?>
+			</dl>
+<?php endif; ?>
+<?php endif; ?>
+			<dl class="settings">
+				<dt><?= Lang::getTxt('date_registered', file: 'General') ?></dt>
+				<dd><?= Utils::$context['member']['registered'] ?></dd>
+<?php /* If the person looking is allowed, they can check the members IP address and hostname. */ ?>
+<?php if (Utils::$context['can_see_ip']): ?>
+<?php if (!empty(Utils::$context['member']['ip'])): ?>
+				<dt><?= Lang::getTxt('ip', file: 'General') ?></dt>
+				<dd><a href="<?= Config::$scripturl ?>?action=profile;area=tracking;sa=ip;searchip=<?= Utils::$context['member']['ip'] ?>;u=<?= Utils::$context['member']['id'] ?>"><?= Utils::$context['member']['ip'] ?></a></dd>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['member']['hostname'])): ?>
+				<dt><?= Lang::getTxt('hostname', file: 'General') ?></dt>
+				<dd><?= Utils::$context['member']['hostname'] ?></dd>
+<?php endif; ?>
+<?php endif; ?>
+				<dt><?= Lang::getTxt('local_time', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['local_time'] ?></dd>
+<?php if (!empty(Config::$modSettings['userLanguage']) && !empty(Utils::$context['member']['language'])): ?>
+				<dt><?= Lang::getTxt('language', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['language'] ?></dd>
+<?php endif; ?>
+<?php if (Utils::$context['member']['show_last_login']): ?>
+				<dt><?= Lang::getTxt('lastLoggedIn', file: 'Profile') ?></dt>
+				<dd><?= Utils::$context['member']['last_login'] ?><?= (!empty(Utils::$context['member']['is_hidden']) ? ' (' . Lang::getTxt('hidden', file: 'Profile') . ')' : '') ?></dd>
+<?php endif; ?>
+			</dl>
+<?php /* Are there any custom profile fields for above the signature? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['above_signature'])): ?>
+<?php $fields = ''; ?>
+<?php foreach (Utils::$context['print_custom_fields']['above_signature'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php
+$fields .= '
+					<li>' . $field['output_html'] . '</li>';
+?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (!empty($fields)): ?>
+			<div class="custom_fields_above_signature">
+				<ul class="nolist"><?= $fields ?>
+				</ul>
+			</div>
+<?php endif; ?>
+<?php endif; ?>
+<?php /* Show the users signature. */ ?>
+<?php if (Utils::$context['signature_enabled'] && !empty(Utils::$context['member']['signature'])): ?>
+			<div class="signature">
+				<h5><?= Lang::getTxt('signature', file: 'Profile') ?></h5>
+				<?= Utils::$context['member']['signature'] ?>
+			</div>
+<?php endif; ?>
+<?php /* Are there any custom profile fields for below the signature? */ ?>
+<?php if (!empty(Utils::$context['print_custom_fields']['below_signature'])): ?>
+<?php $fields = ''; ?>
+<?php foreach (Utils::$context['print_custom_fields']['below_signature'] as $field): ?>
+<?php if (!empty($field['output_html'])): ?>
+<?php
+$fields .= '
+					<li>' . $field['output_html'] . '</li>';
+?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php if (!empty($fields)): ?>
+			<div class="custom_fields_below_signature">
+				<ul class="nolist"><?= $fields ?>
+				</ul>
+			</div>
+<?php endif; ?>
+<?php endif; ?>
+<?php
+if (
+		(Utils::$context['can_view_warning'] && Utils::$context['member']['warning'])
+		|| !empty(Utils::$context['activate_message'])
+		|| !empty(Utils::$context['member']['bans'])
+	):
+?>
+			<dl class="settings">
+<?php /* Can they view/issue a warning? */ ?>
+<?php if (Utils::$context['can_view_warning'] && Utils::$context['member']['warning']): ?>
+					<dt><?= Lang::getTxt('profile_warning_level', file: 'Profile') ?></dt>
+					<dd>
+						<a href="<?= Config::$scripturl ?>?action=profile;u=<?= Utils::$context['id_member'] ?>;area=<?= (Utils::$context['can_issue_warning'] && !Profile::$member->is_me ? 'issuewarning' : 'viewwarning') ?>"><?= Lang::formatText('{0, number, :: percent}', [Utils::$context['member']['warning']]) ?></a>
+<?php /* Can we provide information on what this means? */ ?>
+<?php if (!empty(Utils::$context['warning_status'])): ?>
+						<span class="smalltext">(<?= Utils::$context['warning_status'] ?>)</span>
+<?php endif; ?>
+					</dd>
+<?php endif; ?>
+<?php /* Is this member requiring activation and/or banned? */ ?>
+<?php if (!empty(Utils::$context['activate_message']) || !empty(Utils::$context['member']['bans'])): ?>
+<?php /* If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves. */ ?>
+<?php if (!empty(Utils::$context['activate_message'])): ?>
+					<dt>
+						<span class="alert"><?= Utils::$context['activate_message'] ?></span>
+					</dt>
+					<dd>
+						<a href="<?= Utils::$context['activate_link'] ?>" class="button"><?= Utils::$context['activate_link_text'] ?></a>
+					</dd>
+<?php endif; ?>
+<?php if (!empty(Config::$modSettings['always_anonymize_deleted_accounts'])): ?>
+					<dt></dt>
+					<dd>
+						<?= Lang::getTxt('deleteAccount_anonymize_forced', file: 'Profile') ?>
+					</dd>
+<?php elseif (Utils::$context['activate_type'] % User::BANNED == User::REQUESTED_DELETE): ?>
+					<dt>
+						<label><?= Lang::getTxt('deleteAccount_anonymize', file: 'Profile') ?></label>
+					</dt>
+					<dd>
+						<input type="checkbox" name="anonymize" id="anonymize" value="1"<?= !empty(Config::$modSettings['always_anonymize_deleted_accounts']) ? ' checked disabled' : '' ?>>
+					</dd>
+<?php endif; ?>
+<?php /* If the current member is banned, show a message and possibly a link to the ban. */ ?>
+<?php if (!empty(Utils::$context['member']['bans'])): ?>
+					<dt class="clear">
+						<span class="alert"><?= Lang::getTxt('user_is_banned', file: 'Profile') ?></span>&nbsp;<a href="#" onclick="document.getElementById('ban_info').classList.toggle('hidden');return false;"><?= Lang::getTxt('view_ban', file: 'Profile') ?></a>
+					</dt>
+					<dt class="clear hidden" id="ban_info">
+						<strong><?= Lang::getTxt('user_banned_by_following', file: 'Profile') ?></strong>
+<?php foreach (Utils::$context['member']['bans'] as $ban): ?>
+						<br>
+						<span class="smalltext"><?= $ban['explanation'] ?></span>
+<?php endforeach; ?>
+					</dt>
+<?php endif; ?>
+<?php endif; ?>
+			</dl>
+<?php endif; ?>
+		</div><!-- #detailedinfo -->
+	</div><!-- #profileview -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/tfadisable.php b/Themes/default/templates/Profile/tfadisable.php
new file mode 100644
index 00000000000..d03426fcff1
--- /dev/null
+++ b/Themes/default/templates/Profile/tfadisable.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Profile;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for disabling two-factor authentication.
+ */
+?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('tfadisable', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<form action="<?= Config::$scripturl ?>?action=profile;area=tfadisable" method="post">
+<?php if (Profile::$member->is_me): ?>
+					<div class="block">
+						<strong<?= (isset(Utils::$context['modify_error']['bad_password']) || isset(Utils::$context['modify_error']['no_password']) ? ' class="error"' : '') ?>><?= Lang::getTxt('current_password', file: 'Profile') ?></strong><br>
+						<input type="password" name="oldpasswrd" size="20">
+					</div>
+<?php else: ?>
+					<div class="smalltext">
+						<?= Lang::getTxt('tfa_disable_for_user', ['name' => User::$me->name], file: 'Profile') ?>
+					</div>
+<?php endif; ?>
+					<input type="submit" name="save" value="<?= Lang::getTxt('tfa_disable', file: 'Profile') ?>" class="button floatright">
+					<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="u" value="<?= Utils::$context['id_member'] ?>">
+				</form>
+			</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/tfasetup.php b/Themes/default/templates/Profile/tfasetup.php
new file mode 100644
index 00000000000..0a720e0da48
--- /dev/null
+++ b/Themes/default/templates/Profile/tfasetup.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for setting up and managing Two-Factor Authentication.
+ */
+?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('tfa_title', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<div>
+<?php if (!empty(Utils::$context['tfa_backup'])): ?>
+					<div class="smalltext error">
+						<?= Lang::getTxt('tfa_backup_used_desc', file: 'Profile') ?>
+					</div>
+<?php elseif (Config::$modSettings['tfa_mode'] == 2): ?>
+					<div class="smalltext">
+						<strong><?= Lang::getTxt('tfa_forced_desc', file: 'Profile') ?></strong>
+					</div>
+<?php endif; ?>
+					<div class="smalltext">
+						<?= Lang::getTxt('tfa_desc', file: 'Profile') ?>
+					</div>
+					<div class="floatleft">
+						<form action="<?= Config::$scripturl ?>?action=profile;area=tfasetup" method="post">
+							<div class="block">
+								<strong><?= Lang::getTxt('tfa_step1', file: 'Profile') ?></strong><br>
+<?php if (!empty(Utils::$context['tfa_pass_error'])): ?>
+								<div class="error smalltext">
+									<?= Lang::getTxt('tfa_pass_invalid', file: 'Profile') ?>
+								</div>
+<?php endif; ?>
+								<input type="password" name="oldpasswrd" size="25"<?= !empty(Utils::$context['password_auth_failed']) ? ' class="error"' : '' ?><?= !empty(Utils::$context['tfa_pass_value']) ? ' value="' . Utils::$context['tfa_pass_value'] . '"' : '' ?>>
+							</div>
+							<div class="block">
+								<strong><?= Lang::getTxt('tfa_step2', file: 'Profile') ?></strong>
+								<div class="smalltext"><?= Lang::getTxt('tfa_step2_desc', file: 'Profile') ?></div>
+								<div class="tfacode"><?= Utils::$context['tfa_secret'] ?></div>
+							</div>
+							<div class="block">
+								<strong><?= Lang::getTxt('tfa_step3', file: 'Profile') ?></strong><br>
+<?php if (!empty(Utils::$context['tfa_error'])): ?>
+								<div class="error smalltext">
+									<?= Lang::getTxt('tfa_code_invalid', file: 'Profile') ?>
+								</div>
+<?php endif; ?>
+								<input type="text" name="tfa_code" size="25"<?= !empty(Utils::$context['tfa_error']) ? ' class="error"' : '' ?><?= !empty(Utils::$context['tfa_value']) ? ' value="' . Utils::$context['tfa_value'] . '"' : '' ?>>
+								<input type="submit" name="save" value="<?= Lang::getTxt('tfa_enable', file: 'Profile') ?>" class="button">
+							</div>
+							<input type="hidden" name="<?= Utils::$context[Utils::$context['token_check'] . '_token_var'] ?>" value="<?= Utils::$context[Utils::$context['token_check'] . '_token'] ?>">
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						</form>
+					</div>
+					<div class="floatright tfa_qrcode">
+						<div id="qrcode"></div>
+						<script type="text/javascript">
+							new QRCode(document.getElementById("qrcode"), "<?= Utils::$context['tfa_qr_url'] ?>");
+						</script>
+					</div>
+<?php if (!empty(Utils::$context['from_ajax'])): ?>
+					<br>
+					<a href="javascript:self.close();"></a>
+<?php endif; ?>
+				</div>
+			</div><!-- .roundframe -->
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/tfasetup_backup.php b/Themes/default/templates/Profile/tfasetup_backup.php
new file mode 100644
index 00000000000..3a41d53a274
--- /dev/null
+++ b/Themes/default/templates/Profile/tfasetup_backup.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for setting up 2FA backup code
+ */
+?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('tfa_backup_title', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<div>
+					<div class="smalltext"><?= Lang::getTxt('tfa_backup_desc', file: 'Profile') ?></div>
+					<div class="bbc_code" style="resize: none; border: none;"><?= Utils::$context['tfa_backup'] ?></div>
+				</div>
+			</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Profile/trackActivity.php b/Themes/default/templates/Profile/trackActivity.php
new file mode 100644
index 00000000000..cf8f7c46b49
--- /dev/null
+++ b/Themes/default/templates/Profile/trackActivity.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template shows an admin information on a users IP addresses used and errors attributed to them.
+ */
+?><?php /* The first table shows IP information about the user. */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('view_ips_by', ['member' => Utils::$context['member']['name']], file: 'Profile') ?></h3>
+		</div><?php /* The last IP the user used. */ ?>
+		<div id="tracking" class="windowbg">
+			<dl class="settings noborder">
+				<dt>
+					<?= Lang::getTxt('most_recent_ip', file: 'Profile') ?>
+					<?= (empty(Utils::$context['last_ip2']) ? '' : '<br>
+					<span class="smalltext"><a href="' . Config::$scripturl . '?action=helpadmin;help=whytwoip" onclick="return reqOverlayDiv(this.href);">' . Lang::getTxt('why_two_ip_address', file: 'Profile') . '</a></span>') ?>
+				</dt>
+				<dd>
+					<a href="<?= Config::$scripturl ?>?action=profile;area=tracking;sa=ip;searchip=<?= Utils::$context['last_ip'] ?>;u=<?= Utils::$context['member']['id'] ?>"><?= Utils::$context['last_ip'] ?></a><?php /* Second address detected? */ ?><?php if (!empty(Utils::$context['last_ip2'])): ?>
+					, <a href="<?= Config::$scripturl ?>?action=profile;area=tracking;sa=ip;searchip=<?= Utils::$context['last_ip2'] ?>;u=<?= Utils::$context['member']['id'] ?>"><?= Utils::$context['last_ip2'] ?></a><?php endif; ?>
+				</dd><?php /* Lists of IP addresses used in messages / error messages. */ ?>
+				<dt><?= Lang::getTxt('ips_in_messages', file: 'Profile') ?></dt>
+				<dd>
+					<?= (count(Utils::$context['ips']) > 0 ? Lang::sentenceList(Utils::$context['ips']) : Lang::getTxt('none', file: 'General')) ?>
+				</dd>
+				<dt><?= Lang::getTxt('ips_in_errors', file: 'Profile') ?></dt>
+				<dd>
+					<?= (count(Utils::$context['error_ips']) > 0 ? Lang::sentenceList(Utils::$context['error_ips']) : Lang::getTxt('none', file: 'General')) ?>
+				</dd><?php /* List any members that have used the same IP addresses as the current member. */ ?>
+				<dt><?= Lang::getTxt('members_in_range', file: 'Profile') ?></dt>
+				<dd>
+					<?= (count(Utils::$context['members_in_range']) > 0 ? Lang::sentenceList(Utils::$context['members_in_range']) : Lang::getTxt('none', file: 'General')) ?>
+				</dd>
+			</dl>
+		</div><!-- #tracking --><?php /* Show the track user list. */ ?><?php $this->subTemplate('show_list', ['list_id' => 'track_user_list']); ?>
diff --git a/Themes/default/templates/Profile/trackIP.php b/Themes/default/templates/Profile/trackIP.php
new file mode 100644
index 00000000000..dee2aab23f4
--- /dev/null
+++ b/Themes/default/templates/Profile/trackIP.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for trackIP, allowing the admin to see where/who a certain IP has been used.
+ */
+?><?php
+// This function always defaults to the last IP used by a member but can be set to track any IP.
+// The first table in the template gives an input box to allow the admin to enter another IP to track.
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('trackIP', file: 'Profile') ?></h3>
+		</div>
+		<div class="windowbg">
+			<form action="<?= Utils::$context['base_url'] ?>" method="post" accept-charset="UTF-8">
+				<dl class="settings">
+					<dt>
+						<label for="searchip"><strong><?= Lang::getTxt('enter_ip', file: 'Profile') ?></strong></label>
+					</dt>
+					<dd>
+						<input type="text" name="searchip" id="searchip" value="<?= Utils::$context['ip'] ?>">
+					</dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('trackIP', file: 'Profile') ?>" class="button">
+			</form>
+		</div>
+		<br><?php /* The table inbetween the first and second table shows links to the whois server for every region. */ ?><?php if (Utils::$context['single_ip']): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('whois_title', Utils::$context, file: 'Profile') ?></h3>
+		</div>
+		<div class="windowbg"><?php foreach (Utils::$context['whois_servers'] as $server): ?>
+			<a href="<?= $server['url'] ?>" target="_blank" rel="noopener"><?= $server['name'] ?></a><br><?php endforeach; ?>
+		</div>
+		<br><?php endif; ?><?php /* The second table lists all the members who have been logged as using this IP address. */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('members_from_ip', Utils::$context, file: 'Profile') ?></h3>
+		</div><?php if (empty(Utils::$context['ips'])): ?>
+		<p class="windowbg description">
+			<em><?= Lang::getTxt('no_members_from_ip', file: 'Profile') ?></em>
+		</p><?php else: ?>
+		<table class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th scope="col"><?= Lang::getTxt('ip_address', file: 'General') ?></th>
+					<th scope="col"><?= Lang::getTxt('display_name', file: 'General') ?></th>
+				</tr>
+			</thead>
+			<tbody><?php /* Loop through each of the members and display them. */ ?><?php foreach (Utils::$context['ips'] as $ip => $memberlist): ?>
+				<tr class="windowbg">
+					<td><a href="<?= Utils::$context['base_url'] ?>;searchip=<?= $ip ?>"><?= $ip ?></a></td>
+					<td><?= implode(', ', $memberlist) ?></td>
+				</tr><?php endforeach; ?>
+			</tbody>
+		</table><?php endif; ?>
+		<br><?php $this->subTemplate('show_list', ['list_id' => 'track_message_list']); ?><br><?php $this->subTemplate('show_list', ['list_id' => 'track_user_list']); ?><?php /* 3rd party integrations may have added additional tracking. */ ?><?php if (!empty(Utils::$context['additional_track_lists'])): ?><?php foreach (Utils::$context['additional_track_lists'] as $list): ?><br><?php $this->subTemplate('show_list', ['list_id' => $list]); ?><?php endforeach; ?><?php endif; ?>
diff --git a/Themes/default/templates/Profile/viewWarning.php b/Themes/default/templates/Profile/viewWarning.php
new file mode 100644
index 00000000000..5ff9c53cb17
--- /dev/null
+++ b/Themes/default/templates/Profile/viewWarning.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for viewing a user's warnings
+ */
+?><?php $this->subTemplate('load_warning_variables'); ?>
+		<div class="cat_bar">
+			<h3 class="catbg profile_hd">
+				<?= Lang::getTxt('profile_viewwarning_for_user', Utils::$context['member'], file: 'Profile') ?>
+			</h3>
+		</div>
+		<p class="information"><?= Lang::getTxt('viewWarning_help', file: 'Profile') ?></p>
+		<div class="windowbg">
+			<dl class="settings">
+				<dt>
+					<strong><?= Lang::getTxt('profile_warning_name', file: 'Profile') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['member']['name'] ?>
+				</dd>
+				<dt>
+					<strong><?= Lang::getTxt('profile_warning_level', file: 'Profile') ?></strong>
+				</dt>
+				<dd>
+					<div class="generic_bar warning_level <?= Utils::$context['current_warning_mode'] ?>">
+						<div class="bar" style="width: <?= Utils::$context['member']['warning'] ?>%;"></div>
+						<span><?= Utils::$context['member']['warning'] ?>%</span>
+					</div>
+				</dd><?php /* There's some impact of this? */ ?><?php if (!empty(Utils::$context['level_effects'][Utils::$context['current_level']])): ?>
+				<dt>
+					<strong><?= Lang::getTxt('profile_viewwarning_impact', file: 'Profile') ?></strong>
+				</dt>
+				<dd>
+					<?= Utils::$context['level_effects'][Utils::$context['current_level']] ?>
+				</dd><?php endif; ?>
+			</dl>
+		</div><!-- .windowbg --><?php $this->subTemplate('show_list', ['list_id' => 'view_warnings']); ?>
diff --git a/Themes/default/templates/Recent/index.php b/Themes/default/templates/Recent/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Recent/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Recent/recent.php b/Themes/default/templates/Recent/recent.php
new file mode 100644
index 00000000000..9eec04f69e4
--- /dev/null
+++ b/Themes/default/templates/Recent/recent.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing recent posts
+ */
+?>
+	<div id="recent" class="main_section">
+		<div id="display_head" class="information">
+			<h2 class="display_title">
+				<span id="top_subject"><?= Lang::getTxt('recent_posts', file: 'General') ?></span>
+			</h2>
+		</div><?php if (!empty(Utils::$context['page_index'])): ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php endif; ?><?php if (empty(Utils::$context['posts'])): ?>
+		<div class="windowbg"><?= Lang::getTxt('no_messages', file: 'General') ?></div><?php endif; ?><?php foreach (Utils::$context['posts'] as $post): ?>
+		<div class="<?= $post['css_class'] ?>">
+			<div class="page_number floatright"> #<?= $post['counter'] ?></div>
+			<div class="topic_details">
+				<h5><?= $post['board']['link'] ?> / <?= $post['link'] ?></h5>
+				<span class="smalltext"><?= Lang::getTxt('last_post_member_date', ['member' => $post['poster']['link'], 'relative' => str_contains($post['time'], Lang::getTxt('today', file: 'General')) ? 'today' : (str_contains($post['time'], Lang::getTxt('yesterday', file: 'General')) ? 'yesterday' : 'other'), 'date' => $post['time']]) ?></span>
+			</div>
+			<div class="list_posts"><?= $post['body'] ?></div><?php /* Post options */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $post['quickbuttons'], 'list_class' => 'recent']); ?>
+		</div><!-- $post[css_class] --><?php endforeach; ?>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div>
+	</div><!-- #recent -->
\ No newline at end of file
diff --git a/Themes/default/templates/Recent/replies.php b/Themes/default/templates/Recent/replies.php
new file mode 100644
index 00000000000..3d21e6a7bcd
--- /dev/null
+++ b/Themes/default/templates/Recent/replies.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Board;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing unread replies (eg new replies to topics you've posted in)
+ */
+?><?php /* User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device. */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+	<div id="mobile_action" class="popup_container">
+		<div class="popup_window description">
+			<div class="popup_heading">
+				<?= Lang::getTxt('mobile_action', file: 'General') ?>
+				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+			</div>
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons']]); ?>
+		</div>
+	</div><?php endif; ?>
+	<div id="recent">
+		<div id="display_head" class="information">
+			<h2 class="display_title">
+				<span><?= (!empty(Board::$info->name) ? Board::$info->name . ' - ' : '') ?><?= Utils::$context['page_title'] ?></span>
+			</h2>
+		</div><?php if (Utils::$context['showCheckboxes']): ?>
+		<form action="<?= Config::$scripturl ?>?action=quickmod" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="qaction" value="markread">
+			<input type="hidden" name="redirect_url" value="action=unreadreplies<?= (!empty(Utils::$context['showing_all_topics']) ? ';all' : '') ?><?= Utils::$context['querystring_board_limits'] ?>"><?php endif; ?><?php if (!empty(Utils::$context['topics'])): ?>
+			<div class="pagesection">
+				<?= Utils::$context['menu_separator'] ?>
+				<div class="pagelinks floatleft">
+					<a href="#bot" class="button"><?= Lang::getTxt('go_down', file: 'General') ?></a>
+					<?= Utils::$context['page_index'] ?>
+				</div>
+				<?= !empty(Utils::$context['recent_buttons']) ? $this->fetchSubTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons'], 'direction' => 'right']) : '' ?><?php /* Mobile action (top) */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+				<div class="mobile_buttons floatright">
+					<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+				</div><?php endif; ?>
+			</div>
+			<div id="unreadreplies">
+				<div id="topic_header" class="title_bar">
+					<div class="board_icon"></div>
+					<div class="info"><?= Utils::$context['topics_headers']['subject'] ?> / <?= Utils::$context['topics_headers']['starter'] ?></div>
+					<div class="board_stats centertext"><?= Utils::$context['topics_headers']['replies'] ?> / <?= Utils::$context['topics_headers']['views'] ?></div>
+					<div class="lastpost"><?= Utils::$context['topics_headers']['last_post'] ?></div><?php /* Show a "select all" box for quick moderation? */ ?><?php if (Utils::$context['showCheckboxes']): ?>
+					<div class="moderation">
+						<input type="checkbox" onclick="invertAll(this, this.form, 'topics[]');">
+					</div><?php endif; ?>
+				</div><!-- #topic_header -->
+				<div id="topic_container"><?php foreach (Utils::$context['topics'] as $topic): ?>
+					<div class="<?= $topic['css_class'] ?>">
+						<div class="board_icon">
+							<img src="<?= $topic['first_post']['icon_url'] ?>" alt="">
+							<?= $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '' ?>
+						</div>
+						<div class="info"><?php /* Now we handle the icons */ ?>
+							<div class="icons floatright"><?php if ($topic['is_locked']): ?>
+								<span class="main_icons lock"></span><?php endif; ?><?php if ($topic['is_sticky']): ?>
+								<span class="main_icons sticky"></span><?php endif; ?><?php if ($topic['is_poll']): ?>
+								<span class="main_icons poll"></span><?php endif; ?>
+							</div>
+							<div class="recent_title">
+								<a href="<?= $topic['new_href'] ?>" id="newicon<?= $topic['first_post']['id'] ?>" class="new_posts"><?= Lang::getTxt('new', file: 'General') ?></a>
+								<?= $topic['is_sticky'] ? '<strong>' : '' ?><span title="<?= $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'] ?>"><span id="msg_<?= $topic['first_post']['id'] ?>"><?= $topic['first_post']['link'] ?></span><?= $topic['is_sticky'] ? '</strong>' : '' ?>
+							</div>
+							<p class="floatleft">
+								<?= $topic['first_post']['started_by'] ?>
+							</p>
+							<?= !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '' ?>
+						</div><!-- .info -->
+						<div class="board_stats centertext">
+							<p>
+								<?= Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General') ?>
+								<br>
+								<?= Lang::getTxt('number_of_views', [$topic['views']], file: 'General') ?>
+							</p>
+						</div>
+						<div class="lastpost">
+							<?= Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General') ?>
+						</div><?php if (Utils::$context['showCheckboxes']): ?>
+						<div class="moderation">
+							<input type="checkbox" name="topics[]" value="<?= $topic['id'] ?>">
+						</div><?php endif; ?>
+					</div><!-- $topic[css_class] --><?php endforeach; ?>
+				</div><!-- #topic_container -->
+			</div><!-- #unreadreplies -->
+			<div class="pagesection">
+				<?= !empty(Utils::$context['recent_buttons']) ? $this->fetchSubTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons'], 'direction' => 'right']) : '' ?>
+				<?= Utils::$context['menu_separator'] ?>
+				<div class="pagelinks floatleft">
+					<a href="#recent" class="button" id="bot"><?= Lang::getTxt('go_up', file: 'General') ?></a>
+					<?= Utils::$context['page_index'] ?>
+				</div><?php /* Mobile action (bottom) */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+				<div class="mobile_buttons floatright">
+					<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+				</div><?php endif; ?>
+			</div><?php else: ?>
+			<div class="infobox">
+				<p class="centertext">
+					<?= Lang::getTxt(Utils::$context['showing_all_topics'] ? 'topic_alert_none' : 'updated_topics_visit_none', file: 'General') ?>
+				</p>
+			</div><?php endif; ?><?php if (Utils::$context['showCheckboxes']): ?>
+		</form><?php endif; ?>
+	</div><!-- #recent --><?php if (empty(Utils::$context['no_topic_listing'])): ?><?php $this->subTemplate('topic_legend'); ?><?php endif; ?>
diff --git a/Themes/default/templates/Recent/unread.php b/Themes/default/templates/Recent/unread.php
new file mode 100644
index 00000000000..49e809b89c6
--- /dev/null
+++ b/Themes/default/templates/Recent/unread.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Board;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for showing unread posts
+ */
+?><?php /* User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device. */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+	<div id="mobile_action" class="popup_container">
+		<div class="popup_window description">
+			<div class="popup_heading">
+				<?= Lang::getTxt('mobile_action', file: 'General') ?>
+				<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+			</div>
+			<?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons']]); ?>
+		</div>
+	</div><?php endif; ?>
+	<div id="recent" class="main_content">
+		<div id="display_head" class="information">
+			<h2 class="display_title">
+				<span><?= (!empty(Board::$info->name) ? Board::$info->name . ' - ' : '') ?><?= Utils::$context['page_title'] ?></span>
+			</h2>
+		</div><?php if (Utils::$context['showCheckboxes']): ?>
+		<form action="<?= Config::$scripturl ?>?action=quickmod" method="post" accept-charset="UTF-8" name="quickModForm" id="quickModForm">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="qaction" value="markread">
+			<input type="hidden" name="redirect_url" value="action=unread<?= (!empty(Utils::$context['showing_all_topics']) ? ';all' : '') ?><?= Utils::$context['querystring_board_limits'] ?>"><?php endif; ?><?php if (!empty(Utils::$context['topics'])): ?>
+			<div class="pagesection">
+				<?= Utils::$context['menu_separator'] ?>
+				<div class="pagelinks floatleft">
+					<a href="#bot" class="button"><?= Lang::getTxt('go_down', file: 'General') ?></a>
+					<?= Utils::$context['page_index'] ?>
+				</div>
+				<?= !empty(Utils::$context['recent_buttons']) ? $this->fetchSubTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons'], 'direction' => 'right']) : '' ?><?php /* Mobile action (top) */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+				<div class="mobile_buttons floatright">
+					<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+				</div><?php endif; ?>
+			</div>
+			<div id="unread">
+				<div id="topic_header" class="title_bar">
+					<div class="board_icon"></div>
+					<div class="info"><?= Utils::$context['topics_headers']['subject'] ?> / <?= Utils::$context['topics_headers']['starter'] ?></div>
+					<div class="board_stats centertext"><?= Utils::$context['topics_headers']['replies'] ?> / <?= Utils::$context['topics_headers']['views'] ?></div>
+					<div class="lastpost"><?= Utils::$context['topics_headers']['last_post'] ?></div><?php /* Show a "select all" box for quick moderation? */ ?><?php if (Utils::$context['showCheckboxes']): ?>
+					<div class="moderation">
+						<input type="checkbox" onclick="invertAll(this, this.form, 'topics[]');">
+					</div><?php endif; ?>
+				</div><!-- #topic_header -->
+				<div id="topic_container"><?php foreach (Utils::$context['topics'] as $topic): ?>
+					<div class="<?= $topic['css_class'] ?>">
+						<div class="board_icon">
+							<img src="<?= $topic['first_post']['icon_url'] ?>" alt="">
+							<?= $topic['is_posted_in'] ? '<span class="main_icons profile_sm"></span>' : '' ?>
+						</div>
+						<div class="info"><?php /* Now we handle the icons */ ?>
+							<div class="icons floatright"><?php if ($topic['is_locked']): ?>
+								<span class="main_icons lock"></span><?php endif; ?><?php if ($topic['is_sticky']): ?>
+								<span class="main_icons sticky"></span><?php endif; ?><?php if ($topic['is_poll']): ?>
+								<span class="main_icons poll"></span><?php endif; ?>
+							</div>
+							<div class="recent_title">
+								<a href="<?= $topic['new_href'] ?>" id="newicon<?= $topic['first_post']['id'] ?>" class="new_posts"><?= Lang::getTxt('new', file: 'General') ?></a>
+								<?= $topic['is_sticky'] ? '<strong>' : '' ?><span class="preview" title="<?= $topic[(empty(Config::$modSettings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'] ?>"><span id="msg_<?= $topic['first_post']['id'] ?>"><?= $topic['first_post']['link'] ?></span></span><?= $topic['is_sticky'] ? '</strong>' : '' ?>
+							</div>
+							<p class="floatleft">
+								<?= $topic['first_post']['started_by'] ?>
+							</p>
+							<?= !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">' . $topic['pages'] . '</span>' : '' ?>
+						</div><!-- .info -->
+						<div class="board_stats centertext">
+							<p>
+								<?= Lang::getTxt('number_of_replies', [$topic['replies']], file: 'General') ?>
+								<br>
+								<?= Lang::getTxt('number_of_views', [$topic['views']], file: 'General') ?>
+							</p>
+						</div>
+						<div class="lastpost">
+							<?= Lang::getTxt('last_post_topic', ['post_link' => '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', 'member_link' => $topic['last_post']['member']['link']], file: 'General') ?>
+						</div><?php if (Utils::$context['showCheckboxes']): ?>
+						<div class="moderation">
+							<input type="checkbox" name="topics[]" value="<?= $topic['id'] ?>">
+						</div><?php endif; ?>
+					</div><!-- $topic[css_class] --><?php endforeach; ?><?php if (empty(Utils::$context['topics'])): ?>
+					<div style="display: none;"></div><?php endif; ?>
+				</div><!-- #topic_container -->
+			</div><!-- #unread -->
+			<div class="pagesection">
+				<?= !empty(Utils::$context['recent_buttons']) ? $this->fetchSubTemplate('button_strip', ['button_strip' => Utils::$context['recent_buttons'], 'direction' => 'right']) : '' ?>
+				<?= Utils::$context['menu_separator'] ?>
+				<div class="pagelinks floatleft">
+					<a href="#recent" class="button" id="bot"><?= Lang::getTxt('go_up', file: 'General') ?></a>
+					<?= Utils::$context['page_index'] ?>
+				</div><?php /* Mobile action (bottom) */ ?><?php if (!empty(Utils::$context['recent_buttons'])): ?>
+				<div class="mobile_buttons floatright">
+					<a class="button mobile_act"><?= Lang::getTxt('mobile_action', file: 'General') ?></a>
+				</div><?php endif; ?>
+			</div><?php else: ?>
+			<div class="infobox">
+				<p class="centertext">
+					<?= Lang::getTxt(Utils::$context['showing_all_topics'] ? 'topic_alert_none' : 'unread_topics_visit_none', ['scripturl' => Config::$scripturl], file: 'General') ?>
+				</p>
+			</div><?php endif; ?><?php if (Utils::$context['showCheckboxes']): ?>
+		</form><?php endif; ?>
+	</div><!-- #recent --><?php if (empty(Utils::$context['no_topic_listing'])): ?><?php $this->subTemplate('topic_legend'); ?><?php endif; ?>
diff --git a/Themes/default/templates/Register/admin_register.php b/Themes/default/templates/Register/admin_register.php
new file mode 100644
index 00000000000..9ea514b0fa6
--- /dev/null
+++ b/Themes/default/templates/Register/admin_register.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The template for the form allowing an admin to register a user from the admin center.
+ */
+?>
+		<div id="admin_form_wrapper">
+			<form id="postForm" action="<?= Config::$scripturl ?>?action=admin;area=regcenter" method="post" accept-charset="UTF-8" name="postForm">
+				<div class="cat_bar">
+					<h3 class="catbg"><?= Lang::getTxt('admin_browse_register_new', file: 'Admin') ?></h3>
+				</div>
+				<div id="register_screen" class="windowbg">
+<?php if (!empty(Utils::$context['registration_done'])): ?>
+					<div class="infobox">
+						<?= Utils::$context['registration_done'] ?>
+					</div>
+<?php endif; ?>
+					<dl class="register_form" id="admin_register_form">
+						<dt>
+							<strong><label for="user_input"><?= Lang::getTxt('admin_register_username', file: 'Login') ?></label></strong>
+							<span class="smalltext"><?= Lang::getTxt('admin_register_username_desc', file: 'Login') ?></span>
+						</dt>
+						<dd>
+							<input type="text" name="user" id="user_input" size="50" maxlength="25">
+						</dd>
+						<dt>
+							<strong><label for="email_input"><?= Lang::getTxt('admin_register_email', file: 'Login') ?></label></strong>
+							<span class="smalltext"><?= Lang::getTxt('admin_register_email_desc', file: 'Login') ?></span>
+						</dt>
+						<dd>
+							<input type="email" name="email" id="email_input" size="50">
+						</dd>
+						<dt>
+							<strong><label for="password_input"><?= Lang::getTxt('admin_register_password', file: 'Login') ?></label></strong>
+							<span class="smalltext"><?= Lang::getTxt('admin_register_password_desc', file: 'Login') ?></span>
+						</dt>
+						<dd>
+							<input type="password" name="password" id="password_input" size="50" onchange="onCheckChange();">
+						</dd>
+<?php if (!empty(Utils::$context['member_groups'])): ?>
+						<dt>
+							<strong><label for="group_select"><?= Lang::getTxt('admin_register_group', file: 'Login') ?></label></strong>
+							<span class="smalltext"><?= Lang::getTxt('admin_register_group_desc', file: 'Login') ?></span>
+						</dt>
+						<dd>
+							<select name="group" id="group_select">
+<?php foreach (Utils::$context['member_groups'] as $id => $name): ?>
+								<option value="<?= $id ?>"><?= $name ?></option>
+<?php endforeach; ?>
+							</select>
+						</dd>
+<?php endif; ?>
+<?php /* If there is any field marked as required, show it here! */ ?>
+<?php if (!empty(Utils::$context['custom_fields_required']) && !empty(Utils::$context['custom_fields'])): ?>
+<?php foreach (Utils::$context['custom_fields'] as $field): ?>
+<?php if ($field['show_reg'] > 1): ?>
+						<dt>
+							<strong<?= !empty($field['is_error']) ? ' class="red"' : '' ?>><?= $field['name'] ?>:</strong>
+							<span class="smalltext"><?= $field['desc'] ?></span>
+						</dt>
+						<dd>
+							<?= $field['input_html'] ?>
+						</dd>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
+						<dt>
+							<strong><label for="emailPassword_check"><?= Lang::getTxt('admin_register_email_detail', file: 'Login') ?></label></strong>
+							<span class="smalltext"><?= Lang::getTxt('admin_register_email_detail_desc', file: 'Login') ?></span>
+						</dt>
+						<dd>
+							<input type="checkbox" name="emailPassword" id="emailPassword_check" checked disabled>
+						</dd>
+						<dt>
+							<strong><label for="emailActivate_check"><?= Lang::getTxt('admin_register_email_activate', file: 'Login') ?></label></strong>
+						</dt>
+						<dd>
+							<input type="checkbox" name="emailActivate" id="emailActivate_check"<?= !empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? ' checked' : '' ?> onclick="onCheckChange();">
+						</dd>
+					</dl>
+					<div class="flow_auto">
+						<input type="submit" name="regSubmit" value="<?= Lang::getTxt('register', file: 'General') ?>" class="button">
+						<input type="hidden" name="sa" value="register">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="<?= Utils::$context['admin-regc_token_var'] ?>" value="<?= Utils::$context['admin-regc_token'] ?>">
+					</div>
+				</div><!-- #register_screen -->
+			</form>
+		</div><!-- #admin_form_wrapper -->
+	<br class="clear">
\ No newline at end of file
diff --git a/Themes/default/templates/Register/after.php b/Themes/default/templates/Register/after.php
new file mode 100644
index 00000000000..3092797e358
--- /dev/null
+++ b/Themes/default/templates/Register/after.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * After registration... all done ;).
+ */
+?>
+
+<?php /* Not much to see here, just a quick... "you're now registered!" or what have you. */ ?>
+		<div id="registration_success">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['title'] ?></h3>
+			</div>
+			<div class="windowbg">
+				<p><?= Utils::$context['description'] ?></p>
+			</div>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/coppa.php b/Themes/default/templates/Register/coppa.php
new file mode 100644
index 00000000000..26471830b16
--- /dev/null
+++ b/Themes/default/templates/Register/coppa.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for giving instructions about COPPA activation.
+ */
+?>
+
+<?php /* Formulate a nice complicated message! */ ?>
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div id="coppa" class="roundframe noup">
+				<p><?= Utils::$context['coppa']['body'] ?></p>
+				<p>
+					<span><a href="<?= Config::$scripturl ?>?action=coppa;form;member=<?= Utils::$context['coppa']['id'] ?>" target="_blank" rel="noopener"><?= Lang::getTxt('coppa_form_link_popup', file: 'Login') ?></a> | <a href="<?= Config::$scripturl ?>?action=coppa;form;dl;member=<?= Utils::$context['coppa']['id'] ?>"><?= Lang::getTxt('coppa_form_link_download', file: 'Login') ?></a></span>
+				</p>
+				<p><?= Lang::getTxt(Utils::$context['coppa']['many_options'] ? 'coppa_send_to_two_options' : 'coppa_send_to_one_option', file: 'Login') ?></p>
+<?php /* Can they send by post? */ ?>
+<?php if (!empty(Utils::$context['coppa']['post'])): ?>
+				<h4>1) <?= Lang::getTxt('coppa_send_by_post', file: 'Login') ?></h4>
+				<div class="coppa_contact">
+					<?= Utils::$context['coppa']['post'] ?>
+				</div>
+<?php endif; ?>
+<?php /* Can they send by fax?? */ ?>
+<?php if (!empty(Utils::$context['coppa']['fax'])): ?>
+				<h4><?= !empty(Utils::$context['coppa']['post']) ? '2' : '1' ?>) <?= Lang::getTxt('coppa_send_by_fax', file: 'Login') ?></h4>
+				<div class="coppa_contact">
+					<?= Utils::$context['coppa']['fax'] ?>
+				</div>
+<?php endif; ?>
+<?php /* Offer an alternative Phone Number? */ ?>
+<?php if (Utils::$context['coppa']['phone']): ?>
+				<p><?= Utils::$context['coppa']['phone'] ?></p>
+<?php endif; ?>
+			</div><!-- #coppa -->
\ No newline at end of file
diff --git a/Themes/default/templates/Register/coppa_form.php b/Themes/default/templates/Register/coppa_form.php
new file mode 100644
index 00000000000..f3fdffb42a2
--- /dev/null
+++ b/Themes/default/templates/Register/coppa_form.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * An easily printable form for giving permission to access the forum for a minor.
+ */
+?>
+
+<?php /* Show the form (As best we can) */ ?>
+		<table style="width: 100%; padding: 3px; border: 0" class="tborder">
+			<tr>
+				<td><?= Utils::$context['forum_contacts'] ?></td>
+			</tr>
+			<tr>
+				<td class="righttext">
+					<em><?= Lang::getTxt('coppa_form_address', file: 'Login') ?></em>: <?= Utils::$context['ul'] ?><br>
+					<?= Utils::$context['ul'] ?><br>
+					<?= Utils::$context['ul'] ?><br>
+					<?= Utils::$context['ul'] ?>
+				</td>
+			</tr>
+			<tr>
+				<td class="righttext">
+					<em><?= Lang::getTxt('coppa_form_date', file: 'Login') ?></em>: <?= Utils::$context['ul'] ?>
+					<br><br>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?= Utils::$context['coppa_body'] ?>
+				</td>
+			</tr>
+		</table>
+		<br>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/edit_agreement.php b/Themes/default/templates/Register/edit_agreement.php
new file mode 100644
index 00000000000..9397739edac
--- /dev/null
+++ b/Themes/default/templates/Register/edit_agreement.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Form for editing the agreement shown for people registering to the forum.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+		<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php elseif (!empty(Utils::$context['could_not_save'])): ?>
+		<div class="errorbox"><?= Lang::getTxt('admin_agreement_not_saved', file: 'Admin') ?></div><?php endif; ?><?php /* Warning for if the file isn't writable. */ ?><?php if (!empty(Utils::$context['warning'])): ?>
+		<div class="errorbox"><?= Utils::$context['warning'] ?></div><?php endif; ?><?php /* Just a big box to edit the text file ;) */ ?>
+		<div id="admin_form_wrapper">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('registration_agreement', file: 'General') ?></h3>
+			</div><?php /* Is there more than one language to choose from? */ ?><?php if (count(Utils::$context['editable_agreements']) > 1): ?>
+				<div class="information">
+					<form action="<?= Config::$scripturl ?>?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="UTF-8">
+						<strong><?= Lang::getTxt('admin_agreement_select_language', file: 'Admin') ?></strong>
+						<select name="agree_lang" onchange="document.getElementById('change_reg').submit();"><?php foreach (Utils::$context['editable_agreements'] as $file => $name): ?>
+							<option value="<?= $file ?>"<?= Utils::$context['current_agreement'] == $file ? ' selected' : '' ?>><?= $name ?></option><?php endforeach; ?>
+						</select>
+						<div class="righttext">
+							<input type="hidden" name="sa" value="agreement">
+							<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+							<input type="hidden" name="<?= Utils::$context['admin-rega_token_var'] ?>" value="<?= Utils::$context['admin-rega_token'] ?>">
+							<input type="submit" name="change" value="<?= Lang::getTxt('admin_agreement_select_language', file: 'Admin') ?>" class="button">
+						</div>
+					</form>
+				</div><!-- .information --><?php endif; ?><?php /* Show the actual agreement in an oversized text box. */ ?>
+			<div class="windowbg" id="registration_agreement">
+				<form action="<?= Config::$scripturl ?>?action=admin;area=regcenter" method="post" accept-charset="UTF-8">
+					<textarea cols="70" rows="20" name="agreement" id="agreement"><?= Utils::$context['agreement'] ?></textarea>
+					<div class="information"><?php if (empty(Utils::$context['agreement_history'])): ?>
+						<span><?= Utils::$context['agreement_info'] ?></span><?php else: ?>
+						<a href="" onclick="return false;" class="modified"><?= Utils::$context['agreement_info'] ?></a>
+						<div id="edit_history_list_<?= Utils::$context['current_agreement'] ?>" class="edit_history_list">
+							<div class="edit_history_count">
+								<?= Lang::getTxt('edit_history_count', [count(Utils::$context['agreement_history'])], file: 'General') ?>
+							</div>
+							<ol><?php foreach (Utils::$context['agreement_history'] as $hash => $linktext): ?>
+								<li>
+									<a href="<?= Config::$scripturl ?>?action=agreement;sa=history;doc=0;lang=<?= Utils::$context['current_agreement'] ?>;hash=<?= $hash ?>" onclick="return reqOverlayDiv(this.href, <?= Utils::escapeJavaScript($linktext) ?>, 'history');"><?= $linktext ?></a>
+								</li><?php endforeach; ?>
+							</ol>
+						</div><?php endif; ?>
+					</div>
+					<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button" onclick="return resetAgreementConfirm()" />
+					<input type="hidden" name="agree_lang" value="<?= Utils::$context['current_agreement'] ?>">
+					<input type="hidden" name="sa" value="agreement">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<script>
+						function resetAgreementConfirm()
+						{
+							return true;
+						}
+					</script>
+					<input type="hidden" name="<?= Utils::$context['admin-rega_token_var'] ?>" value="<?= Utils::$context['admin-rega_token'] ?>">
+				</form>
+			</div><!-- #registration_agreement -->
+		</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Register/edit_privacy_policy.php b/Themes/default/templates/Register/edit_privacy_policy.php
new file mode 100644
index 00000000000..210309fe7eb
--- /dev/null
+++ b/Themes/default/templates/Register/edit_privacy_policy.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+// Form for editing the privacy policy shown to people registering to the forum.
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+		<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?><?php /* Just a big box to edit the text file ;). */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('privacy_policy', file: 'General') ?></h3>
+		</div><?php /* Is there more than one language to choose from? */ ?><?php if (count(Utils::$context['editable_policies']) > 1): ?>
+			<div class="information">
+				<form action="<?= Config::$scripturl ?>?action=admin;area=regcenter" id="change_policy" method="post" accept-charset="UTF-8">
+					<strong><?= Lang::getTxt('admin_agreement_select_language', file: 'Admin') ?></strong>
+					<select name="policy_lang" onchange="document.getElementById('change_policy').submit();"><?php foreach (Utils::$context['editable_policies'] as $lang => $name): ?>
+						<option value="<?= $lang ?>" <?= Utils::$context['current_policy_lang'] == $lang ? 'selected="selected"' : '' ?>><?= $name ?></option><?php endforeach; ?>
+					</select>
+					<div class="righttext">
+						<input type="hidden" name="sa" value="policy">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="submit" name="change" value="<?= Lang::getTxt('admin_agreement_select_language_change', file: 'Admin') ?>" class="button">
+					</div>
+				</form>
+			</div><?php endif; ?>
+		<div class="windowbg" id="privacy_policy">
+			<form action="<?= Config::$scripturl ?>?action=admin;area=regcenter" method="post" accept-charset="UTF-8"><?php /* Show the actual policy in an oversized text box. */ ?>
+			<textarea cols="70" rows="20" name="policy" id="agreement"><?= Utils::$context['privacy_policy'] ?></textarea>
+				<div class="information"><?php if (empty(Utils::$context['privacy_policy_history'])): ?>
+					<span><?= Utils::$context['privacy_policy_info'] ?></span><?php else: ?>
+					<a href="" onclick="return false;" class="modified"><?= Utils::$context['privacy_policy_info'] ?></a>
+					<div id="edit_history_list_<?= Utils::$context['current_policy_lang'] ?>" class="edit_history_list">
+						<div class="edit_history_count">
+							<?= Lang::getTxt('edit_history_count', [count(Utils::$context['privacy_policy_history'])], file: 'General') ?>
+						</div>
+						<ol><?php foreach (Utils::$context['privacy_policy_history'] as $hash => $linktext): ?>
+							<li>
+								<a href="<?= Config::$scripturl ?>?action=agreement;sa=history;doc=1;lang=<?= Utils::$context['current_policy_lang'] ?>;hash=<?= $hash ?>" onclick="return reqOverlayDiv(this.href, <?= Utils::escapeJavaScript($linktext) ?>, 'history');"><?= $linktext ?></a>
+							</li><?php endforeach; ?>
+						</ol>
+					</div><?php endif; ?>
+				</div>
+				<div class="righttext">
+					<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button" onclick="return resetPolicyConfirm()" />
+					<input type="hidden" name="policy_lang" value="<?= Utils::$context['current_policy_lang'] ?>" />
+					<input type="hidden" name="sa" value="policy" />
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>" />
+					<input type="hidden" name="<?= Utils::$context['admin-regp_token_var'] ?>" value="<?= Utils::$context['admin-regp_token'] ?>" />
+					<script>
+						function resetPolicyConfirm()
+						{
+							return true;
+						}
+					</script>
+				</div>
+			</form>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/edit_reserved_words.php b/Themes/default/templates/Register/edit_reserved_words.php
new file mode 100644
index 00000000000..e16ae311ed7
--- /dev/null
+++ b/Themes/default/templates/Register/edit_reserved_words.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for editing reserved words.
+ */
+?><?php if (!empty(Utils::$context['saved_successful'])): ?>
+	<div class="infobox"><?= Lang::getTxt('settings_saved', file: 'Admin') ?></div><?php endif; ?>
+	<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=regcenter" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('admin_reserved_set', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+			<h4><?= Lang::getTxt('admin_reserved_line', file: 'Admin') ?></h4>
+			<textarea cols="30" rows="6" name="reserved" id="reserved"><?= implode("\n", Utils::$context['reserved_words']) ?></textarea>
+			<dl class="settings">
+				<dt>
+					<label for="matchword"><?= Lang::getTxt('admin_match_whole', file: 'Admin') ?></label>
+				</dt>
+				<dd>
+					<input type="checkbox" name="matchword" id="matchword"<?= Utils::$context['reserved_word_options']['match_word'] ? ' checked' : '' ?>>
+				</dd>
+				<dt>
+					<label for="matchcase"><?= Lang::getTxt('admin_match_case', file: 'Admin') ?></label>
+				</dt>
+				<dd>
+					<input type="checkbox" name="matchcase" id="matchcase"<?= Utils::$context['reserved_word_options']['match_case'] ? ' checked' : '' ?>>
+				</dd>
+				<dt>
+					<label for="matchuser"><?= Lang::getTxt('admin_check_user', file: 'Admin') ?></label>
+				</dt>
+				<dd>
+					<input type="checkbox" name="matchuser" id="matchuser"<?= Utils::$context['reserved_word_options']['match_user'] ? ' checked' : '' ?>>
+				</dd>
+				<dt>
+					<label for="matchname"><?= Lang::getTxt('admin_check_display', file: 'Admin') ?></label>
+				</dt>
+				<dd>
+					<input type="checkbox" name="matchname" id="matchname"<?= Utils::$context['reserved_word_options']['match_name'] ? ' checked' : '' ?>>
+				</dd>
+			</dl>
+			<div class="flow_auto">
+				<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" name="save_reserved_names" class="button">
+				<input type="hidden" name="sa" value="reservednames">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-regr_token_var'] ?>" value="<?= Utils::$context['admin-regr_token'] ?>">
+			</div>
+		</div><!-- .windowbg -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/index.php b/Themes/default/templates/Register/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Register/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Register/registration_agreement.php b/Themes/default/templates/Register/registration_agreement.php
new file mode 100644
index 00000000000..69dcb69d0b8
--- /dev/null
+++ b/Themes/default/templates/Register/registration_agreement.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Before showing users a registration form, show them the registration agreement.
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=signup" method="post" accept-charset="UTF-8" id="registration">
+<?php if (!empty(Utils::$context['agreement'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('registration_agreement', file: 'General') ?></h3>
+			</div>
+			<div class="roundframe">
+				<div><?= Utils::adjustHeadingLevels(Utils::$context['agreement'], 3) ?></div>
+			</div>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['privacy_policy'])): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('privacy_policy', file: 'General') ?></h3>
+			</div>
+			<div class="roundframe">
+				<div><?= Utils::adjustHeadingLevels(Utils::$context['privacy_policy'], 3) ?></div>
+			</div>
+<?php endif; ?>
+			<div id="confirm_buttons">
+<?php /* Age restriction in effect? */ ?>
+<?php if (Utils::$context['show_coppa']): ?>
+				<input type="submit" name="accept_agreement" value="<?= Utils::$context['coppa_agree_above'] ?>" class="button"><br>
+				<br>
+				<input type="submit" name="accept_agreement_coppa" value="<?= Utils::$context['coppa_agree_below'] ?>" class="button">
+<?php else: ?>
+				<input type="submit" name="accept_agreement" value="<?= Utils::$context['agree'] ?>" class="button" />
+<?php endif; ?>
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['register_token_var'] ?>" value="<?= Utils::$context['register_token'] ?>">
+				<input type="hidden" name="step" value="1">
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/registration_form.php b/Themes/default/templates/Register/registration_form.php
new file mode 100644
index 00000000000..1dc497bdac7
--- /dev/null
+++ b/Themes/default/templates/Register/registration_form.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Before registering - get their information.
+ */
+?>
+		<script>
+			function verifyAgree()
+			{
+				if (currentAuthMethod == 'passwd' && document.forms.registration.passwrd1.value != document.forms.registration.passwrd2.value)
+				{
+					alert("<?= Lang::getTxt('register_passwords_differ_js', file: 'Login') ?>");
+					return false;
+				}
+
+				return true;
+			}
+
+			var currentAuthMethod = 'passwd';
+		</script><?php /* Any errors? */ ?><?php if (!empty(Utils::$context['registration_errors'])): ?>
+		<div class="errorbox">
+			<span><?= Lang::getTxt('registration_errors_occurred', file: 'Login') ?></span>
+			<ul><?php /* Cycle through each error and display an error message. */ ?><?php foreach (Utils::$context['registration_errors'] as $error): ?>
+				<li><?= $error ?></li><?php endforeach; ?>
+			</ul>
+		</div><?php endif; ?>
+		<form action="<?= !empty(Config::$modSettings['force_ssl']) ? strtr(Config::$scripturl, ['http://' => 'https://']) : Config::$scripturl ?>?action=signup2" method="post" accept-charset="UTF-8" name="registration" id="registration" onsubmit="return verifyAgree();">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('registration_form', file: 'Login') ?></h3>
+			</div>
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Lang::getTxt('required_info', file: 'Login') ?></h3>
+			</div>
+			<div class="roundframe noup">
+				<fieldset>
+					<dl class="register_form">
+						<dt>
+							<strong><label for="reg_username"><?= Lang::getTxt('username', file: 'General') ?></label></strong>
+						</dt>
+						<dd>
+							<input type="text" name="user" id="reg_username" data-autov="username" size="50" maxlength="25" value="<?= Utils::$context['username'] ?? '' ?>">
+						</dd>
+						<dt><strong><label for="reg_email"><?= Lang::getTxt('user_email_address', file: 'General') ?></label></strong></dt>
+						<dd>
+							<input type="email" name="email" id="reg_email" data-autov="reserve1" size="50" value="<?= Utils::$context['email'] ?? '' ?>">
+						</dd>
+					</dl>
+					<dl class="register_form" id="password1_group">
+						<dt><strong><label for="reg_pwmain"><?= Lang::getTxt('choose_pass', file: 'General') ?></label></strong></dt>
+						<dd>
+							<input type="password" name="passwrd1" id="reg_pwmain" data-autov="pwmain" size="50">
+						</dd>
+					</dl>
+					<dl class="register_form" id="password2_group">
+						<dt>
+							<strong><label for="reg_pwverify"><?= Lang::getTxt('verify_pass', file: 'General') ?></label></strong>
+						</dt>
+						<dd>
+							<input type="password" name="passwrd2" id="reg_pwverify" data-autov="pwverify" size="50">
+						</dd>
+					</dl>
+					<dl class="register_form" id="notify_announcements">
+						<dt>
+							<strong><label for="notify_announcements"><?= Lang::getTxt('notify_announcements', file: 'General') ?></label></strong>
+						</dt>
+						<dd>
+							<input type="checkbox" name="notify_announcements" id="notify_announcements"<?= Utils::$context['notify_announcements'] ? ' checked="checked"' : '' ?>>
+						</dd>
+					</dl><?php /* If there is any field marked as required, show it here! */ ?><?php if (!empty(Utils::$context['custom_fields_required']) && !empty(Utils::$context['custom_fields'])): ?>
+					<dl class="register_form"><?php foreach (Utils::$context['custom_fields'] as $field): ?><?php if ($field['show_reg'] > 1): ?>
+						<dt>
+							<strong<?= !empty($field['is_error']) ? ' class="red"' : '' ?>><?= $field['name'] ?>:</strong>
+							<span class="smalltext"><?= $field['desc'] ?></span>
+						</dt>
+						<dd><?= $field['input_html'] ?></dd><?php endif; ?><?php endforeach; ?>
+					</dl><?php endif; ?>
+				</fieldset>
+			</div><!-- .roundframe --><?php /* If we have either of these, show the extra group. */ ?><?php if (!empty(Utils::$context['profile_fields']) || !empty(Utils::$context['custom_fields'])): ?>
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Lang::getTxt('additional_information', file: 'Login') ?></h3>
+			</div>
+			<div class="roundframe noup">
+				<fieldset>
+					<dl class="register_form" id="custom_group"><?php endif; ?><?php if (!empty(Utils::$context['profile_fields'])): ?><?php /* Any fields we particularly want? */ ?><?php foreach (Utils::$context['profile_fields'] as $key => $field): ?><?php if ($field['type'] == 'callback'): ?><?php if (isset($field['callback_func']) && $this->hasSubTemplate('profile_' . $field['callback_func'])): ?><?php $this->subTemplate('profile_' . $field['callback_func']); ?><?php endif; ?><?php else: ?>
+						<dt>
+							<strong<?= !empty($field['is_error']) ? ' class="red"' : '' ?>><?= $field['label'] ?>:</strong><?php /* Does it have any subtext to show? */ ?><?php if (!empty($field['subtext'])): ?>
+							<span class="smalltext"><?= $field['subtext'] ?></span><?php endif; ?>
+						</dt>
+						<dd><?php /* Want to put something infront of the box? */ ?><?php if (!empty($field['preinput'])): ?>
+							<?= $field['preinput'] ?><?php endif; ?><?php /* What type of data are we showing? */ ?><?php if ($field['type'] == 'label'): ?>
+							<?= $field['value'] ?><?php /* Maybe it's a text box - very likely! */ ?><?php elseif (in_array($field['type'], ['int', 'float', 'text', 'password', 'url'])): ?>
+							<input type="<?= $field['type'] == 'password' ? 'password' : 'text' ?>" name="<?= $key ?>" id="<?= $key ?>" size="<?= empty($field['size']) ? 30 : $field['size'] ?>" value="<?= $field['value'] ?>" <?= $field['input_attr'] ?>><?php /* You "checking" me out? ;) */ ?><?php elseif ($field['type'] == 'check'): ?>
+							<input type="hidden" name="<?= $key ?>" value="0"><input type="checkbox" name="<?= $key ?>" id="<?= $key ?>"<?= !empty($field['value']) ? ' checked' : '' ?> value="1" <?= $field['input_attr'] ?>><?php /* Always fun - select boxes! */ ?><?php elseif ($field['type'] == 'select'): ?>
+							<select name="<?= $key ?>" id="<?= $key ?>"><?php if (isset($field['options'])): ?><?php /* Is this some code to generate the options? */ ?><?php if (!is_array($field['options'])): ?><?php $field['options'] = eval($field['options']); ?><?php endif; ?><?php /* Assuming we now have some! */ ?><?php if (is_array($field['options'])): ?><?php foreach ($field['options'] as $value => $name): ?>
+								<option<?= (!empty($field['disabled_options']) && is_array($field['disabled_options']) && in_array($value, $field['disabled_options'], true) ? ' disabled' : '') ?> value="<?= $value ?>"<?= $value === $field['value'] ? ' selected' : '' ?>><?= $name ?></option><?php endforeach; ?><?php endif; ?><?php endif; ?>
+							</select><?php endif; ?><?php /* Something to end with? */ ?><?php if (!empty($field['postinput'])): ?>
+							<?= $field['postinput'] ?><?php endif; ?>
+						</dd><?php endif; ?><?php endforeach; ?><?php endif; ?><?php /* Are there any custom fields? */ ?><?php if (!empty(Utils::$context['custom_fields'])): ?><?php foreach (Utils::$context['custom_fields'] as $field): ?><?php if ($field['show_reg'] < 2): ?>
+						<dt>
+							<strong<?= !empty($field['is_error']) ? ' class="red"' : '' ?>><?= $field['name'] ?>:</strong>
+							<span class="smalltext"><?= $field['desc'] ?></span>
+						</dt>
+						<dd><?= $field['input_html'] ?></dd><?php endif; ?><?php endforeach; ?><?php endif; ?><?php /* If we have either of these, close the list like a proper gent. */ ?><?php if (!empty(Utils::$context['profile_fields']) || !empty(Utils::$context['custom_fields'])): ?>
+					</dl>
+				</fieldset>
+			</div><!-- .roundframe --><?php endif; ?><?php if (Utils::$context['visual_verification']): ?>
+			<div class="title_bar">
+				<h3 class="titlebg"><?= Lang::getTxt('verification', file: 'General') ?></h3>
+			</div>
+			<div class="roundframe noup">
+				<fieldset class="centertext">
+					<?php $this->subTemplate('control_verification', ['verify_id' => Utils::$context['visual_verification_id'], 'display_type' => 'all']); ?>
+				</fieldset>
+			</div><?php endif; ?>
+			<div id="confirm_buttons" class="flow_auto"><?php /* Age restriction in effect? */ ?><?php if (empty(Utils::$context['agree']) && Utils::$context['show_coppa']): ?>
+				<input type="submit" name="accept_agreement" value="<?= Utils::$context['coppa_agree_above'] ?>" class="button"><br>
+				<br>
+				<input type="submit" name="accept_agreement_coppa" value="<?= Utils::$context['coppa_agree_below'] ?>" class="button"><?php else: ?>
+				<input type="submit" name="regSubmit" value="<?= Lang::getTxt('register', file: 'General') ?>" class="button" onclick="this.disabled = true;form.submit();"><?php endif; ?>
+			</div>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			<input type="hidden" name="<?= Utils::$context['register_token_var'] ?>" value="<?= Utils::$context['register_token'] ?>">
+			<input type="hidden" name="step" value="2">
+		</form>
+		<script>
+			var regTextStrings = {
+				"username_valid": "<?= Lang::getTxt('registration_username_available', file: 'Login') ?>",
+				"username_invalid": "<?= Lang::getTxt('registration_username_unavailable', file: 'Login') ?>",
+				"username_check": "<?= Lang::getTxt('registration_username_check', file: 'Login') ?>",
+				"password_short": "<?= Lang::getTxt('registration_password_short', file: 'Login') ?>",
+				"password_reserved": "<?= Lang::getTxt('registration_password_reserved', file: 'Login') ?>",
+				"password_numbercase": "<?= Lang::getTxt('registration_password_numbercase', file: 'Login') ?>",
+				"password_no_match": "<?= Lang::getTxt('registration_password_no_match', file: 'Login') ?>",
+				"password_valid": "<?= Lang::getTxt('registration_password_valid', file: 'Login') ?>"
+			};
+			var verificationHandle = new smfRegister("registration", <?= empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'] ?>, regTextStrings);
+		</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Register/verification_sound.php b/Themes/default/templates/Register/verification_sound.php
new file mode 100644
index 00000000000..fe1344c7d8e
--- /dev/null
+++ b/Themes/default/templates/Register/verification_sound.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\BrowserDetector;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show a window containing the spoken verification code.
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Lang::getTxt('visual_verification_sound', file: 'General') ?></title>
+		<meta name="robots" content="noindex">
+		<?= Theme::template_css() ?>
+		<style><?php /* Just show the help text and a "close window" link. */ ?>
+		</style>
+	</head>
+	<body style="margin: 1ex;">
+		<div class="windowbg description" style="text-align: center;"><?php if (BrowserDetector::isBrowser('is_ie') || BrowserDetector::isBrowser('is_ie11')): ?>
+			<object classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95" type="audio/x-wav">
+				<param name="AutoStart" value="1">
+				<param name="FileName" value="<?= Utils::$context['verification_sound_href'] ?>">
+			</object><?php else: ?>
+			<audio src="<?= Utils::$context['verification_sound_href'] ?>" controls>
+				<object type="audio/x-wav" data="<?= Utils::$context['verification_sound_href'] ?>">
+					<a href="<?= Utils::$context['verification_sound_href'] ?>" rel="nofollow"><?= Utils::$context['verification_sound_href'] ?></a>
+				</object>
+			</audio><?php endif; ?>
+			<br>
+			<a href="<?= Utils::$context['verification_sound_href'] ?>;sound" rel="nofollow"><?= Lang::getTxt('visual_verification_sound_again', file: 'Login') ?></a><br>
+			<a href="<?= Utils::$context['verification_sound_href'] ?>" rel="nofollow"><?= Lang::getTxt('visual_verification_sound_direct', file: 'Login') ?></a><br><br>
+			<a href="javascript:self.close();"><?= Lang::getTxt('visual_verification_sound_close', file: 'Login') ?></a><br>
+		</div><!-- .description -->
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Reminder/ask.php b/Themes/default/templates/Reminder/ask.php
new file mode 100644
index 00000000000..22f0092685e
--- /dev/null
+++ b/Themes/default/templates/Reminder/ask.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page that asks a user to answer their secret question
+ */
+?>
+	<br>
+	<form action="<?= Config::$scripturl ?>?action=reminder;sa=secret2" method="post" accept-charset="UTF-8" name="creator" id="creator">
+		<div class="tborder login">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('authentication_reminder', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<p class="smalltext"><?= Lang::getTxt('enter_new_password', file: 'Profile') ?></p>
+				<dl>
+					<dt><?= Lang::getTxt('secret_question', file: 'Profile') ?></dt>
+					<dd><?= Utils::$context['secret_question'] ?></dd>
+					<dt><?= Lang::getTxt('secret_answer', file: 'Profile') ?></dt>
+					<dd><input type="text" name="secret_answer" size="22"></dd>
+					<dt><?= Lang::getTxt('choose_pass', file: 'General') ?></dt>
+					<dd>
+						<input type="password" name="passwrd1" data-autov="pwmain" size="22">
+					</dd>
+					<dt><?= Lang::getTxt('verify_pass', file: 'General') ?></dt>
+					<dd>
+						<input type="password" name="passwrd2" data-autov="pwverify" size="22">
+					</dd>
+				</dl>
+				<div class="auto_flow">
+					<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+					<input type="hidden" name="uid" value="<?= Utils::$context['remind_user'] ?>">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['remind-sai_token_var'] ?>" value="<?= Utils::$context['remind-sai_token'] ?>">
+				</div>
+			</div><!-- .roundframe -->
+		</div><!-- .login -->
+	</form>
+	<script>
+		var regTextStrings = {
+			"password_short": "<?= Lang::getTxt('registration_password_short', file: 'Login') ?>",
+			"password_reserved": "<?= Lang::getTxt('registration_password_reserved', file: 'Login') ?>",
+			"password_numbercase": "<?= Lang::getTxt('registration_password_numbercase', file: 'Login') ?>",
+			"password_no_match": "<?= Lang::getTxt('registration_password_no_match', file: 'Login') ?>",
+			"password_valid": "<?= Lang::getTxt('registration_password_valid', file: 'Login') ?>"
+		};
+		var verificationHandle = new smfRegister("creator", <?= empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'] ?>, regTextStrings);
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Reminder/index.php b/Themes/default/templates/Reminder/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Reminder/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Reminder/main.php b/Themes/default/templates/Reminder/main.php
new file mode 100644
index 00000000000..924c7a4d331
--- /dev/null
+++ b/Themes/default/templates/Reminder/main.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main "Here's how you can reset your password" page
+ */
+?>
+	<br>
+	<form action="<?= Config::$scripturl ?>?action=reminder;sa=picktype" method="post" accept-charset="UTF-8">
+		<div class="tborder login">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('authentication_reminder', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<p class="smalltext centertext"><?= Lang::getTxt('password_reminder_desc', file: 'Profile') ?></p>
+				<dl>
+					<dt><label for="user"><?= Lang::getTxt('user_email', file: 'Profile') ?></label></dt>
+					<dd><input type="text" name="user" id="user" size="30"></dd>
+				</dl>
+				<input type="submit" value="<?= Lang::getTxt('reminder_continue', file: 'Profile') ?>" class="button">
+				<br class="clear">
+			</div>
+		</div>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		<input type="hidden" name="<?= Utils::$context['remind_token_var'] ?>" value="<?= Utils::$context['remind_token'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Reminder/reminder_pick.php b/Themes/default/templates/Reminder/reminder_pick.php
new file mode 100644
index 00000000000..7f87c04114d
--- /dev/null
+++ b/Themes/default/templates/Reminder/reminder_pick.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page to pick an option - secret question/answer (if set) or email
+ */
+?>
+	<br>
+	<form action="<?= Config::$scripturl ?>?action=reminder;sa=picktype" method="post" accept-charset="UTF-8">
+		<div class="tborder login">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('authentication_reminder', file: 'Profile') ?></h3>
+			</div>
+			<div class="roundframe">
+				<p><strong><?= Lang::getTxt('authentication_options', file: 'Profile') ?></strong></p>
+				<p>
+					<input type="radio" name="reminder_type" id="reminder_type_email" value="email" checked></dt>
+					<label for="reminder_type_email"><?= Lang::getTxt('authentication_password_email', file: 'Profile') ?></label></dd>
+				</p>
+				<p>
+					<input type="radio" name="reminder_type" id="reminder_type_secret" value="secret">
+					<label for="reminder_type_secret"><?= Lang::getTxt('authentication_password_secret', file: 'Profile') ?></label>
+				</p>
+				<div class="flow_auto">
+					<input type="submit" value="<?= Lang::getTxt('reminder_continue', file: 'Profile') ?>" class="button">
+					<input type="hidden" name="uid" value="<?= Utils::$context['current_member']['id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+					<input type="hidden" name="<?= Utils::$context['remind_token_var'] ?>" value="<?= Utils::$context['remind_token'] ?>">
+				</div>
+			</div><!-- .roundframe -->
+		</div><!-- .login -->
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Reminder/sent.php b/Themes/default/templates/Reminder/sent.php
new file mode 100644
index 00000000000..41e3600e430
--- /dev/null
+++ b/Themes/default/templates/Reminder/sent.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Just a simple "We sent you an email. Click the link in it to continue." message
+ */
+?>
+		<br>
+		<div class="tborder login" id="reminder_sent">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<p class="information"><?= Utils::$context['description'] ?></p>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Reminder/set_password.php b/Themes/default/templates/Reminder/set_password.php
new file mode 100644
index 00000000000..b36edbcb62e
--- /dev/null
+++ b/Themes/default/templates/Reminder/set_password.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for setting the new password
+ */
+?>
+	<br>
+	<form action="<?= Config::$scripturl ?>?action=reminder;sa=setpassword2" name="reminder_form" id="reminder_form" method="post" accept-charset="UTF-8">
+		<div class="tborder login">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="roundframe">
+				<dl>
+					<dt><?= Lang::getTxt('choose_pass', file: 'General') ?></dt>
+					<dd>
+						<input type="password" name="passwrd1" data-autov="pwmain" size="22">
+					</dd>
+					<dt><?= Lang::getTxt('verify_pass', file: 'General') ?></dt>
+					<dd>
+						<input type="password" name="passwrd2" data-autov="pwverify" size="22">
+					</dd>
+				</dl>
+				<p class="align_center">
+					<input type="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+				</p>
+			</div><!-- .roundframe -->
+		</div><!-- .login -->
+		<input type="hidden" name="code" value="<?= Utils::$context['code'] ?>">
+		<input type="hidden" name="u" value="<?= Utils::$context['memID'] ?>">
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		<input type="hidden" name="<?= Utils::$context['remind-sp_token_var'] ?>" value="<?= Utils::$context['remind-sp_token'] ?>">
+	</form>
+	<script>
+		var regTextStrings = {
+			"password_short": "<?= Lang::getTxt('registration_password_short', file: 'Login') ?>",
+			"password_reserved": "<?= Lang::getTxt('registration_password_reserved', file: 'Login') ?>",
+			"password_numbercase": "<?= Lang::getTxt('registration_password_numbercase', file: 'Login') ?>",
+			"password_no_match": "<?= Lang::getTxt('registration_password_no_match', file: 'Login') ?>",
+			"password_valid": "<?= Lang::getTxt('registration_password_valid', file: 'Login') ?>"
+		};
+		var verificationHandle = new smfRegister("reminder_form", <?= empty(Config::$modSettings['password_strength']) ? 0 : Config::$modSettings['password_strength'] ?>, regTextStrings);
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/ReportToMod/index.php b/Themes/default/templates/ReportToMod/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ReportToMod/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ReportToMod/main.php b/Themes/default/templates/ReportToMod/main.php
new file mode 100644
index 00000000000..c27e6f23943
--- /dev/null
+++ b/Themes/default/templates/ReportToMod/main.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*	This template contains two humble sub templates - main. Its job is pretty
+	simple: it collects the information we need to actually send the topic.
+
+	The report sub template gets shown from:
+		'?action=reporttm;topic=##.##;msg=##'
+		'?action=reporttm;u=#'
+	It should submit to:
+		'?action=reporttm;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start']
+		'?action=reporttm;u=#'
+	It only needs to send the following fields:
+		comment: an additional comment to give the moderator.
+		sc: the session id, or Utils::$context['session_id'].
+*/
+/*
+ * The main "report this to the moderator" page
+ */
+?>
+
+<?php /* Want to see your master piece? */ ?>
+	<div id="preview_section"<?= isset(Utils::$context['preview_message']) ? '' : ' class="hidden"' ?>>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span><?= Lang::getTxt('preview', file: 'General') ?></span>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<div class="post" id="preview_body">
+				<?= empty(Utils::$context['preview_message']) ? '<br>' : Utils::$context['preview_message'] ?>
+			</div>
+		</div>
+	</div>
+	<div id="report_form">
+		<form action="<?= Utils::$context['submit_url'] ?>" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="<?= Utils::$context['report_type'] ?>" value="<?= Utils::$context['reported_item'] ?>">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+			</div>
+			<div class="windowbg">
+<?php if (!empty(Utils::$context['post_errors'])): ?>
+				<div id="error_box" class="errorbox">
+					<ul id="error_list">
+<?php foreach (Utils::$context['post_errors'] as $key => $error): ?>
+						<li id="error_<?= $key ?>" class="error"><?= $error ?></li>
+<?php endforeach; ?>
+					</ul>
+<?php else: ?>
+				<div id="error_box" class="errorbox hidden">
+<?php endif; ?>
+				</div>
+				<p class="noticebox"><?= Utils::$context['notice'] ?></p>
+				<dl class="settings" id="report_post">
+					<dt>
+						<label for="report_comment"><?= Lang::getTxt('enter_comment', file: 'Post') ?></label>
+					</dt>
+					<dd>
+						<textarea type="text" id="report_comment" name="comment" maxlength="254"><?= Utils::$context['comment_body'] ?></textarea>
+					</dd>
+				</dl>
+				<input type="submit" name="preview" value="<?= Lang::getTxt('preview', file: 'General') ?>" class="button">
+				<input type="submit" name="save" value="<?= Lang::getTxt('report_submit', file: 'Post') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #report_form -->
\ No newline at end of file
diff --git a/Themes/default/templates/ReportedContent/edit_comment.php b/Themes/default/templates/ReportedContent/edit_comment.php
new file mode 100644
index 00000000000..1c7a8302544
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/edit_comment.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for editing a mod comment.
+ */
+?>
+	<div id="modcenter">
+		<form action="<?= Config::$scripturl ?>?action=moderate;area=reported<?= Utils::$context['report_type'] ?>;sa=editcomment;mid=<?= Utils::$context['comment_id'] ?>;rid=<?= Utils::$context['report_id'] ?>;save" method="post" accept-charset="UTF-8">
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_modreport_edit_mod_comment', file: 'ModerationCenter') ?></h3>
+			</div>
+			<div class="windowbg">
+				<textarea rows="6" cols="60" style="width: 60%;" name="mod_comment"><?= Utils::$context['comment']['body'] ?></textarea>
+				<div>
+					<input type="submit" name="edit_comment" value="<?= Lang::getTxt('mc_modreport_edit_mod_comment', file: 'ModerationCenter') ?>" class="button">
+				</div>
+			</div>
+			<br>
+			<input type="hidden" name="<?= Utils::$context['mod-reportC-edit_token_var'] ?>" value="<?= Utils::$context['mod-reportC-edit_token'] ?>">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ReportedContent/index.php b/Themes/default/templates/ReportedContent/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/ReportedContent/reported_members.php b/Themes/default/templates/ReportedContent/reported_members.php
new file mode 100644
index 00000000000..98ed4eaec9a
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/reported_members.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Lists all reported members
+ */
+?><?php /* Let them know the action was a success. */ ?><?php if (!empty(Utils::$context['report_post_action']) && Lang::txtExists('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter')): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter') ?>
+	</div><?php endif; ?>
+	<form id="reported_members" action="<?= Config::$scripturl ?>?action=moderate;area=reportedmembers;sa=show<?= Utils::$context['view_closed'] ? ';closed' : '' ?>;start=<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8">
+		<div class="cat_bar cat_bar_round">
+			<h3 class="catbg">
+				<?= Lang::getTxt(Utils::$context['view_closed'] ? 'mc_reportedp_closed' : 'mc_reportedp_active', file: 'ModerationCenter') ?>
+			</h3>
+		</div>
+		<div class="pagesection"><?php if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+			<ul class="buttonlist floatright">
+				<li class="inline_mod_check">
+					<input type="checkbox" onclick="invertAll(this, this.form, 'close[]');">
+				</li>
+			</ul><?php endif; ?>
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php foreach (Utils::$context['reports'] as $report): ?>
+		<div class="generic_list_wrapper windowbg">
+			<h5>
+				<strong><a href="<?= $report['user']['href'] ?>"><?= $report['user']['name'] ?></a></strong>
+			</h5>
+			<div class="smalltext">
+				<?= Lang::getTxt('mc_reportedp_last_reported', ['date' => $report['last_updated']], file: 'ModerationCenter') ?><br><?php
+// Prepare the comments...
+$comments = [];
+?><?php foreach ($report['comments'] as $comment): ?><?php $comments[$comment['member']['id']] = $comment['member']['link']; ?><?php endforeach; ?>
+				<?= Lang::getTxt('mc_reportedp_reported_by', ['list' => Lang::sentenceList($comments)], file: 'ModerationCenter') ?>
+			</div>
+			<hr>
+			<?php $this->subTemplate('quickbuttons', ['list_items' => $report['quickbuttons'], 'list_class' => 'reported_members']); ?>
+		</div><!-- .generic_list_wrapper --><?php endforeach; ?><?php /* Were none found? */ ?><?php if (empty(Utils::$context['reports'])): ?>
+		<div class="windowbg">
+			<div class="centertext"><?= Lang::getTxt('mc_reportedp_none_found', file: 'ModerationCenter') ?></div>
+		</div><?php endif; ?>
+		<div class="pagesection">
+			<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div>
+			<div class="floatright">
+				<?= (!Utils::$context['view_closed'] && !empty(Utils::$context['reports'])) ? '<input type="submit" name="close_selected" value="' . Lang::getTxt('mc_reportedp_close_selected', file: 'ModerationCenter') . '" class="button">' : '' ?>
+			</div>
+		</div>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ReportedContent/reported_posts.php b/Themes/default/templates/ReportedContent/reported_posts.php
new file mode 100644
index 00000000000..8c5d45f36b6
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/reported_posts.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Displays all reported posts.
+ */
+?><?php /* Let them know the action was a success. */ ?><?php if (!empty(Utils::$context['report_post_action'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter') ?>
+	</div><?php endif; ?>
+	<form id="reported_posts" action="<?= Config::$scripturl ?>?action=moderate;area=reportedposts;sa=show<?= Utils::$context['view_closed'] ? ';closed' : '' ?>;start=<?= Utils::$context['start'] ?>" method="post" accept-charset="UTF-8">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt(Utils::$context['view_closed'] ? 'mc_reportedp_closed' : 'mc_reportedp_active', file: 'ModerationCenter') ?>
+			</h3>
+		</div>
+		<div class="pagesection"><?php if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+			<ul class="buttonlist floatright">
+				<li class="inline_mod_check">
+					<input type="checkbox" onclick="invertAll(this, this.form, 'close[]');">
+				</li>
+			</ul><?php endif; ?>
+			<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div>
+		</div><?php foreach (Utils::$context['reports'] as $report): ?>
+		<div class="windowbg">
+			<h5>
+				<?= !empty($report['topic']['board_name']) ? '<a href="' . Config::$scripturl . '?board=' . $report['topic']['id_board'] . '.0">' . $report['topic']['board_name'] . '</a>' : '??' ?> / <?= Lang::getTxt('mc_reportedp_subject_author', ['subject' => '<a href="' . $report['topic']['href'] . '">' . $report['subject'] . '</a>', 'author' => $report['author']['link']], file: 'ModerationCenter') ?>
+			</h5>
+			<div class="smalltext">
+				<?= Lang::getTxt('mc_reportedp_last_reported', ['date' => $report['last_updated']], file: 'ModerationCenter') ?><br><?php
+// Prepare the comments...
+$comments = [];
+?><?php foreach ($report['comments'] as $comment): ?><?php $comments[$comment['member']['id']] = $comment['member']['link']; ?><?php endforeach; ?>
+				<?= Lang::getTxt('mc_reportedp_reported_by', ['list' => Lang::sentenceList($comments)], file: 'ModerationCenter') ?>
+			</div>
+			<hr>
+			<?= Utils::adjustHeadingLevels($report['body'], 5) ?>
+			<br><?php /* Reported post options */ ?><?php $this->subTemplate('quickbuttons', ['list_items' => $report['quickbuttons'], 'list_class' => 'reported_posts']); ?>
+		</div><!-- .windowbg --><?php endforeach; ?><?php /* Were none found? */ ?><?php if (empty(Utils::$context['reports'])): ?>
+		<div class="windowbg">
+			<div class="centertext"><?= Lang::getTxt('mc_reportedp_none_found', file: 'ModerationCenter') ?></div>
+		</div><?php endif; ?>
+		<div class="pagesection">
+			<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div><?php if (!empty(Utils::$context['reports']) && !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1): ?>
+			<div class="floatright">
+				<input type="hidden" name="<?= Utils::$context['mod-report-close-all_token_var'] ?>" value="<?= Utils::$context['mod-report-close-all_token'] ?>">
+				<input type="submit" name="close_selected" value="<?= Lang::getTxt('mc_reportedp_close_selected', file: 'ModerationCenter') ?>" class="button">
+			</div><?php endif; ?>
+		</div>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/ReportedContent/viewmemberreport.php b/Themes/default/templates/ReportedContent/viewmemberreport.php
new file mode 100644
index 00000000000..01acc56b7a6
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/viewmemberreport.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for viewing and managing a specific report about a user's profile
+ */
+?><?php /* Let them know the action was a success. */ ?><?php if (!empty(Utils::$context['report_post_action'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter') ?>
+	</div><?php endif; ?>
+	<div id="modcenter">
+		<form action="<?= Config::$scripturl ?>?action=moderate;area=reportedmembers;sa=handlecomment;rid=<?= Utils::$context['report']['id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('mc_viewmemberreport', ['member' => Utils::$context['report']['user']['link']], file: 'ModerationCenter') ?>
+				</h3>
+			</div>
+			<div class="title_bar">
+				<h3 class="titlebg">
+					<span class="floatleft">
+						<?= Lang::getTxt('mc_memberreport_summary', [Utils::$context['report']['num_reports'], Utils::$context['report']['last_updated']], file: 'ModerationCenter') ?>
+					</span><?php
+$report_buttons = [
+	'ignore' => [
+		'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
+		'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
+		'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
+		'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::getTxt('mc_reportedp_ignore_confirm', file: 'ModerationCenter') . '"' : '',
+		'icon' => 'ignore',
+	],
+	'close' => [
+		'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
+		'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
+		'icon' => 'close',
+	],
+];
+// Report buttons
+?><?php $this->subTemplate('button_strip', ['button_strip' => $report_buttons, 'direction' => 'right']); ?>
+				</h3>
+			</div>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_memberreport_whoreported_title', file: 'ModerationCenter') ?></h3>
+			</div><?php foreach (Utils::$context['report']['comments'] as $comment): ?>
+			<div class="windowbg">
+				<div class="smalltext">
+					<?= Lang::getTxt(
+			'mc_modreport_whoreported_data',
+			[
+				'member_link' => $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''),
+				'datetime' => $comment['time'],
+			],
+			file: 'ModerationCenter',
+		) ?>
+				</div>
+				<div><?= Utils::adjustHeadingLevels($comment['message'], null) ?></div>
+			</div><?php endforeach; ?>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_modreport_mod_comments', file: 'ModerationCenter') ?></h3>
+			</div>
+			<div><?php if (empty(Utils::$context['report']['mod_comments'])): ?>
+				<div class="information">
+					<div class="centertext"><?= Lang::getTxt('mc_modreport_no_mod_comment', file: 'ModerationCenter') ?></div>
+				</div><?php endif; ?><?php foreach (Utils::$context['report']['mod_comments'] as $comment): ?>
+				<div class="title_bar">
+					<h3 class="titlebg"><?= $comment['member']['link'] ?>:  <em class="smalltext">(<?= $comment['time'] ?>)</em><?= ($comment['can_edit'] ? '<span class="floatright"><a href="' . Config::$scripturl . '?action=moderate;area=reportedmembers;sa=editcomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_edit', file: 'ModerationCenter') . '</a> <a href="' . Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handlecomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';delete;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-reportC-delete_token_var'] . '=' . Utils::$context['mod-reportC-delete_token'] . '"  class="button you_sure" data-confirm="' . Lang::getTxt('mc_reportedp_delete_confirm', file: 'ModerationCenter') . '">' . Lang::getTxt('mc_reportedp_comment_delete', file: 'ModerationCenter') . '</a></span>' : '') ?></h3>
+				</div>
+				<div class="windowbg">
+					<div><?= Utils::adjustHeadingLevels($comment['message'], null) ?></div>
+				</div><?php endforeach; ?>
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<span class="floatleft">
+							<?= Lang::getTxt('mc_reportedp_new_comment', file: 'ModerationCenter') ?>
+						</span>
+					</h3>
+				</div>
+				<textarea rows="2" cols="60" style="width: 60%;" name="mod_comment"></textarea>
+				<div class="padding">
+					<input type="submit" name="add_comment" value="<?= Lang::getTxt('mc_modreport_add_mod_comment', file: 'ModerationCenter') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['mod-reportC-add_token_var'] ?>" value="<?= Utils::$context['mod-reportC-add_token'] ?>">
+				</div>
+			</div>
+			<br><?php $this->subTemplate('show_list', ['list_id' => 'moderation_actions_list']); ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/ReportedContent/viewmodreport.php b/Themes/default/templates/ReportedContent/viewmodreport.php
new file mode 100644
index 00000000000..5cf475b04e7
--- /dev/null
+++ b/Themes/default/templates/ReportedContent/viewmodreport.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Handles viewing details of and managing a specific report
+ */
+?><?php /* Let them know the action was a success. */ ?><?php if (!empty(Utils::$context['report_post_action'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('report_action_' . Utils::$context['report_post_action'], file: 'ModerationCenter') ?>
+	</div><?php endif; ?>
+	<div id="modcenter">
+		<form action="<?= Config::$scripturl ?>?action=moderate;area=reportedposts;sa=handlecomment;rid=<?= Utils::$context['report']['id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('mc_viewmodreport', ['message_link' => Utils::$context['report']['message_link'], 'author_link' => Utils::$context['report']['author']['link']], file: 'ModerationCenter') ?>
+				</h3>
+			</div>
+			<div class="title_bar">
+				<h3 class="titlebg">
+					<span class="floatleft">
+						<?= Lang::getTxt('mc_modreport_summary', [Utils::$context['report']['num_reports'], Utils::$context['report']['last_updated']], file: 'ModerationCenter') ?>
+					</span><?php
+$report_buttons = [
+	'ignore' => [
+		'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
+		'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
+		'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
+		'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::getTxt('mc_reportedp_ignore_confirm', file: 'ModerationCenter') . '"' : '',
+		'icon' => 'ignore',
+	],
+	'close' => [
+		'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
+		'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
+		'icon' => 'close',
+	],
+];
+// Report buttons
+?><?php $this->subTemplate('button_strip', ['button_strip' => $report_buttons, 'direction' => 'right']); ?>
+				</h3>
+			</div><!-- .title_bar -->
+			<div class="windowbg">
+				<?= Utils::adjustHeadingLevels(Utils::$context['report']['body'], 3) ?>
+			</div>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_modreport_whoreported_title', file: 'ModerationCenter') ?></h3>
+			</div><?php foreach (Utils::$context['report']['comments'] as $comment): ?>
+			<div class="windowbg">
+				<div class="smalltext">
+					<?= Lang::getTxt(
+			'mc_modreport_whoreported_data',
+			[
+				'member_link' => $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''),
+				'datetime' => $comment['time'],
+			],
+			file: 'ModerationCenter',
+		) ?>
+				</div>
+				<div><?= Utils::adjustHeadingLevels($comment['message'], null) ?></div>
+			</div><?php endforeach; ?>
+			<br>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('mc_modreport_mod_comments', file: 'ModerationCenter') ?></h3>
+			</div>
+			<div><?php if (empty(Utils::$context['report']['mod_comments'])): ?>
+				<div class="information">
+					<div class="centertext"><?= Lang::getTxt('mc_modreport_no_mod_comment', file: 'ModerationCenter') ?></div>
+				</div><?php endif; ?><?php foreach (Utils::$context['report']['mod_comments'] as $comment): ?>
+				<div class="title_bar">
+					<h3 class="titlebg">
+						<?= $comment['member']['link'] ?>:  <em class="smalltext">(<?= $comment['time'] ?>)</em><?= ($comment['can_edit'] ? '<span class="floatright"><a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=editcomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_edit', file: 'ModerationCenter') . '</a><a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=handlecomment;rid=' . Utils::$context['report']['id'] . ';mid=' . $comment['id'] . ';delete;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-reportC-delete_token_var'] . '=' . Utils::$context['mod-reportC-delete_token'] . '"  class="button">' . Lang::getTxt('mc_reportedp_comment_delete', file: 'ModerationCenter') . '</a></span>' : '') ?>
+					</h3>
+				</div>
+				<div class="windowbg">
+					<div><?= Utils::adjustHeadingLevels($comment['message'], null) ?></div>
+				</div><?php endforeach; ?>
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<span class="floatleft">
+							<?= Lang::getTxt('mc_reportedp_new_comment', file: 'ModerationCenter') ?>
+						</span>
+					</h3>
+				</div>
+				<textarea rows="2" cols="60" style="width: 60%;" name="mod_comment"></textarea>
+				<div class="padding">
+					<input type="submit" name="add_comment" value="<?= Lang::getTxt('mc_modreport_add_mod_comment', file: 'ModerationCenter') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['mod-reportC-add_token_var'] ?>" value="<?= Utils::$context['mod-reportC-add_token'] ?>">
+				</div>
+			</div>
+			<br><?php $this->subTemplate('show_list', ['list_id' => 'moderation_actions_list']); ?>
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
+	</div><!-- #modcenter -->
\ No newline at end of file
diff --git a/Themes/default/templates/Reports/index.php b/Themes/default/templates/Reports/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Reports/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Reports/main.php b/Themes/default/templates/Reports/main.php
new file mode 100644
index 00000000000..2a6102e1df5
--- /dev/null
+++ b/Themes/default/templates/Reports/main.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This is the standard template for showing reports.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('results', file: 'Reports') ?></h3>
+		</div>
+		<div id="report_buttons"><?php if (!empty(Utils::$context['report_buttons'])): ?><?php $this->subTemplate('button_strip', ['button_strip' => Utils::$context['report_buttons'], 'direction' => 'right']); ?><?php endif; ?>
+		</div><?php if (count(Utils::$context['tables']) > 1): ?>
+		<style><?php foreach (Utils::$context['tables'] as $i => $table): ?>
+			body:has(#report_check_<?= $i + 1 ?>:not(:checked)) [data-id=report_<?= $i + 1 ?>] {
+				display: none;
+			}<?php endforeach; ?>
+		</style>
+		<form class="windowbg clear" id="report_filter">
+			<fieldset><?php foreach (Utils::$context['tables'] as $i => $table): ?><?php if (!empty($table['title'])): ?>
+			<label>
+				<input type="checkbox" id="report_check_<?= $i + 1 ?>" checked>
+				<?= $table['title'] ?>
+			</label><?php endif; ?><?php endforeach; ?>
+			</fieldset>
+		</form><?php endif; ?><?php foreach (Utils::$context['tables'] as $i => $table): ?>
+		<table class="table_grid report_result" data-id="report_<?= $i + 1 ?>"><?php if (!empty($table['title'])): ?>
+			<thead>
+				<tr class="title_bar">
+					<th scope="col" colspan="<?= $table['column_count'] ?>"><?= $table['title'] ?></th>
+				</tr>
+			</thead>
+			<tbody><?php endif; ?><?php
+// Now do each row!
+$row_number = 0;
+?><?php foreach ($table['data'] as $row): ?><?php if ($row_number == 0 && !empty($table['shading']['top']) && empty(current($row)['header'])): ?>
+				<tr class="windowbg table_caption"><?php else: ?>
+				<tr class="<?= !empty(current($row)['separator']) || !empty(current($row)['header']) ? 'title_bar' : 'windowbg' ?>"><?php endif; ?><?php
+// Now do each column.
+$column_number = 0;
+$th = false;
+?><?php foreach ($row as $data): ?><?php /* If this is a special separator, skip over! */ ?><?php if (!empty($data['separator']) && $column_number == 0): ?>
+					<th colspan="<?= $table['column_count'] ?>" class="smalltext">
+						<?= $data['v'] ?>:
+					</th><?php break; ?><?php endif; ?><?php /* These table cells shall be a heading if the first row says so. */ ?><?php if ($th || !empty($data['header'])): ?>
+					<th>
+						<?= $data['v'] ?>
+					</th><?php
+$th = true;
+// Shaded?
+?><?php elseif ($column_number == 0 && !empty($table['shading']['left'])): ?>
+					<td class="table_caption <?= $table['align']['shaded'] ?>text"<?= $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '' ?>>
+						<?= $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')) ?>
+					</td><?php else: ?>
+					<td class="smalltext <?= $table['align']['normal'] ?>text" <?= $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '' ?><?= !empty($data['style']) ? ' style="' . $data['style'] . '"' : '' ?>>
+						<?= $data['v'] ?>
+					</td><?php endif; ?><?php $column_number++; ?><?php endforeach; ?>
+				</tr><?php $row_number++; ?><?php endforeach; ?>
+			</tbody>
+		</table><?php endforeach; ?>
diff --git a/Themes/default/templates/Reports/print.php b/Themes/default/templates/Reports/print.php
new file mode 100644
index 00000000000..26925a8f967
--- /dev/null
+++ b/Themes/default/templates/Reports/print.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main print page
+ */
+?><?php /* Go through each table! */ ?><?php foreach (Utils::$context['tables'] as $table): ?>
+		<div style="overflow: visible;<?= $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '' ?>">
+			<table class="bordercolor"><?php if (!empty($table['title'])): ?>
+				<tr class="title_bar">
+					<td colspan="<?= $table['column_count'] ?>">
+						<?= $table['title'] ?>
+					</td>
+				</tr><?php endif; ?><?php
+// Now do each row!
+$row_number = 0;
+?><?php foreach ($table['data'] as $row): ?><?php if ($row_number == 0 && !empty($table['shading']['top'])): ?>
+				<tr class="titlebg"><?php else: ?>
+				<tr class="windowbg"><?php endif; ?><?php
+// Now do each column!!
+$column_number = 0;
+?><?php foreach ($row as $data): ?><?php /* If this is a special separator, skip over! */ ?><?php if (!empty($data['separator']) && $column_number == 0): ?>
+					<td colspan="<?= $table['column_count'] ?>" class="smalltext">
+						<strong><?= $data['v'] ?>:</strong>
+					</td><?php break; ?><?php endif; ?><?php /* Shaded? */ ?><?php if ($column_number == 0 && !empty($table['shading']['left'])): ?>
+					<td class="titlebg <?= $table['align']['shaded'] ?>text"<?= $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '' ?>>
+						<?= $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')) ?>
+					</td><?php else: ?>
+					<td class="centertext" <?= $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '' ?><?= !empty($data['style']) ? ' style="' . $data['style'] . '"' : '' ?>>
+						<?= $data['v'] ?>
+					</td><?php endif; ?><?php $column_number++; ?><?php endforeach; ?>
+				</tr><?php $row_number++; ?><?php endforeach; ?>
+			</table>
+		</div>
+		<br><?php endforeach; ?>
diff --git a/Themes/default/templates/Reports/print_above.php b/Themes/default/templates/Reports/print_above.php
new file mode 100644
index 00000000000..e3ef4fd4189
--- /dev/null
+++ b/Themes/default/templates/Reports/print_above.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Header of the print page!
+ */
+?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?>>
+	<head>
+		<meta charset="UTF-8">
+		<title><?= Utils::$context['page_title'] ?></title>
+		<link rel="stylesheet" href="<?= Theme::$current->settings['default_theme_url'] ?>/css/report.css<?= Utils::$context['browser_cache'] ?>">
+		<script src="<?= Theme::$current->settings['default_theme_url'] ?>/scripts/reports.js<?= Utils::$context['browser_cache'] ?>"></script>
+	</head>
+	<body>
\ No newline at end of file
diff --git a/Themes/default/templates/Reports/print_below.php b/Themes/default/templates/Reports/print_below.php
new file mode 100644
index 00000000000..1f16ce5e790
--- /dev/null
+++ b/Themes/default/templates/Reports/print_below.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Footer of the print page.
+ */
+?>
+		<div class="copyright"><?= Theme::copyright() ?></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/Reports/report_type.php b/Themes/default/templates/Reports/report_type.php
new file mode 100644
index 00000000000..c038bdf964f
--- /dev/null
+++ b/Themes/default/templates/Reports/report_type.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Choose which type of report to run?
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('generate_reports_type', file: 'Reports') ?></h3>
+		</div>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=reports" method="post" accept-charset="UTF-8" class="windowbg option_form">
+<?php /* Go through each type of report they can run. */ ?>
+<?php foreach (Utils::$context['report_types'] as $type): ?>
+			<label>
+				<input type="radio" name="rt" value="<?= $type['id'] ?>"<?= $type['is_first'] ? ' checked' : '' ?>>
+				<strong><?= $type['title'] ?></strong>
+<?php if (isset($type['description'])): ?>
+				<p><?= $type['description'] ?></p>
+<?php endif; ?>
+			</label>
+<?php endforeach; ?>
+			<input type="submit" name="continue" value="<?= Lang::getTxt('generate_reports_continue', file: 'Reports') ?>" class="button">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Search/index.php b/Themes/default/templates/Search/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Search/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Search/main.php b/Themes/default/templates/Search/main.php
new file mode 100644
index 00000000000..5da5c0a39a6
--- /dev/null
+++ b/Themes/default/templates/Search/main.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main search form
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=search2" method="post" accept-charset="UTF-8" name="searchform" id="searchform">
+<?php if (!empty(Utils::$context['search_errors'])): ?>
+		<div class="errorbox">
+			<?= implode('<br>', Utils::$context['search_errors']['messages']) ?>
+		</div>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['search_ignored'])): ?>
+		<div class="noticebox">
+			<?= Lang::getTxt(
+			'search_warning_ignored',
+			[
+				'number_of_terms' => count(Utils::$context['search_ignored']),
+				'list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['search_ignored']),
+			],
+			file: 'Search',
+		) ?>
+		</div>
+<?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons filter"></span><?= Lang::getTxt('set_parameters', file: 'Search') ?>
+			</h3>
+		</div>
+		<div id="advanced_search" class="roundframe">
+			<dl class="settings" id="search_options">
+				<dt>
+					<strong><label for="searchfor"><?= Lang::getTxt('search_for', file: 'General') ?></label></strong>
+				</dt>
+				<dd>
+					<input type="search" name="search" id="searchfor" <?= !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '' ?> maxlength="<?= Utils::$context['search_string_limit'] ?>" size="40">
+<?php if (empty(Config::$modSettings['search_simple_fulltext'])): ?>
+					<br><em class="smalltext"><?= Lang::getTxt('search_example', file: 'Search') ?></em>
+<?php endif; ?>
+				</dd>
+
+				<dt>
+					<label for="searchtype"><?= Lang::getTxt('search_match', file: 'General') ?></label>
+				</dt>
+				<dd>
+					<select name="searchtype" id="searchtype">
+						<option value="1"<?= empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '' ?>><?= Lang::getTxt('all_words', file: 'Search') ?></option>
+						<option value="2"<?= !empty(Utils::$context['search_params']['searchtype']) ? ' selected' : '' ?>><?= Lang::getTxt('any_words', file: 'Search') ?></option>
+					</select>
+				</dd>
+				<dt>
+					<label for="userspec"><?= Lang::getTxt('by_user', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<input id="userspec" type="text" name="userspec" value="<?= empty(Utils::$context['search_params']['userspec']) ? '*' : Utils::$context['search_params']['userspec'] ?>" size="40">
+				</dd>
+				<dt>
+					<label for="sort"><?= Lang::getTxt('search_order', file: 'Search') ?></label>
+				</dt>
+				<dd>
+					<select id="sort" name="sort">
+						<option value="relevance|desc"><?= Lang::getTxt('search_orderby_relevant_first', file: 'Search') ?></option>
+						<option value="num_replies|desc"><?= Lang::getTxt('search_orderby_large_first', file: 'Search') ?></option>
+						<option value="num_replies|asc"><?= Lang::getTxt('search_orderby_small_first', file: 'Search') ?></option>
+						<option value="id_msg|desc"><?= Lang::getTxt('search_orderby_recent_first', file: 'Search') ?></option>
+						<option value="id_msg|asc"><?= Lang::getTxt('search_orderby_old_first', file: 'Search') ?></option>
+					</select>
+				</dd>
+				<dt class="righttext options"><?= Lang::getTxt('search_options', file: 'Search') ?>
+				</dt>
+				<dd class="options">
+					<ul>
+<?php foreach (Utils::$context['search_options'] as $option): ?>
+						<li>
+							<label>
+								<?= $option['html'] ?>
+								<span><?= Lang::getTxt($option['label'], file: 'Search') ?></span>
+							</label>
+						</li>
+<?php endforeach; ?>
+					</ul>
+				</dd>
+				<dt class="between"><?= Lang::getTxt('search_post_age', file: 'Search') ?>
+				</dt>
+				<dd>
+					<?= Lang::getTxt(
+						'search_age_range',
+						[
+							'min' => '<input type="number" name="minage" id="minage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['minage']) ? '0' : Utils::$context['search_params']['minage']) . '">',
+							'max' => '<input type="number" name="maxage" id="maxage" min="0" max="9999" value="' . (empty(Utils::$context['search_params']['maxage']) ? '9999' : Utils::$context['search_params']['maxage']) . '">',
+						],
+						file: 'Search',
+					) ?>
+				</dd>
+			</dl>
+			<script>
+				window.addEventListener("load", initSearch, false);
+			</script>
+			<input type="hidden" name="advanced" value="1">
+<?php /* Require an image to be typed to save spamming? */ ?>
+<?php if (Utils::$context['require_verification']): ?>
+			<p>
+				<strong><?= Lang::getTxt('verification', file: 'General') ?></strong>
+				<?php $this->subTemplate('control_verification', ['verify_id' => Utils::$context['visual_verification_id'], 'display_type' => 'all']); ?>
+			</p>
+<?php endif; ?>
+<?php /* If Utils::$context['search_params']['topic'] is set, that means we're searching just one topic. */ ?>
+<?php if (!empty(Utils::$context['search_params']['topic'])): ?>
+			<p>
+				<?= Lang::getTxt('search_specific_topic', ['topic' => Utils::$context['search_topic']['link']], file: 'Search') ?>
+			</p>
+			<input type="hidden" name="topic" value="<?= Utils::$context['search_topic']['id'] ?>">
+			<input type="submit" name="b_search" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button">
+<?php endif; ?>
+		</div>
+<?php if (empty(Utils::$context['search_params']['topic'])): ?>
+		<fieldset class="flow_hidden">
+			<div class="roundframe alt">
+				<details id="advanced_panel"<?= !empty(Utils::$context['boards_check_all']) ? '' : ' open' ?>>
+					<summary class="title_bar titlebg"><?= Lang::getTxt('choose_board', file: 'Search') ?></summary>
+					<div class="flow_auto boardslist">
+						<ul>
+<?php foreach (Utils::$context['categories'] as $category): ?>
+						<li>
+							<a href="javascript:void(0);" onclick="selectBoards([<?= !empty($category['child_ids']) ? implode(', ', $category['child_ids']) : '' ?>], 'searchform'); return false;"><?= $category['name'] ?></a>
+							<ul>
+<?php $cat_boards = array_values($category['children']); ?>
+<?php foreach ($cat_boards as $key => $board): ?>
+								<li>
+									<label for="brd<?= $board['id'] ?>">
+										<input type="checkbox" id="brd<?= $board['id'] ?>" name="brd[<?= $board['id'] ?>]" value="<?= $board['id'] ?>"<?= $board['selected'] ? ' checked' : '' ?>>
+										<?= $board['name'] ?>
+									</label>
+<?php
+// Nest child boards inside another list.
+$curr_child_level = $board['child_level'];
+$next_child_level = $cat_boards[$key + 1]['child_level'] ?? 0;
+?>
+<?php if ($next_child_level > $curr_child_level): ?>
+									<ul style="margin-inline-start: 2.5ch;">
+<?php else: ?>
+<?php
+// Close child board lists until we reach a common level
+// with the next board.
+?>
+<?php while ($next_child_level < $curr_child_level--): ?>
+										</li>
+									</ul>
+<?php endwhile; ?>
+								</li>
+<?php endif; ?>
+<?php endforeach; ?>
+							</ul>
+						</li>
+<?php endforeach; ?>
+						</ul>
+					</div>
+				</details>
+				<br class="clear">
+				<div class="padding">
+					<input type="checkbox" name="all" id="check_all" value=""<?= !empty(Utils::$context['boards_check_all']) ? ' checked' : '' ?> onclick="invertAll(this, this.form, 'brd');">
+					<label for="check_all"><em><?= Lang::getTxt('check_all', file: 'General') ?></em></label>
+					<input type="submit" name="b_search" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button floatright">
+				</div>
+			</div><!-- .roundframe -->
+		</fieldset>
+<?php endif; ?>
+	</form>
+	<script>
+		var oAddMemberSuggest = new smc_AutoSuggest({
+			sSessionId: smf_session_id,
+			sSessionVar: smf_session_var,
+			sControlId: 'userspec',
+			sSearchType: 'member'
+		});
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Search/results.php b/Themes/default/templates/Search/results.php
new file mode 100644
index 00000000000..6ffb3e13dbd
--- /dev/null
+++ b/Themes/default/templates/Search/results.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The search results page.
+ */
+?><?php if (isset(Utils::$context['did_you_mean']) || empty(Utils::$context['topics']) || !empty(Utils::$context['search_ignored'])): ?>
+	<div id="search_results">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('search_adjust_query', file: 'Search') ?>
+			</h3>
+		</div>
+		<div class="roundframe"><?php /* Did they make any typos or mistakes, perhaps? */ ?><?php if (isset(Utils::$context['did_you_mean'])): ?>
+			<p>
+				<?= Lang::getTxt('search_did_you_mean', ['suggested_query' => '<a href="' . Config::$scripturl . '?action=search2;params=' . Utils::$context['did_you_mean_params'] . '">' . Utils::$context['did_you_mean'] . '</a>'], file: 'Search') ?>
+			</p><?php endif; ?><?php if (!empty(Utils::$context['search_ignored'])): ?>
+			<p>
+				<?= Lang::getTxt(
+				'search_warning_ignored',
+				[
+					'number_of_terms' => count(Utils::$context['search_ignored']),
+					'list' => implode(Lang::getTxt('sentence_list_separator', file: 'General') . ' ', Utils::$context['search_ignored']),
+				],
+				file: 'Search',
+			) ?>
+			</p><?php endif; ?>
+			<form action="<?= Config::$scripturl ?>?action=search2" method="post" accept-charset="UTF-8">
+				<strong><?= Lang::getTxt('search_for', file: 'General') ?></strong>
+				<input type="text" name="search"<?= !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '' ?> maxlength="<?= Utils::$context['search_string_limit'] ?>" size="40">
+				<input type="submit" name="edit_search" value="<?= Lang::getTxt('search_adjust_submit', file: 'Search') ?>" class="button"><?php foreach (Utils::$context['hidden_inputs'] as $input): ?><?= "\n\t\t\t\t" ?><?= $input ?><?php endforeach; ?>
+			</form>
+		</div><!-- .roundframe -->
+	</div><!-- #search_results --><?php endif; ?><?php if (Utils::$context['compact']): ?>
+	<form id="new_search" name="new_search" action="<?= Config::$scripturl ?>?action=search2" method="post" accept-charset="UTF-8">
+		<input type="hidden" name="search"<?= !empty(Utils::$context['search_params']['search']) ? ' value="' . Utils::$context['search_params']['search'] . '"' : '' ?> maxlength="<?= Utils::$context['search_string_limit'] ?>" size="40"><?php foreach (Utils::$context['hidden_inputs'] as $input): ?><?= "\n\t\t" ?><?= $input ?><?php endforeach; ?>
+	</form>
+		<div id="display_head" class="information">
+			<h2 class="display_title">
+				<span><?= Lang::getTxt('search_results', ['params' => Utils::$context['search_params']['search']], file: 'General') ?></span>
+			</h2>
+			<div class="floatleft">
+				<a class="button" href="<?= Config::$scripturl ?>?action=search;params=<?= Utils::$context['params'] ?>"><?= Lang::getTxt('search_adjust_query', file: 'Search') ?></a>
+			</div><?php /* Was anything even found? */ ?><?php if (!empty(Utils::$context['topics'])): ?>
+			<div class="floatright">
+				<span class="padding"><?= Lang::getTxt('search_order', file: 'Search') ?></span>
+				<select name="sort" class="floatright" form="new_search" onchange="document.forms.new_search.submit()"><?php foreach (Utils::$context['sort_options'] as $option): ?>
+					<option value="<?= $option['value'] ?>"<?= ($option['selected'] ? ' selected' : '') ?>><?= Lang::getTxt($option['label'], file: 'Search') ?></option><?php endforeach; ?>
+				</select>
+			</div>
+		</div>
+		<div class="pagesection">
+			<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+		</div><?php else: ?>
+		</div>
+		<div class="roundframe noup"><?= Lang::getTxt('search_no_results', file: 'General') ?></div><?php endif; ?><?php /* While we have results to show ... */ ?><?php while ($topic = Utils::$context['get_topics']()): ?>
+		<div class="<?= $topic['css_class'] ?>"><?php foreach ($topic['matches'] as $message): ?>
+			<div class="block">
+				<div class="page_number floatright"> #<?= $message['counter'] ?></div>
+				<div class="half_content">
+					<div class="topic_details">
+						<h5><?= $topic['board']['link'] ?> / <a href="<?= Config::$scripturl ?>?topic=<?= $topic['id'] ?>.msg<?= $message['id'] ?>#msg<?= $message['id'] ?>"><?= $message['subject_highlighted'] ?></a></h5>
+						<span class="smalltext"><?= str_replace('<br>', ' ', Lang::getTxt('last_post_updated', ['time' => $message['time'], 'member_link' => '<strong>' . $message['member']['link'] . '</strong>'], file: 'General')) ?></span>
+					</div>
+				</div>
+			</div><!-- .block --><?php if ($message['body_highlighted'] != ''): ?>
+			<div class="list_posts word_break"><?= $message['body_highlighted'] ?></div><?php endif; ?><?php endforeach; ?>
+		</div><!-- $topic[css_class] --><?php endwhile; ?><?php else: ?>
+	<div id="display_head" class="information">
+		<h2 class="display_title">
+			<span><?= Lang::getTxt('search_results', ['params' => Utils::$context['search_params']['search']], file: 'General') ?></span>
+		</h2>
+		<div class="floatleft">
+			<a class="button" href="<?= Config::$scripturl ?>?action=search;params=<?= Utils::$context['params'] ?>"><?= Lang::getTxt('search_adjust_query', file: 'Search') ?></a>
+		</div><?php /* Was anything even found? */ ?><?php if (!empty(Utils::$context['topics'])): ?>
+		<div class="floatright">
+			<span class="padding"><?= Lang::getTxt('search_order', file: 'Search') ?></span>
+			<select name="sort" class="floatright" form="new_search" onchange="document.forms.new_search.submit()"><?php foreach (Utils::$context['sort_options'] as $option): ?>
+				<option value="<?= $option['value'] ?>"<?= ($option['selected'] ? ' selected' : '') ?>><?= Lang::getTxt($option['label'], file: 'Search') ?></option><?php endforeach; ?>
+			</select>
+		</div>
+	</div>
+	<div class="pagesection">
+		<div class="pagelinks"><?= Utils::$context['page_index'] ?></div>
+	</div><?php else: ?>
+	</div>
+	<div class="roundframe noup"><?= Lang::getTxt('search_no_results', file: 'General') ?></div><?php endif; ?><?php while ($topic = Utils::$context['get_topics']()): ?><?php foreach ($topic['matches'] as $message): ?>
+	<div class="<?= $topic['css_class'] ?>">
+		<div class="page_number floatright"> #<?= $message['counter'] ?></div>
+		<div class="topic_details">
+			<h5>
+				<?= $topic['board']['link'] ?> / <a href="<?= Config::$scripturl ?>?topic=<?= $topic['id'] ?>.<?= $message['start'] ?>;topicseen#msg<?= $message['id'] ?>"><?= $message['subject_highlighted'] ?></a>
+			</h5>
+			<span class="smalltext"><?= str_replace('<br>', ' ', Lang::getTxt('last_post_topic', ['post_link' => $message['time'], 'member_link' => '<strong>' . $message['member']['link'] . '</strong>'], file: 'General')) ?></span>
+		</div>
+		<div class="list_posts"><?= $message['body_highlighted'] ?></div>
+		<br class="clear">
+	</div><!-- $topic[css_class] --><?php endforeach; ?><?php endwhile; ?><?php endif; ?>
+	<div class="pagesection"><?php if (!empty(Utils::$context['topics'])): ?>
+		<div class="pagelinks"><?= Utils::$context['page_index'] ?></div><?php endif; ?><?php /* Show a jump to box for easy navigation. */ ?>
+		<div class="smalltext pagelinks floatright" id="search_jump_to"></div>
+		<script>
+			window.addEventListener("DOMContentLoaded", function() {
+				new JumpTo({
+					sContainerId: "search_jump_to",
+					sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\"><?= Utils::$context['jump_to']['label'] ?><" + "/label> %dropdown_list%",
+					iCurBoardId: 0,
+					iCurBoardChildLevel: 0,
+					sCurBoardName: "<?= Utils::$context['jump_to']['board_name'] ?>",
+					sBoardChildLevelIndicator: "==",
+					sBoardPrefix: "=> ",
+					sCatSeparator: "-----------------------------",
+					sCatPrefix: "",
+					sGoButtonLabel: "<?= Lang::getTxt('quick_mod_go', file: 'General') ?>"
+				});
+			});
+		</script>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/Settings/index.php b/Themes/default/templates/Settings/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Settings/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Settings/options.php b/Themes/default/templates/Settings/options.php
new file mode 100644
index 00000000000..c866b7beb19
--- /dev/null
+++ b/Themes/default/templates/Settings/options.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This pseudo-template defines all the theme options
+ */
+?><?php
+Utils::$context['theme_options'] = [
+	Lang::getTxt('theme_opt_display', file: 'Profile'),
+	[
+		'id' => 'show_children',
+		'label' => Lang::getTxt('show_children', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'topics_per_page',
+		'label' => Lang::getTxt('topics_per_page', file: 'Profile'),
+		'options' => [
+			0 => Lang::getTxt('per_page_default', file: 'Profile'),
+			5 => 5,
+			10 => 10,
+			25 => 25,
+			50 => 50,
+		],
+		'default' => true,
+		'enabled' => empty(Config::$modSettings['disableCustomPerPage']),
+	],
+	[
+		'id' => 'messages_per_page',
+		'label' => Lang::getTxt('messages_per_page', file: 'Profile'),
+		'options' => [
+			0 => Lang::getTxt('per_page_default', file: 'Profile'),
+			5 => 5,
+			10 => 10,
+			25 => 25,
+			50 => 50,
+		],
+		'default' => true,
+		'enabled' => empty(Config::$modSettings['disableCustomPerPage']),
+	],
+	[
+		'id' => 'view_newest_first',
+		'label' => Lang::getTxt('recent_posts_at_top', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'show_no_avatars',
+		'label' => Lang::getTxt('show_no_avatars', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'show_no_signatures',
+		'label' => Lang::getTxt('show_no_signatures', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'show_no_censored',
+		'label' => Lang::getTxt('show_no_censored'),
+		'default' => false,
+		'enabled' => !empty(Config::$modSettings['allow_no_censored']),
+	],
+	[
+		'id' => 'posts_apply_ignore_list',
+		'label' => Lang::getTxt('posts_apply_ignore_list', file: 'Profile'),
+		'default' => false,
+		'enabled' => !empty(Config::$modSettings['enable_buddylist']),
+	],
+	Lang::getTxt('theme_opt_posting', file: 'Profile'),
+	[
+		'id' => 'return_to_post',
+		'label' => Lang::getTxt('return_to_post', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'no_new_reply_warning',
+		'label' => Lang::getTxt('no_new_reply_warning', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'wysiwyg_default',
+		'label' => Lang::getTxt('wysiwyg_default', file: 'Profile'),
+		'default' => false,
+		'enabled' => empty(Config::$modSettings['disable_wysiwyg']),
+	],
+	[
+		'id' => 'drafts_autosave_enabled',
+		'label' => Lang::getTxt('drafts_autosave_enabled', file: 'Drafts'),
+		'default' => true,
+		'enabled' => !empty(Config::$modSettings['drafts_autosave_enabled']) && (!empty(Config::$modSettings['drafts_post_enabled']) || !empty(Config::$modSettings['drafts_pm_enabled'])),
+	],
+	[
+		'id' => 'drafts_show_saved_enabled',
+		'label' => Lang::getTxt('drafts_show_saved_enabled', file: 'Drafts'),
+		'default' => true,
+		'enabled' => !empty(Config::$modSettings['drafts_show_saved_enabled']) && (!empty(Config::$modSettings['drafts_post_enabled']) || !empty(Config::$modSettings['drafts_pm_enabled'])),
+	],
+	Lang::getTxt('theme_opt_moderation', file: 'Profile'),
+	[
+		'id' => 'display_quick_mod',
+		'label' => Lang::getTxt('display_quick_mod', file: 'Profile'),
+		'options' => [
+			0 => Lang::getTxt('display_quick_mod_none', file: 'Profile'),
+			1 => Lang::getTxt('display_quick_mod_check', file: 'Profile'),
+			2 => Lang::getTxt('display_quick_mod_image', file: 'Profile'),
+		],
+		'default' => true,
+	],
+	Lang::getTxt('theme_opt_personal_messages', file: 'Profile'),
+	[
+		'id' => 'popup_messages',
+		'label' => Lang::getTxt('popup_messages', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'view_newest_pm_first',
+		'label' => Lang::getTxt('recent_pms_at_top', file: 'Profile'),
+		'default' => true,
+	],
+	[
+		'id' => 'pm_remove_inbox_label',
+		'label' => Lang::getTxt('pm_remove_inbox_label', file: 'Profile'),
+		'default' => true,
+	],
+	!empty(Config::$modSettings['cal_enabled']) ? Lang::getTxt('theme_opt_calendar', file: 'Profile') : '',
+	[
+		'id' => 'calendar_default_view',
+		'label' => Lang::getTxt('calendar_default_view', file: 'Profile'),
+		'options' => [
+			'viewlist' => Lang::getTxt('calendar_viewlist', file: 'Profile'),
+			'viewmonth' => Lang::getTxt('calendar_viewmonth', file: 'Profile'),
+			'viewweek' => Lang::getTxt('calendar_viewweek', file: 'Profile'),
+		],
+		'default' => true,
+		'enabled' => !empty(Config::$modSettings['cal_enabled']),
+	],
+	[
+		'id' => 'calendar_start_day',
+		'label' => Lang::getTxt('calendar_start_day', file: 'Profile'),
+		'options' => array_filter(
+			Lang::getTxt('days', file: 'General'),
+			fn($key) => in_array($key, [0, 1, 5, 6]),
+			ARRAY_FILTER_USE_KEY,
+		),
+		'default' => true,
+		'enabled' => !empty(Config::$modSettings['cal_enabled']),
+	],
+];
+?>
diff --git a/Themes/default/templates/Settings/settings.php b/Themes/default/templates/Settings/settings.php
new file mode 100644
index 00000000000..dfbaf840b19
--- /dev/null
+++ b/Themes/default/templates/Settings/settings.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This pseudo-template defines all the available theme settings (but not their actual values)
+ */
+?><?php
+Utils::$context['theme_settings'] = [
+	[
+		'id' => 'header_logo_url',
+		'label' => Lang::getTxt('header_logo_url', file: 'Themes'),
+		'description' => Lang::getTxt('header_logo_url_desc', file: 'Themes'),
+		'type' => 'text',
+	],
+	[
+		'id' => 'site_slogan',
+		'label' => Lang::getTxt('site_slogan', file: 'Themes'),
+		'description' => Lang::getTxt('site_slogan_desc', file: 'Themes'),
+		'type' => 'text',
+	],
+	[
+		'id' => 'og_image',
+		'label' => Lang::getTxt('og_image', file: 'Themes'),
+		'description' => Lang::getTxt('og_image_desc', file: 'Themes'),
+		'type' => 'url',
+	],
+	'',
+	[
+		'id' => 'smiley_sets_default',
+		'label' => Lang::getTxt('smileys_default_set_for_theme', file: 'Admin'),
+		'options' => Utils::$context['smiley_sets'],
+		'type' => 'text',
+	],
+	'',
+	[
+		'id' => 'enable_news',
+		'label' => Lang::getTxt('enable_random_news', file: 'Themes'),
+	],
+	[
+		'id' => 'show_newsfader',
+		'label' => Lang::getTxt('news_fader', file: 'Themes'),
+	],
+	[
+		'id' => 'newsfader_time',
+		'label' => Lang::getTxt('admin_fader_delay', file: 'Admin'),
+		'type' => 'number',
+	],
+	'',
+	[
+		'id' => 'number_recent_posts',
+		'label' => Lang::getTxt('number_recent_posts', file: 'Themes'),
+		'description' => Lang::getTxt('zero_to_disable', file: 'Admin'),
+		'type' => 'number',
+	],
+	[
+		'id' => 'show_stats_index',
+		'label' => Lang::getTxt('show_stats_index', file: 'Themes'),
+	],
+	[
+		'id' => 'show_latest_member',
+		'label' => Lang::getTxt('latest_members', file: 'Themes'),
+	],
+	[
+		'id' => 'show_group_key',
+		'label' => Lang::getTxt('show_group_key', file: 'Themes'),
+	],
+	[
+		'id' => 'display_who_viewing',
+		'label' => Lang::getTxt('who_display_viewing', file: 'Themes'),
+		'options' => [
+			0 => Lang::getTxt('who_display_viewing_off', file: 'Themes'),
+			1 => Lang::getTxt('who_display_viewing_numbers', file: 'Themes'),
+			2 => Lang::getTxt('who_display_viewing_names', file: 'Themes'),
+		],
+		'type' => 'list',
+	],
+];
+?>
diff --git a/Themes/default/templates/SplitTopics/ask.php b/Themes/default/templates/SplitTopics/ask.php
new file mode 100644
index 00000000000..7e5f70949f4
--- /dev/null
+++ b/Themes/default/templates/SplitTopics/ask.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form that asks how you want to split things
+ */
+?>
+	<div id="split_topics">
+		<form action="<?= Config::$scripturl ?>?action=splittopics;sa=split;topic=<?= Utils::$context['current_topic'] ?>.0" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="at" value="<?= Utils::$context['message']['id'] ?>">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('split', file: 'General') ?></h3>
+			</div>
+			<div class="windowbg">
+				<p class="split_topics">
+					<strong><label for="subname"><?= Lang::getTxt('subject_new_topic', file: 'General') ?></label></strong>
+					<input type="text" name="subname" id="subname" value="<?= Utils::$context['message']['subject'] ?>" size="25">
+				</p>
+				<ul class="split_topics">
+					<li>
+						<input type="radio" id="onlythis" name="step2" value="onlythis" checked> <label for="onlythis"><?= Lang::getTxt('split_this_post', file: 'General') ?></label>
+					</li>
+					<li>
+						<input type="radio" id="afterthis" name="step2" value="afterthis"> <label for="afterthis"><?= Lang::getTxt('split_after_and_this_post', file: 'General') ?></label>
+					</li>
+					<li>
+						<input type="radio" id="selective" name="step2" value="selective"> <label for="selective"><?= Lang::getTxt('select_split_posts', file: 'General') ?></label>
+					</li>
+				</ul>
+				<hr>
+				<div class="auto_flow">
+					<input type="submit" value="<?= Lang::getTxt('split', file: 'General') ?>" class="button">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				</div>
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #split_topics -->
\ No newline at end of file
diff --git a/Themes/default/templates/SplitTopics/index.php b/Themes/default/templates/SplitTopics/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/SplitTopics/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/SplitTopics/main.php b/Themes/default/templates/SplitTopics/main.php
new file mode 100644
index 00000000000..319d810f3d5
--- /dev/null
+++ b/Themes/default/templates/SplitTopics/main.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * A simple confirmation that things were split as expected, with links to the current board and the old and new topics.
+ */
+?>
+	<div id="split_topics">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('split', file: 'General') ?></h3>
+		</div>
+		<div class="windowbg">
+			<p><?= Lang::getTxt('split_successful', file: 'General') ?></p>
+			<ul>
+				<li>
+					<a href="<?= Config::$scripturl ?>?board=<?= Utils::$context['current_board'] ?>.0"><?= Lang::getTxt('message_index', file: 'General') ?></a>
+				</li>
+				<li>
+					<a href="<?= Config::$scripturl ?>?topic=<?= Utils::$context['old_topic'] ?>.0"><?= Lang::getTxt('origin_topic', file: 'General') ?></a>
+				</li>
+				<li>
+					<a href="<?= Config::$scripturl ?>?topic=<?= Utils::$context['new_topic'] ?>.0"><?= Lang::getTxt('new_topic', file: 'General') ?></a>
+				</li>
+			</ul>
+		</div><!-- .windowbg -->
+	</div><!-- #split_topics -->
\ No newline at end of file
diff --git a/Themes/default/templates/SplitTopics/select.php b/Themes/default/templates/SplitTopics/select.php
new file mode 100644
index 00000000000..bc72f0a75a6
--- /dev/null
+++ b/Themes/default/templates/SplitTopics/select.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The form for selecting which posts to split.
+ */
+?>
+	<div id="split_topics">
+		<form action="<?= Config::$scripturl ?>?action=splittopics;sa=splitSelection;board=<?= Utils::$context['current_board'] ?>.0" method="post" accept-charset="UTF-8">
+			<div id="not_selected" class="floatleft">
+				<div class="cat_bar">
+					<h3 class="catbg"><?= Lang::getTxt('select_split_posts', file: 'General') ?></h3>
+				</div>
+				<div class="information">
+					<?= Lang::getTxt('please_select_split', file: 'General') ?>
+				</div>
+				<div class="pagesection">
+					<div id="pageindex_not_selected" class="pagelinks"><?= Utils::$context['not_selected']['page_index'] ?></div>
+				</div>
+				<ul id="messages_not_selected" class="split_messages smalltext">
+<?php foreach (Utils::$context['not_selected']['messages'] as $message): ?>
+					<li class="windowbg" id="not_selected_<?= $message['id'] ?>">
+						<div class="message_header">
+							<a class="split_icon floatright" href="<?= Config::$scripturl ?>?action=splittopics;sa=selectTopics;subname=<?= Utils::$context['topic']['subject'] ?>;topic=<?= Utils::$context['topic']['id'] ?>.<?= Utils::$context['not_selected']['start'] ?>;start2=<?= Utils::$context['selected']['start'] ?>;move=down;msg=<?= $message['id'] ?>" onclick="return select('down', <?= $message['id'] ?>);"><span class="main_icons split_sel" title="-&gt;"></span></a>
+							<?= Lang::getTxt('post_by_member', $message, file: 'General') ?>
+							<em><?= $message['time'] ?></em>
+						</div>
+						<div class="post"><?= Utils::adjustHeadingLevels($message['body'], 3) ?></div>
+					</li>
+<?php endforeach; ?>
+				</ul>
+			</div><!-- #not_selected -->
+			<div id="selected" class="floatright">
+				<div class="cat_bar">
+					<h3 class="catbg">
+						<?= Lang::getTxt('split_selected_posts', ['reset_link' => '<a href="' . Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . Utils::$context['topic']['subject'] . ';topic=' . Utils::$context['topic']['id'] . '.' . Utils::$context['not_selected']['start'] . ';start2=' . Utils::$context['selected']['start'] . ';move=reset;msg=0" onclick="return select(\'reset\', 0);">' . Lang::getTxt('split_reset_selection', file: 'General') . '</a>']) ?>
+					</h3>
+				</div>
+				<div class="information">
+					<?= Lang::getTxt('split_selected_posts_desc', file: 'General') ?>
+				</div>
+				<div class="pagesection">
+					<div id="pageindex_selected" class="pagelinks"><?= Utils::$context['selected']['page_index'] ?></div>
+				</div>
+				<ul id="messages_selected" class="split_messages smalltext">
+<?php if (!empty(Utils::$context['selected']['messages'])): ?>
+<?php foreach (Utils::$context['selected']['messages'] as $message): ?>
+					<li class="windowbg" id="selected_<?= $message['id'] ?>">
+						<div class="message_header">
+							<a class="split_icon floatleft" href="<?= Config::$scripturl ?>?action=splittopics;sa=selectTopics;subname=<?= Utils::$context['topic']['subject'] ?>;topic=<?= Utils::$context['topic']['id'] ?>.<?= Utils::$context['not_selected']['start'] ?>;start2=<?= Utils::$context['selected']['start'] ?>;move=up;msg=<?= $message['id'] ?>" onclick="return select('up', <?= $message['id'] ?>);"><span class="main_icons split_desel" title="&lt;-"></span></a>
+							<?= Lang::getTxt('post_by_member', $message, file: 'General') ?>
+							<em><?= $message['time'] ?></em>
+						</div>
+						<div class="post"><?= Utils::adjustHeadingLevels($message['body'], 3) ?></div>
+					</li>
+<?php endforeach; ?>
+<?php endif; ?>
+				</ul>
+			</div><!-- #selected -->
+			<br class="clear">
+			<div class="flow_auto">
+				<input type="hidden" name="topic" value="<?= Utils::$context['current_topic'] ?>">
+				<input type="hidden" name="subname" value="<?= Utils::$context['new_subject'] ?>">
+				<input type="submit" value="<?= Lang::getTxt('split', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+			</div>
+		</form>
+	</div><!-- #split_topics -->
+	<script>
+		var start = new Array();
+		start[0] = <?= Utils::$context['not_selected']['start'] ?>;
+		start[1] = <?= Utils::$context['selected']['start'] ?>;
+
+		function select(direction, msg_id)
+		{
+			getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=<?= Utils::$context['topic']['subject'] ?>;topic=<?= Utils::$context['topic']['id'] ?>." + start[0] + ";start2=" + start[1] + ";move=" + direction + ";msg=" + msg_id + ";xml;splitjs", onDocReceived);
+			return false;
+		}
+		function onDocReceived(XMLDoc)
+		{
+			var i, j, pageIndex;
+			for (i = 0; i < 2; i++)
+			{
+				pageIndex = XMLDoc.getElementsByTagName("pageIndex")[i];
+				setInnerHTML(document.getElementById("pageindex_" + pageIndex.getAttribute("section")), pageIndex.firstChild.nodeValue);
+				start[i] = pageIndex.getAttribute("startFrom");
+			}
+			var numChanges = XMLDoc.getElementsByTagName("change").length;
+			var curChange, curSection, curAction, curId, curList, curData, newItem, sInsertBeforeId;
+			for (i = 0; i < numChanges; i++)
+			{
+				curChange = XMLDoc.getElementsByTagName("change")[i];
+				curSection = curChange.getAttribute("section");
+				curAction = curChange.getAttribute("curAction");
+				curId = curChange.getAttribute("id");
+				curList = document.getElementById("messages_" + curSection);
+				if (curAction == "remove")
+					curList.removeChild(document.getElementById(curSection + "_" + curId));
+				// Insert a message.
+				else
+				{
+					// By default, insert the element at the end of the list.
+					sInsertBeforeId = null;
+					// Loop through the list to try to find an item to insert after.
+					oListItems = curList.getElementsByTagName("LI");
+					for (j = 0; j < oListItems.length; j++)
+					{
+						if (parseInt(oListItems[j].id.substr(curSection.length + 1)) <?= (empty(Theme::$current->options['view_newest_first']) ? '>' : '<') ?> curId)
+						{
+							// This would be a nice place to insert the row.
+							sInsertBeforeId = oListItems[j].id;
+							// We're done for now. Escape the loop.
+							j = oListItems.length + 1;
+						}
+					}
+
+					// Let's create a nice container for the message.
+					newItem = document.createElement("LI");
+					newItem.className = "windowbg";
+					newItem.id = curSection + "_" + curId;
+					newItem.innerHTML = "<div class=\"message_header\"><a class=\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\" href=\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=<?= Utils::$context['topic']['subject'] ?>;topic=<?= Utils::$context['topic']['id'] ?>.<?= Utils::$context['not_selected']['start'] ?>;start2=<?= Utils::$context['selected']['start'] ?>;move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\" onclick=\"return select('" + (curSection == "selected" ? "up" : "down") + "', " + curId + ");\"><span class=\"main_icons split_" + (curSection == "selected" ? "de" : "") + "sel\" title=\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\"></span></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> <?= Lang::getTxt('by', file: 'General') ?> <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\"post\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div>";
+
+					// So, where do we insert it?
+					if (typeof sInsertBeforeId == "string")
+						curList.insertBefore(newItem, document.getElementById(sInsertBeforeId));
+					else
+						curList.appendChild(newItem);
+				}
+			}
+		}
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Stats/index.php b/Themes/default/templates/Stats/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Stats/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Stats/main.php b/Themes/default/templates/Stats/main.php
new file mode 100644
index 00000000000..2e99fb677f0
--- /dev/null
+++ b/Themes/default/templates/Stats/main.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The stats page.
+ */
+?>
+	<div id="statistics" class="main_section">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="roundframe">
+			<div class="title_bar">
+				<h4 class="titlebg">
+					<span class="main_icons general"></span> <?= Lang::getTxt('general_stats', file: 'Stats') ?>
+				</h4>
+			</div>
+			<dl class="stats half_content">
+				<dt><?= Lang::getTxt('total_members', file: 'General') ?></dt>
+				<dd><?= Utils::$context['show_member_list'] ? '<a href="' . Config::$scripturl . '?action=mlist">' . Utils::$context['num_members'] . '</a>' : Utils::$context['num_members'] ?></dd>
+				<dt><?= Lang::getTxt('total_posts', file: 'General') ?></dt>
+				<dd><?= Utils::$context['num_posts'] ?></dd>
+				<dt><?= Lang::getTxt('total_topics', file: 'General') ?></dt>
+				<dd><?= Utils::$context['num_topics'] ?></dd>
+				<dt><?= Lang::getTxt('total_cats', file: 'General') ?></dt>
+				<dd><?= Utils::$context['num_categories'] ?></dd>
+				<dt><?= Lang::getTxt('users_online', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['users_online'] ?></dd>
+				<dt><?= Lang::getTxt('most_online', file: 'Stats') ?></dt>
+				<dd><?= Lang::getTxt('most_online_number_date', Utils::$context['most_members_online'], file: 'Stats') ?></dd>
+				<dt><?= Lang::getTxt('users_online_today', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['online_today'] ?></dd>
+<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+				<dt><?= Lang::getTxt('num_hits', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['num_hits'] ?></dd>
+<?php endif; ?>
+			</dl>
+			<dl class="stats half_content">
+				<dt><?= Lang::getTxt('average_members', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['average_members'] ?></dd>
+				<dt><?= Lang::getTxt('average_posts', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['average_posts'] ?></dd>
+				<dt><?= Lang::getTxt('average_topics', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['average_topics'] ?></dd>
+				<dt><?= Lang::getTxt('total_boards', file: 'General') ?></dt>
+				<dd><?= Utils::$context['num_boards'] ?></dd>
+				<dt><?= Lang::getTxt('latest_member', file: 'General') ?></dt>
+				<dd><?= Utils::$context['common_stats']['latest_member']['link'] ?></dd>
+				<dt><?= Lang::getTxt('average_online', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['average_online'] ?></dd>
+<?php if (!empty(Utils::$context['gender'])): ?>
+				<dt><?= Lang::getTxt('gender_stats', file: 'Stats') ?></dt>
+				<dd><?php foreach (Utils::$context['gender'] as $g => $n): ?><?= Lang::getTxt('gender_stats_number', ['gender' => Lang::tokenTxtReplace($g), 'number' => $n], file: 'Stats') ?><br><?php endforeach; ?>
+				</dd>
+<?php endif; ?>
+<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+				<dt><?= Lang::getTxt('average_hits', file: 'Stats') ?></dt>
+				<dd><?= Utils::$context['average_hits'] ?></dd>
+<?php endif; ?>
+			</dl>
+<?php foreach (Utils::$context['stats_blocks'] as $name => $block): ?>
+			<div class="half_content">
+				<div class="title_bar">
+					<h4 class="titlebg">
+						<span class="main_icons <?= $name ?>"></span> <?= Lang::getTxt('top_' . $name, file: 'Stats') ?>
+					</h4>
+				</div>
+				<dl class="stats">
+	<?php foreach ($block as $item): ?>
+					<dt>
+						<?= $item['link'] ?>
+					</dt>
+					<dd class="statsbar generic_bar righttext">
+		<?php if (!empty($item['percent'])): ?>
+						<div class="bar" style="width: <?= $item['percent'] ?>%;"></div>
+		<?php else: ?>
+						<div class="bar empty"></div>
+		<?php endif; ?>
+						<span><?= $item['num'] ?></span>
+					</dd>
+	<?php endforeach; ?>
+				</dl>
+			</div><!-- .half_content -->
+<?php endforeach; ?>
+		</div><!-- .roundframe -->
+		<br class="clear">
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<span class="main_icons history"></span><?= Lang::getTxt('forum_history', file: 'Stats') ?>
+			</h3>
+		</div>
+<?php if (!empty(Utils::$context['yearly'])): ?>
+		<table id="stats" class="table_grid">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext"><?= Lang::getTxt('yearly_summary', file: 'Stats') ?></th>
+					<th><?= Lang::getTxt('stats_new_topics', file: 'Stats') ?></th>
+					<th><?= Lang::getTxt('stats_new_posts', file: 'Stats') ?></th>
+					<th><?= Lang::getTxt('stats_new_members', file: 'Stats') ?></th>
+					<th><?= Lang::getTxt('most_online', file: 'Stats') ?></th>
+	<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+					<th><?= Lang::getTxt('page_views', file: 'Stats') ?></th>
+	<?php endif; ?>
+				</tr>
+			</thead>
+			<tbody>
+	<?php foreach (Utils::$context['yearly'] as $id => $year): ?>
+				<tr class="windowbg" id="year_<?= $id ?>">
+					<th class="lefttext">
+						<img id="year_img_<?= $id ?>" src="<?= Theme::$current->settings['images_url'] ?>/selected_open.png" alt="*"> <a href="#year_<?= $id ?>" id="year_link_<?= $id ?>"><?= $year['year'] ?></a>
+					</th>
+					<th><?= $year['new_topics'] ?></th>
+					<th><?= $year['new_posts'] ?></th>
+					<th><?= $year['new_members'] ?></th>
+					<th><?= $year['most_members_online'] ?></th>
+		<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+					<th><?= $year['hits'] ?></th>
+		<?php endif; ?>
+				</tr>
+		<?php foreach ($year['months'] as $month): ?>
+				<tr class="windowbg" id="tr_month_<?= $month['id'] ?>">
+					<th class="stats_month">
+						<img src="<?= Theme::$current->settings['images_url'] ?>/<?= $month['expanded'] ? 'selected_open.png' : 'selected.png' ?>" alt="" id="img_<?= $month['id'] ?>"> <a id="m<?= $month['id'] ?>" href="<?= $month['href'] ?>" onclick="return doingExpandCollapse;"><?= $month['month'] ?> <?= $month['year'] ?></a>
+					</th>
+					<th><?= $month['new_topics'] ?></th>
+					<th><?= $month['new_posts'] ?></th>
+					<th><?= $month['new_members'] ?></th>
+					<th><?= $month['most_members_online'] ?></th>
+			<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+					<th><?= $month['hits'] ?></th>
+			<?php endif; ?>
+				</tr>
+			<?php if ($month['expanded']): ?>
+				<?php foreach ($month['days'] as $day): ?>
+				<tr class="windowbg" id="tr_day_<?= $day['year'] ?>-<?= $day['month'] ?>-<?= $day['day'] ?>">
+					<td class="stats_day"><?= $day['year'] ?>-<?= $day['month'] ?>-<?= $day['day'] ?></td>
+					<td><?= $day['new_topics'] ?></td>
+					<td><?= $day['new_posts'] ?></td>
+					<td><?= $day['new_members'] ?></td>
+					<td><?= $day['most_members_online'] ?></td>
+					<?php if (!empty(Config::$modSettings['hitStats'])): ?>
+					<td><?= $day['hits'] ?></td>
+					<?php endif; ?>
+				</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php endforeach; ?>
+			</tbody>
+		</table>
+	</div><!-- #statistics -->
+	<script>
+		var oStatsCenter = new smf_StatsCenter({
+			sTableId: 'stats',
+
+			reYearPattern: /year_(\d+)/,
+			sYearImageCollapsed: 'selected.png',
+			sYearImageExpanded: 'selected_open.png',
+			sYearImageIdPrefix: 'year_img_',
+			sYearLinkIdPrefix: 'year_link_',
+
+			reMonthPattern: /tr_month_(\d+)/,
+			sMonthImageCollapsed: 'selected.png',
+			sMonthImageExpanded: 'selected_open.png',
+			sMonthImageIdPrefix: 'img_',
+			sMonthLinkIdPrefix: 'm',
+
+			reDayPattern: /tr_day_(\d+-\d+-\d+)/,
+			sDayRowClassname: 'windowbg',
+			sDayRowIdPrefix: 'tr_day_',
+
+			aCollapsedYears: [<?php foreach (Utils::$context['collapsed_years'] as $id => $year): ?>
+
+				'<?= $year ?>'<?= $id != count(Utils::$context['collapsed_years']) - 1 ? ',' : '' ?>
+<?php endforeach; ?>
+
+			],
+
+			aDataCells: [
+				'date',
+				'new_topics',
+				'new_posts',
+				'new_members',
+				'most_members_online'<?= empty(Config::$modSettings['hitStats']) ? '' : ",\n\t\t\t\t'hits'" ?>
+
+			]
+		});
+	</script>
+<?php endif; ?>
diff --git a/Themes/default/templates/Themes/copy_template.php b/Themes/default/templates/Themes/copy_template.php
new file mode 100644
index 00000000000..ce2ee7b848e
--- /dev/null
+++ b/Themes/default/templates/Themes/copy_template.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page allowing you to copy a template from one theme to another.
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('themeadmin_edit_filename', file: 'Themes') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('themeadmin_edit_copy_warning', file: 'Themes') ?>
+		</div>
+		<div class="windowbg">
+			<ul class="theme_options"><?php foreach (Utils::$context['available_templates'] as $template): ?>
+				<li class="flow_hidden windowbg">
+					<span class="floatleft"><?= $template['filename'] ?><?= $template['already_exists'] ? ' <span class="error">(' . Lang::getTxt('themeadmin_edit_exists', file: 'Themes') . ')</span>' : '' ?></span>
+					<span class="floatright"><?php if ($template['can_copy']): ?>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=copy;template=<?= $template['value'] ?>" data-confirm="<?= Lang::getTxt($template['already_exists'] ? 'themeadmin_edit_overwrite_confirm' : 'themeadmin_edit_copy_confirm', file: 'Themes') ?>" class="you_sure"><?= Lang::getTxt('themeadmin_edit_do_copy', file: 'Themes') ?></a><?php else: ?><?= Lang::getTxt('themeadmin_edit_no_copy', file: 'Themes') ?><?php endif; ?>
+					</span>
+				</li><?php endforeach; ?>
+			</ul>
+		</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/edit_browse.php b/Themes/default/templates/Themes/edit_browse.php
new file mode 100644
index 00000000000..60147de50ca
--- /dev/null
+++ b/Themes/default/templates/Themes/edit_browse.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This lets you browse a list of files in a theme so you can choose which one to edit.
+ */
+?><?php if (!empty(Utils::$context['browse_title'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['browse_title'] ?></h3>
+		</div><?php endif; ?>
+		<table class="table_grid tborder">
+			<thead>
+				<tr class="title_bar">
+					<th class="lefttext half_table" scope="col"><?= Lang::getTxt('themeadmin_edit_filename', file: 'Themes') ?></th>
+					<th class="quarter_table" scope="col"><?= Lang::getTxt('themeadmin_edit_modified', file: 'Themes') ?></th>
+					<th class="quarter_table" scope="col"><?= Lang::getTxt('themeadmin_edit_size', file: 'Themes') ?></th>
+				</tr>
+			</thead>
+			<tbody><?php foreach (Utils::$context['theme_files'] as $file): ?>
+				<tr class="windowbg">
+					<td><?php if ($file['is_editable']): ?>
+						<a href="<?= $file['href'] ?>"<?= $file['is_template'] ? ' style="font-weight: bold;"' : '' ?>><?= $file['filename'] ?></a><?php elseif ($file['is_directory']): ?>
+						<a href="<?= $file['href'] ?>" class="is_directory"><span class="main_icons folder"></span><?= $file['filename'] ?></a><?php else: ?><?= $file['filename'] ?><?php endif; ?>
+					</td>
+					<td class="righttext"><?= !empty($file['last_modified']) ? $file['last_modified'] : '' ?></td>
+					<td class="righttext"><?= $file['size'] ?></td>
+				</tr><?php endforeach; ?>
+			</tbody>
+		</table>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/edit_file.php b/Themes/default/templates/Themes/edit_file.php
new file mode 100644
index 00000000000..00cf1722a37
--- /dev/null
+++ b/Themes/default/templates/Themes/edit_file.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This allows you to edit a file
+ */
+?><?php if (Utils::$context['session_error']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('error_session_timeout', file: 'Errors') ?>
+	</div><?php endif; ?><?php /* Is this file writeable? */ ?><?php if (!Utils::$context['allow_save']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes') ?>
+	</div><?php endif; ?><?php /* Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.) */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_id'] ?>;sa=edit" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes') ?></h3>
+			</div>
+			<div class="windowbg">
+				<textarea name="entire_file" id="entire_file" cols="80" rows="20" class="edit_file"><?= Utils::$context['entire_file'] ?></textarea><br>
+				<input type="submit" name="save" value="<?= Lang::getTxt('theme_edit_save', file: 'Themes') ?>"<?= Utils::$context['allow_save'] ? '' : ' disabled' ?> class="button">
+				<input type="hidden" name="filename" value="<?= Utils::$context['edit_filename'] ?>">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>"><?php /* Hopefully it exists. */ ?><?php if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])): ?>
+				<input type="hidden" name="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'] ?>" value="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'] ?>"><?php endif; ?>
+			</div><!-- .windowbg -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/edit_list.php b/Themes/default/templates/Themes/edit_list.php
new file mode 100644
index 00000000000..1fc406a4096
--- /dev/null
+++ b/Themes/default/templates/Themes/edit_list.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page for editing themes.
+ */
+?>
+	<div id="admin_form_wrapper">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('themeadmin_edit_title', file: 'Admin') ?></h3>
+		</div>
+		<div class="windowbg">
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+			<fieldset>
+				<legend>
+					<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=edit"><?= $theme['name'] ?></a><?= !empty($theme['version']) ? '
+					<em>(' . $theme['version'] . ')</em>' : '' ?>
+				</legend>
+				<ul>
+					<li><a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=edit"><?= Lang::getTxt('themeadmin_edit_browse', file: 'Themes') ?></a></li><?= $theme['can_edit_style'] ? '
+					<li><a href="' . Config::$scripturl . '?action=admin;area=theme;th=' . $theme['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=edit;directory=css">' . Lang::getTxt('themeadmin_edit_style', file: 'Themes') . '</a></li>' : '' ?>
+					<li><a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=copy"><?= Lang::getTxt('themeadmin_edit_copy_template', file: 'Themes') ?></a></li>
+				</ul>
+			</fieldset>
+<?php endforeach; ?>
+		</div><!-- .windowbg -->
+	</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/edit_style.php b/Themes/default/templates/Themes/edit_style.php
new file mode 100644
index 00000000000..2188e180ffe
--- /dev/null
+++ b/Themes/default/templates/Themes/edit_style.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\BrowserDetector;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Wanna edit the stylesheet?
+ */
+?><?php if (Utils::$context['session_error']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('error_session_timeout', file: 'Errors') ?>
+	</div><?php endif; ?><?php /* From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com. */ ?>
+		<script>
+			var previewData = "";
+			var previewTimeout;
+			var editFilename = <?= Utils::escapeJavaScript(Utils::$context['edit_filename']) ?>;
+
+			// Load up a page, but apply our stylesheet.
+			function navigatePreview(url)
+			{
+				var myDoc = new XMLHttpRequest();
+				myDoc.onreadystatechange = function ()
+				{
+					if (myDoc.readyState != 4)
+						return;
+
+					if (myDoc.responseText != null && myDoc.status == 200)
+					{
+						previewData = myDoc.responseText;
+						document.getElementById("css_preview_box").style.display = "";
+
+						// Revert to the theme they actually use ;).
+						var tempImage = new Image();
+						tempImage.src = smf_prepareScriptUrl(smf_scripturl) + "action=admin;area=theme;sa=edit;theme=<?= Theme::$current->settings['theme_id'] ?>;preview;" + (new Date().getTime());
+
+						refreshPreviewCache = null;
+						refreshPreview(false);
+					}
+				};
+
+				var anchor = "";
+				if (url.indexOf("#") != -1)
+				{
+					anchor = url.substr(url.indexOf("#"));
+					url = url.substr(0, url.indexOf("#"));
+				}
+
+				myDoc.open("GET", url + (url.indexOf("?") == -1 ? "?" : ";") + "theme=<?= Utils::$context['theme_id'] ?>;normalcss" + anchor, true);
+				myDoc.send(null);
+			}
+			navigatePreview(smf_scripturl);
+
+			var refreshPreviewCache;
+			function refreshPreview(check)
+			{
+				var identical = document.forms.stylesheetForm.entire_file.value == refreshPreviewCache;
+
+				// Don't reflow the whole thing if nothing changed!!
+				if (check && identical)
+					return;
+				refreshPreviewCache = document.forms.stylesheetForm.entire_file.value;
+				// Replace the paths for images.
+				refreshPreviewCache = refreshPreviewCache.replace(/url\(\.\.\/images/gi, "url(" + smf_images_url);
+
+				// Try to do it without a complete reparse.
+				if (identical)
+				{
+					try
+					{
+					<?php if (BrowserDetector::isBrowser('is_ie')): ?>
+
+						var sheets = frames["css_preview_box"].document.styleSheets;
+						for (var j = 0; j < sheets.length; j++)
+						{
+							if (sheets[j].id == "css_preview_box")
+								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
+						}<?php else: ?>
+
+						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);<?php endif; ?>
+
+					}
+					catch (e)
+					{
+						identical = false;
+					}
+				}
+
+				// This will work most of the time... could be done with an after-apply, maybe.
+				if (!identical)
+				{
+					var data = previewData + "";
+					var preview_sheet = document.forms.stylesheetForm.entire_file.value;
+					var stylesheetMatch = new RegExp('<link rel="stylesheet"[^>]+href="[^"]+' + editFilename + '[^>]*>');
+
+					// Replace the paths for images.
+					preview_sheet = preview_sheet.replace(/url\(\.\.\/images/gi, "url(" + smf_images_url);
+					data = data.replace(stylesheetMatch, "<style type=\"text/css\" id=\"css_preview_sheet\">" + preview_sheet + "<" + "/style>");
+
+					frames["css_preview_box"].document.open();
+					frames["css_preview_box"].document.write(data);
+					frames["css_preview_box"].document.close();
+
+					// Next, fix all its links so we can handle them and reapply the new css!
+					frames["css_preview_box"].onload = function ()
+					{
+						var fixLinks = frames["css_preview_box"].document.getElementsByTagName("a");
+						for (var i = 0; i < fixLinks.length; i++)
+						{
+							if (fixLinks[i].onclick)
+								continue;
+							fixLinks[i].onclick = function ()
+							{
+								window.parent.navigatePreview(this.href);
+								return false;
+							};
+						}
+					};
+				}
+			}
+		</script>
+		<iframe id="css_preview_box" name="css_preview_box" src="about:blank" frameborder="0" style="display: none;"></iframe><?php /* Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.) */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_id'] ?>;sa=edit" method="post" accept-charset="UTF-8" name="stylesheetForm" id="stylesheetForm">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes') ?></h3>
+			</div>
+			<div class="windowbg"><?php if (!Utils::$context['allow_save']): ?>
+				<?= Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes') ?><br><?php endif; ?>
+				<textarea class="edit_file" name="entire_file" cols="80" rows="20" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);"><?= Utils::$context['entire_file'] ?></textarea>
+				<br>
+				<div class="padding righttext">
+					<input type="submit" name="save" value="<?= Lang::getTxt('theme_edit_save', file: 'Themes') ?>"<?= Utils::$context['allow_save'] ? '' : ' disabled' ?> class="button">
+					<input type="button" value="<?= Lang::getTxt('themeadmin_edit_preview', file: 'Themes') ?>" onclick="refreshPreview(false);" class="button">
+				</div>
+			</div>
+			<input type="hidden" name="filename" value="<?= Utils::$context['edit_filename'] ?>">
+			<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>"><?php /* Hopefully it exists. */ ?><?php if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])): ?>
+			<input type="hidden" name="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'] ?>" value="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'] ?>"><?php endif; ?>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/edit_template.php b/Themes/default/templates/Themes/edit_template.php
new file mode 100644
index 00000000000..3b0afebbd7d
--- /dev/null
+++ b/Themes/default/templates/Themes/edit_template.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This edits the template...
+ */
+?><?php if (Utils::$context['session_error']): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('error_session_timeout', file: 'Errors') ?>
+	</div><?php endif; ?><?php if (isset(Utils::$context['parse_error'])): ?>
+	<div class="errorbox">
+		<?= Lang::getTxt('themeadmin_edit_error', file: 'Themes') ?>
+		<div><pre><?= Utils::$context['parse_error'] ?></pre></div>
+	</div><?php endif; ?><?php /* Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.) */ ?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_id'] ?>;sa=edit" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('theme_edit_file', ['filename' => Utils::$context['edit_filename']], file: 'Themes') ?></h3>
+			</div>
+			<div class="windowbg"><?php if (!Utils::$context['allow_save']): ?>
+				<?= Lang::getTxt('theme_edit_no_save', ['filename' => Utils::$context['allow_save_filename']], file: 'Themes') ?><br><?php endif; ?><?php foreach (Utils::$context['file_parts'] as $part): ?>
+				<label for="on_line<?= $part['line'] ?>"><?= Lang::getTxt('themeadmin_edit_on_line', $part, file: 'Themes') ?></label><br>
+				<div class="centertext">
+					<textarea id="on_line<?= $part['line'] ?>" name="entire_file[]" cols="80" rows="<?= $part['lines'] > 14 ? '14' : $part['lines'] ?>" class="edit_file"><?= $part['data'] ?></textarea>
+				</div><?php endforeach; ?>
+				<div class="padding righttext">
+					<input type="submit" name="save" value="<?= Lang::getTxt('theme_edit_save', file: 'Themes') ?>"<?= Utils::$context['allow_save'] ? '' : ' disabled' ?> class="button">
+					<input type="hidden" name="filename" value="<?= Utils::$context['edit_filename'] ?>">
+					<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>"><?php /* Hopefully it exists. */ ?><?php if (isset(Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'])): ?>
+					<input type="hidden" name="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token_var'] ?>" value="<?= Utils::$context['admin-te-' . md5(Utils::$context['theme_id'] . '-' . Utils::$context['edit_filename']) . '_token'] ?>"><?php endif; ?>
+				</div><!-- .righttext -->
+			</div><!-- .windowbg -->
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/index.php b/Themes/default/templates/Themes/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Themes/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Themes/installed.php b/Themes/default/templates/Themes/installed.php
new file mode 100644
index 00000000000..3ee3723ee9c
--- /dev/null
+++ b/Themes/default/templates/Themes/installed.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Okay, that theme was installed/updated successfully!
+ */
+?>
+
+<?php /* The aftermath. */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Utils::$context['page_title'] ?></h3>
+		</div>
+		<div class="windowbg">
+<?php /* Oops! there was an error :( */ ?>
+<?php if (!empty(Utils::$context['error_message'])): ?>
+			<p>
+				<?= Utils::$context['error_message'] ?>
+			</p>
+<?php /* Not much to show except a link back... */ ?>
+<?php else: ?>
+			<p>
+				<a href="<?= Config::$scripturl ?>?action=admin;area=theme;sa=list;th=<?= Utils::$context['installed_theme']['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Utils::$context['installed_theme']['name'] ?></a> <?= Lang::getTxt('theme_' . (isset(Utils::$context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message', file: 'Themes') ?>
+			</p>
+			<p>
+				<a href="<?= Config::$scripturl ?>?action=admin;area=theme;sa=admin;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('back', file: 'General') ?></a>
+			</p>
+<?php endif; ?>
+		</div><!-- .windowbg -->
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/list_themes.php b/Themes/default/templates/Themes/list_themes.php
new file mode 100644
index 00000000000..50bbf817f49
--- /dev/null
+++ b/Themes/default/templates/Themes/list_themes.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This lists all themes
+ */
+?><?php /* Show a nice confirmation message. */ ?><?php if (isset($_GET['done'])): ?>
+	<div class="infobox">
+		<?= Lang::getTxt('theme_confirmed_' . $_GET['done'], file: 'Themes') ?>
+	</div><?php endif; ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('themeadmin_list_heading', file: 'Themes') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('themeadmin_list_tip', file: 'Themes') ?>
+		</div>
+		<form id="admin_form_wrapper" action="<?= Config::$scripturl ?>?action=admin;area=theme;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=list" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('theme_settings', file: 'Admin') ?></h3>
+			</div>
+			<br><?php /* Show each theme.... with X for delete, an enable/disable link and a link to their own settings page. */ ?><?php foreach (Utils::$context['themes'] as $theme): ?>
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<span class="floatleft">
+						<?= $theme['name'] ?><?= (!empty($theme['version']) ? ' <em>(' . $theme['version'] . ')</em>' : '') ?>
+					</span>
+					<span class="floatright">
+						<?= (!empty($theme['enable']) || $theme['id'] == 1 ? '<a href="' . Config::$scripturl . '?action=admin;area=theme;th=' . $theme['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=list"><span class="main_icons settings"></span></a>' : '') ?><?php /* You *cannot* disable/enable/delete the default theme. It's important! */ ?><?php if ($theme['id'] != 1): ?><?php /* Enable/Disable. */ ?>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;sa=enable;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;<?= Utils::$context['admin-tre_token_var'] ?>=<?= Utils::$context['admin-tre_token'] ?><?= (!empty($theme['enable']) ? ';disabled' : '') ?>" data-confirm="<?= Lang::getTxt('theme_' . (!empty($theme['enable']) ? 'disable' : 'enable') . '_confirm', file: 'Themes') ?>" class="you_sure"><span class="main_icons <?= !empty($theme['enable']) ? 'disable' : 'enable' ?>" title="<?= Lang::getTxt('theme_' . (!empty($theme['enable']) ? 'disable' : 'enable'), file: 'Themes') ?>"></span></a><?php /* Deleting. */ ?>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;sa=remove;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;<?= Utils::$context['admin-tr_token_var'] ?>=<?= Utils::$context['admin-tr_token'] ?>" data-confirm="<?= Lang::getTxt('theme_remove_confirm', file: 'Themes') ?>" class="you_sure"><span class="main_icons delete" title="<?= Lang::getTxt('theme_remove', file: 'Themes') ?>"></span></a><?php endif; ?>
+					</span>
+				</h3>
+			</div><!-- .cat_bar -->
+			<div class="windowbg">
+				<dl class="settings themes_list">
+					<dt><?= Lang::getTxt('themeadmin_list_theme_dir', file: 'Themes') ?></dt>
+					<dd<?= $theme['valid_path'] ? '' : ' class="error"' ?>><?= $theme['theme_dir'] ?><?= $theme['valid_path'] ? '' : ' ' . Lang::getTxt('themeadmin_list_invalid', file: 'Themes') ?></dd>
+					<dt><?= Lang::getTxt('themeadmin_list_theme_url', file: 'Themes') ?></dt>
+					<dd><?= $theme['theme_url'] ?></dd>
+					<dt><?= Lang::getTxt('themeadmin_list_images_url', file: 'Themes') ?></dt>
+					<dd><?= $theme['images_url'] ?></dd>
+				</dl>
+			</div><?php endforeach; ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('themeadmin_list_reset', file: 'Themes') ?></h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for="reset_dir"><?= Lang::getTxt('themeadmin_list_reset_dir', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" name="reset_dir" id="reset_dir" value="<?= Utils::$context['reset_dir'] ?>" size="40">
+					</dd>
+					<dt>
+						<label for="reset_url"><?= Lang::getTxt('themeadmin_list_reset_url', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" name="reset_url" id="reset_url" value="<?= Utils::$context['reset_url'] ?>" size="40">
+					</dd>
+				</dl>
+				<input type="submit" name="save" value="<?= Lang::getTxt('themeadmin_list_reset_go', file: 'Themes') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-tl_token_var'] ?>" value="<?= Utils::$context['admin-tl_token'] ?>">
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/main.php b/Themes/default/templates/Themes/main.php
new file mode 100644
index 00000000000..dd00821817a
--- /dev/null
+++ b/Themes/default/templates/Themes/main.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main sub template - for theme administration.
+ */
+?>
+
+<?php /* Theme install info. */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="<?= Config::$scripturl ?>?action=helpadmin;help=themes_manage" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a>
+				<?= Lang::getTxt('themeadmin_install_title', file: 'Themes') ?>
+			</h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('themeadmin_explain', file: 'Themes') ?>
+		</div>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;sa=admin" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('settings', file: 'General') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+				<dl class="settings">
+					<dt>
+						<label for="options-theme_allow"> <?= Lang::getTxt('theme_allow', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" value="0" name="options[theme_allow]">
+						<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"<?= !empty(Config::$modSettings['theme_allow']) ? ' checked' : '' ?>>
+					</dd>
+					<dt>
+						<label for="known_themes_list"><?= Lang::getTxt('themeadmin_selectable', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<div id="known_themes_list">
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+							<label for="options-known_themes_<?= $theme['id'] ?>"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_<?= $theme['id'] ?>" value="<?= $theme['id'] ?>"<?= $theme['known'] ? ' checked' : '' ?>> <?= $theme['name'] ?></label><br>
+<?php endforeach; ?>
+						</div>
+						<a href="javascript:void(0);" onclick="document.getElementById('known_themes_list').classList.remove('hidden'); document.getElementById('known_themes_link').classList.add('hidden'); return false; " id="known_themes_link" class="hidden button floatnone"><?= Lang::getTxt('themeadmin_themelist_link', file: 'Themes') ?></a>
+						<script>
+							document.getElementById("known_themes_list").classList.add('hidden');
+							document.getElementById("known_themes_link").classList.remove('hidden');
+						</script>
+					</dd>
+					<dt>
+						<label for="theme_guests"><?= Lang::getTxt('theme_guests', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<select name="options[theme_guests]" id="theme_guests">
+<?php /* Put an option for each theme in the select box. */ ?>
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+							<option value="<?= $theme['id'] ?>"<?= Config::$modSettings['theme_guests'] == $theme['id'] ? ' selected' : '' ?>><?= $theme['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+						<span class="smalltext pick_theme"><a href="<?= Config::$scripturl ?>?action=themechooser;u=-1;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="button floatnone"><?= Lang::getTxt('theme_select', file: 'Themes') ?></a></span>
+					</dd>
+					<dt>
+						<label for="theme_reset"><?= Lang::getTxt('theme_reset', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<select name="theme_reset" id="theme_reset">
+							<option value="-1" selected><?= Lang::getTxt('theme_nochange', file: 'Themes') ?></option>
+							<option value="0"><?= Lang::getTxt('theme_forum_default', file: 'Themes') ?></option>
+<?php /* Same thing, this time for changing the theme of everyone. */ ?>
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+							<option value="<?= $theme['id'] ?>"><?= $theme['name'] ?></option>
+<?php endforeach; ?>
+						</select>
+						<span class="smalltext pick_theme"><a href="<?= Config::$scripturl ?>?action=themechooser;u=0;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" class="button floatnone"><?= Lang::getTxt('theme_select', file: 'Themes') ?></a></span>
+					</dd>
+				</dl>
+				<input type="submit" name="save" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-tm_token_var'] ?>" value="<?= Utils::$context['admin-tm_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+<?php /* Link to simplemachines.org for latest themes and info! */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<?= Lang::getTxt('theme_adding_title', file: 'Themes') ?>
+			</h3>
+		</div>
+		<div class="windowbg">
+			<?= Lang::getTxt('theme_adding', file: 'Themes') ?>
+		</div>
+<?php /* All the install options. */ ?>
+		<div id="admin_form_wrapper">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt('theme_install', file: 'Themes') ?>
+				</h3>
+			</div>
+			<div class="windowbg">
+<?php if (Utils::$context['can_create_new']): ?>
+<?php /* From a file. */ ?>
+				<fieldset>
+					<legend><?= Lang::getTxt('theme_install_file', file: 'Themes') ?></legend>
+					<form action="<?= Config::$scripturl ?>?action=admin;area=theme;sa=install;do=file" method="post" accept-charset="UTF-8" enctype="multipart/form-data" class="padding">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="<?= Utils::$context['admin-t-file_token_var'] ?>" value="<?= Utils::$context['admin-t-file_token'] ?>">
+						<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != ''; this.form.theme_dir.disabled = this.value != '';">
+						<input type="submit" name="save_file" value="<?= Lang::getTxt('upload', file: 'General') ?>" class="button">
+					</form>
+				</fieldset>
+<?php /* Copied from the default. */ ?>
+				<fieldset>
+					<legend><?= Lang::getTxt('theme_install_new', file: 'Themes') ?></legend>
+					<form action="<?= Config::$scripturl ?>?action=admin;area=theme;sa=install;do=copy" method="post" accept-charset="UTF-8" class="padding">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="<?= Utils::$context['admin-t-copy_token_var'] ?>" value="<?= Utils::$context['admin-t-copy_token'] ?>">
+						<input type="text" name="copy" id="copy" value="<?= Utils::$context['new_theme_name'] ?>" size="40">
+						<input type="submit" name="save_copy" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+					</form>
+				</fieldset>
+<?php endif; ?>
+<?php /* From a dir. */ ?>
+				<fieldset>
+					<legend><?= Lang::getTxt('theme_install_dir', file: 'Themes') ?></legend>
+					<form action="<?= Config::$scripturl ?>?action=admin;area=theme;sa=install;do=dir" method="post" accept-charset="UTF-8" class="padding">
+						<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+						<input type="hidden" name="<?= Utils::$context['admin-t-dir_token_var'] ?>" value="<?= Utils::$context['admin-t-dir_token'] ?>">
+						<input type="text" name="theme_dir" id="theme_dir" value="<?= Utils::$context['new_theme_dir'] ?>" size="40">
+						<input type="submit" name="save_dir" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+					</form>
+				</fieldset>
+			</div><!-- .windowbg -->
+		</div><!-- #admin_form_wrapper -->
+	<script>
+		window.smfForum_scripturl = smf_scripturl;
+		window.smfForum_sessionid = smf_session_id;
+		window.smfForum_sessionvar = smf_session_var;
+		window.smfThemes_writable = <?= Utils::$context['can_create_new'] ? 'true' : 'false' ?>;
+	</script>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/pick.php b/Themes/default/templates/Themes/pick.php
new file mode 100644
index 00000000000..b1a6a583a4e
--- /dev/null
+++ b/Themes/default/templates/Themes/pick.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This template allows for the selection of different themes ;)
+ */
+?>
+	<form action="<?= Config::$scripturl ?>?action=themechooser" method="post" accept-charset="UTF-8">
+<?php /* Just go through each theme and show its information - thumbnail, etc. */ ?>
+<?php for ($i = 0; $i < 2; $i++): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt($i == 0 ? 'current_theme' : 'theme_pick', file: 'Themes') ?></h3>
+		</div>
+		<div class="windowbg">
+<?php /* Just go through each theme and show its information - thumbnail, etc. */ ?>
+<?php foreach (Utils::$context['available_themes'] as $theme): ?>
+<?php if (($theme['selected'] && $i == 0) || (!$theme['selected'] && $i == 1)): ?>
+			<div class="title_bar">
+				<h3 class="titlebg">
+					<?= $theme['name'] ?>
+				</h3>
+			</div>
+			<div>
+				<small><i><?= $theme['description'] ?></i></small>
+<?php if (!empty($theme['variants'])): ?>
+				<label><strong><?= $theme['pick_label'] ?></strong>
+					<select data-theme-id="<?= $theme['id'] ?>" name="vrt[<?= $theme['id'] ?>]">
+<?php foreach ($theme['variants'] as $key => $variant): ?>
+						<option value="<?= $key ?>"<?= $theme['selected_variant'] == $key ? ' selected' : '' ?> data-url="<?= $variant['thumbnail'] ?>"><?= $variant['label'] ?></option>
+<?php endforeach; ?>
+					</select>
+				</label>
+<?php endif; ?>
+				<div>
+					<input type="submit" name="save[<?= $theme['id'] ?>]" value="<?= Lang::getTxt('theme_set', file: 'Themes') ?>" class="button">
+					<a class="button" href="<?= Config::$scripturl ?>?action=theme;sa=pick;theme=<?= $theme['id'] ?>" id="theme_preview_<?= $theme['id'] ?>"><?= Lang::getTxt('theme_preview', file: 'Themes') ?></a>
+				</div>
+			</div>
+			<div>
+				<a href="<?= Config::$scripturl ?>?action=theme;sa=pick;u=<?= Utils::$context['current_member'] ?>;theme=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>" id="theme_thumb_preview_<?= $theme['id'] ?>" title="<?= Lang::getTxt('theme_preview', file: 'Themes') ?>">
+					<img src="<?= $theme['thumbnail_href'] ?>" id="theme_thumb_<?= $theme['id'] ?>" alt="" class="padding theme_thumbnail">
+				</a>
+			</div>
+<?php endif; ?>
+<?php endforeach; ?>
+		</div>
+<?php endfor; ?>
+<?php /* One set of these for the form, not one per pass of the loop above. */ ?>
+		<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+		<input type="hidden" name="<?= Utils::$context['pick-th_token_var'] ?>" value="<?= Utils::$context['pick-th_token'] ?>">
+		<input type="hidden" name="u" value="<?= Utils::$context['current_member'] ?>">
+	</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/reset_list.php b/Themes/default/templates/Themes/reset_list.php
new file mode 100644
index 00000000000..899743baffc
--- /dev/null
+++ b/Themes/default/templates/Themes/reset_list.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This lets you reset themes
+ */
+?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('themeadmin_reset_title', file: 'Admin') ?></h3>
+		</div>
+		<div class="information">
+			<?= Lang::getTxt('themeadmin_reset_tip', file: 'Themes') ?>
+		</div>
+		<div id="admin_form_wrapper">
+<?php /* Show each theme.... with X for delete and a link to settings. */ ?>
+<?php foreach (Utils::$context['themes'] as $theme): ?>
+			<div class="cat_bar">
+				<h3 class="catbg"><?= $theme['name'] ?></h3>
+			</div>
+			<div class="windowbg">
+				<ul>
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=reset"><?= Lang::getTxt('themeadmin_reset_defaults', file: 'Themes') ?></a> <em class="smalltext"><?= Lang::getTxt('themeadmin_reset_defaults_current', [$theme['num_default_options']], file: 'Themes') ?></em>
+					</li>
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=reset;who=1"><?= Lang::getTxt('themeadmin_reset_members', file: 'Themes') ?></a>
+					</li>
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= $theme['id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=reset;who=2;<?= Utils::$context['admin-stor_token_var'] ?>=<?= Utils::$context['admin-stor_token'] ?>" data-confirm="<?= Lang::getTxt('themeadmin_reset_remove_confirm', file: 'Themes') ?>" class="you_sure"><?= Lang::getTxt('themeadmin_reset_remove', file: 'Themes') ?></a> <em class="smalltext"><?= Lang::getTxt('themeadmin_reset_remove_current', [$theme['num_members']], file: 'Themes') ?></em>
+					</li>
+				</ul>
+			</div>
+<?php endforeach; ?>
+		</div><!-- #admin_form_wrapper -->
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/set_options.php b/Themes/default/templates/Themes/set_options.php
new file mode 100644
index 00000000000..1e507592acb
--- /dev/null
+++ b/Themes/default/templates/Themes/set_options.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This displays the form for setting theme options
+ */
+?>
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_settings']['theme_id'] ?>;sa=reset" method="post" accept-charset="UTF-8">
+			<input type="hidden" name="who" value="<?= Utils::$context['theme_options_reset'] ? 1 : 0 ?>">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<?= Lang::getTxt(Utils::$context['theme_options_reset'] ? 'themeadmin_reset_options_title' : 'theme_options_title', ['theme' => Utils::$context['theme_settings']['name']], file: 'Themes') ?>
+				</h3>
+			</div>
+			<div class="information noup">
+				<?= Lang::getTxt(Utils::$context['theme_options_reset'] ? 'themeadmin_reset_options_info' : 'theme_options_defaults', file: 'Themes') ?>
+			</div>
+			<div class="windowbg noup">
+				<dl class="settings"><?php
+$skeys = array_keys(Utils::$context['options']);
+$first_option_key = array_shift($skeys);
+$titled_section = false;
+?><?php foreach (Utils::$context['options'] as $i => $setting): ?><?php /* Just spit out separators and move on */ ?><?php if (empty($setting) || !is_array($setting)): ?><?php /* Insert a separator (unless this is the first item in the list) */ ?><?php if ($i !== $first_option_key): ?>
+				</dl>
+				<hr>
+				<dl class="settings"><?php endif; ?><?php /* Should we give a name to this section? */ ?><?php if (is_string($setting) && !empty($setting)): ?><?php $titled_section = true; ?>
+					<dt><strong><?= $setting ?></strong></dt>
+					<dd></dd><?php else: ?><?php $titled_section = false; ?><?php endif; ?><?php continue; ?><?php endif; ?>
+					<dt><?php /* Show the change option box? */ ?><?php if (Utils::$context['theme_options_reset']): ?>
+						<select name="<?= !empty($setting['default']) ? 'default_' : '' ?>options_master[<?= $setting['id'] ?>]" onchange="this.form.options_<?= $setting['id'] ?>.disabled = this.selectedIndex != 1;">
+							<option value="0" selected><?= Lang::getTxt('themeadmin_reset_options_none', file: 'Themes') ?></option>
+							<option value="1"><?= Lang::getTxt('themeadmin_reset_options_change', file: 'Themes') ?></option>
+							<option value="2"><?= Lang::getTxt('themeadmin_reset_options_default', file: 'Themes') ?></option>
+						</select><?php endif; ?>
+						<label for="options_<?= $setting['id'] ?>"><?= !$titled_section ? '<strong>' : '' ?><?= $setting['label'] ?><?= !$titled_section ? '</strong>' : '' ?></label><?php if (isset($setting['description'])): ?>
+						<br>
+						<span class="smalltext"><?= $setting['description'] ?></span><?php endif; ?>
+					</dt><?php /* Display checkbox options */ ?><?php if ($setting['type'] == 'checkbox'): ?>
+					<dd>
+						<input type="hidden" name="<?= (!empty($setting['default']) ? 'default_' : '') ?>options[<?= $setting['id'] ?>]" value="0">
+						<input type="checkbox" name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>"<?= !empty($setting['value']) ? ' checked' : '' ?><?= Utils::$context['theme_options_reset'] ? ' disabled' : '' ?> value="1" class="floatleft"><?php /* How about selection lists, we all love them */ ?><?php elseif ($setting['type'] == 'list'): ?>
+					<dd>
+						<select class="floatleft" name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>"<?= Utils::$context['theme_options_reset'] ? ' disabled' : '' ?>><?php foreach ($setting['options'] as $value => $label): ?>
+							<option value="<?= $value ?>"<?= $value == $setting['value'] ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+						</select><?php /* A textbox it is then */ ?><?php else: ?>
+					<dd><?php if (isset($setting['type']) && $setting['type'] == 'number'): ?><?php
+$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
+$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
+$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
+?>
+						<input type="number"<?= $min ?><?= $max ?><?= $step ?><?php elseif (isset($setting['type']) && $setting['type'] == 'url'): ?>
+						<input type="url"<?php else: ?>
+						<input type="text"<?php endif; ?> name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>" value="<?= $setting['value'] ?>"<?= $setting['type'] == 'number' ? ' size="5"' : '' ?><?= Utils::$context['theme_options_reset'] ? ' disabled' : '' ?>><?php endif; ?><?php /* End of this definition, close open dds */ ?>
+					</dd><?php endforeach; ?><?php /* Close the option page up */ ?>
+				</dl>
+				<input type="submit" name="submit" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-sto_token_var'] ?>" value="<?= Utils::$context['admin-sto_token'] ?>">
+			</div>
+		</form>
\ No newline at end of file
diff --git a/Themes/default/templates/Themes/set_settings.php b/Themes/default/templates/Themes/set_settings.php
new file mode 100644
index 00000000000..a3f06c57c99
--- /dev/null
+++ b/Themes/default/templates/Themes/set_settings.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The page for setting and managing theme settings.
+ */
+?>
+	<div id="admin_form_wrapper">
+		<form action="<?= Config::$scripturl ?>?action=admin;area=theme;sa=list;th=<?= Utils::$context['theme_settings']['theme_id'] ?>" method="post" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="<?= Config::$scripturl ?>?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><span class="main_icons help" title="<?= Lang::getTxt('help', file: 'General') ?>"></span></a> <?= Lang::getTxt('theme_settings_for', ['theme' => Utils::$context['theme_settings']['name']], file: 'Themes') ?>
+				</h3>
+			</div>
+			<div class="windowbg"><?php /* @todo Why can't I edit the default theme popup. */ ?><?php if (Utils::$context['theme_settings']['theme_id'] != 1): ?>
+				<div class="title_bar">
+					<h3 class="titlebg config_hd">
+						<?= Lang::getTxt('theme_edit', file: 'Themes') ?>
+					</h3>
+				</div>
+				<div class="windowbg">
+					<ul>
+						<li>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_settings']['theme_id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=edit;filename=index.template.php"><?= Lang::getTxt('theme_edit_index', file: 'Themes') ?></a>
+						</li>
+						<li>
+							<a href="<?= Config::$scripturl ?>?action=admin;area=theme;th=<?= Utils::$context['theme_settings']['theme_id'] ?>;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>;sa=edit;directory=css"><?= Lang::getTxt('theme_edit_style', file: 'Themes') ?></a>
+						</li>
+					</ul>
+				</div><?php endif; ?>
+				<div class="title_bar">
+					<h3 class="titlebg config_hd">
+						<?= Lang::getTxt('theme_url_config', file: 'Themes') ?>
+					</h3>
+				</div>
+				<dl class="settings">
+					<dt>
+						<label for="theme_name"><?= Lang::getTxt('actual_theme_name', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" id="theme_name" name="options[name]" value="<?= Utils::$context['theme_settings']['name'] ?>" size="32">
+					</dd>
+					<dt>
+						<label for="theme_url"><?= Lang::getTxt('actual_theme_url', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" id="theme_url" name="options[theme_url]" value="<?= Utils::$context['theme_settings']['actual_theme_url'] ?>" size="50">
+					</dd>
+					<dt>
+						<label for="images_url"><?= Lang::getTxt('actual_images_url', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" id="images_url" name="options[images_url]" value="<?= Utils::$context['theme_settings']['actual_images_url'] ?>" size="50">
+					</dd>
+					<dt>
+						<label for="theme_dir"><?= Lang::getTxt('actual_theme_dir', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="text" id="theme_dir" name="options[theme_dir]" value="<?= Utils::$context['theme_settings']['actual_theme_dir'] ?>" size="50">
+					</dd>
+				</dl><?php /* Do we allow theme variants? */ ?><?php if (!empty(Utils::$context['theme_variants'])): ?>
+				<div class="title_bar">
+					<h3 class="titlebg config_hd">
+						<?= Lang::getTxt('theme_variants', file: 'Themes') ?>
+					</h3>
+				</div>
+				<dl class="settings">
+					<dt>
+						<label for="variant"><?= Lang::getTxt('theme_variants_default', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)"><?php foreach (Utils::$context['theme_variants'] as $key => $variant): ?>
+							<option value="<?= $key ?>"<?= Utils::$context['default_variant'] == $key ? ' selected' : '' ?>><?= $variant['label'] ?></option><?php endforeach; ?>
+						</select>
+					</dd>
+					<dt>
+						<label for="disable_user_variant"><?= Lang::getTxt('theme_variants_user_disable', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" name="options[disable_user_variant]" value="0">
+						<input type="checkbox" name="options[disable_user_variant]" id="disable_user_variant"<?= !empty(Utils::$context['theme_settings']['disable_user_variant']) ? ' checked' : '' ?> value="1">
+					</dd>
+				</dl>
+				<img src="<?= Utils::$context['theme_variants'][Utils::$context['default_variant']]['thumbnail'] ?>" id="variant_preview" alt=""><?php endif; ?><?php /* Color modes for the theme? */ ?><?php if (!empty(Theme::$current->settings['has_dark_mode'])): ?>
+				<div class="title_bar">
+					<h3 class="titlebg config_hd">
+						<?= Lang::getTxt('theme_colormodes', file: 'Themes') ?>
+					</h3>
+				</div>
+				<dl class="settings">
+					<dt>
+						<label for="colormode"><?= Lang::getTxt('theme_colormode_default', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<select id="colormode" name="options[default_colormode]"><?php foreach (Theme::$current->settings['theme_colormodes'] as $mode): ?>
+							<option value="<?= $mode ?>"<?= Theme::$current->settings['default_colormode'] == $mode ? ' selected' : '' ?>><?= Lang::getTxt('colormode_' . $mode, file: 'Themes') ?></option><?php endforeach; ?>
+						</select>
+					</dd>
+					<dt>
+						<label for="disable_user_mode"><?= Lang::getTxt('theme_colormode_user_disable', file: 'Themes') ?></label>
+					</dt>
+					<dd>
+						<input type="hidden" name="options[disable_user_mode]" value="0">
+						<input type="checkbox" name="options[disable_user_mode]" id="disable_user_mode"<?= !empty(Utils::$context['theme_settings']['disable_user_mode']) ? ' checked' : '' ?> value="1">
+					</dd>
+				</dl><?php endif; ?>
+				<div class="title_bar">
+					<h3 class="titlebg config_hd">
+						<?= Lang::getTxt('theme_options', file: 'Themes') ?>
+					</h3>
+				</div>
+				<dl class="settings"><?php
+$skeys = array_keys(Utils::$context['settings']);
+$first_setting_key = array_shift($skeys);
+$titled_section = false;
+?><?php foreach (Utils::$context['settings'] as $i => $setting): ?><?php /* Is this a separator? */ ?><?php if (empty($setting) || !is_array($setting)): ?><?php /* We don't need a separator before the first list element */ ?><?php if ($i !== $first_setting_key): ?>
+				</dl>
+				<hr>
+				<dl class="settings"><?php endif; ?><?php /* Add a fake heading? */ ?><?php if (is_string($setting) && !empty($setting)): ?><?php $titled_section = true; ?>
+					<dt><strong><?= $setting ?></strong></dt>
+					<dd></dd><?php else: ?><?php $titled_section = false; ?><?php endif; ?><?php continue; ?><?php endif; ?>
+					<dt>
+						<label for="options_<?= $setting['id'] ?>"><?= !$titled_section ? '<strong>' : '' ?><?= $setting['label'] ?><?= !$titled_section ? '</strong>' : '' ?></label>:<?php if (isset($setting['description'])): ?><br>
+						<span class="smalltext"><?= $setting['description'] ?></span><?php endif; ?>
+					</dt><?php /* A checkbox? */ ?><?php if ($setting['type'] == 'checkbox'): ?>
+					<dd>
+						<input type="hidden" name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" value="0">
+						<input type="checkbox" name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>"<?= !empty($setting['value']) ? ' checked' : '' ?> value="1">
+					</dd><?php /* A list with options? */ ?><?php elseif ($setting['type'] == 'list'): ?>
+					<dd>
+						<select name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>"><?php foreach ($setting['options'] as $value => $label): ?>
+							<option value="<?= $value ?>"<?= $value == $setting['value'] ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+						</select>
+					</dd><?php /* A Textarea? */ ?><?php elseif ($setting['type'] == 'textarea'): ?>
+					<dd>
+						<textarea rows="4" style="width: 95%;" cols="40" name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>"><?= $setting['value'] ?></textarea>
+					</dd><?php /* A regular input box, then? */ ?><?php else: ?>
+					<dd><?php if (isset($setting['type']) && $setting['type'] == 'number'): ?><?php
+$min = isset($setting['min']) ? ' min="' . $setting['min'] . '"' : ' min="0"';
+$max = isset($setting['max']) ? ' max="' . $setting['max'] . '"' : '';
+$step = isset($setting['step']) ? ' step="' . $setting['step'] . '"' : '';
+?>
+						<input type="number"<?= $min ?><?= $max ?><?= $step ?><?php elseif (isset($setting['type']) && $setting['type'] == 'url'): ?>
+						<input type="url"<?php elseif (isset($setting['type']) && $setting['type'] == 'color'): ?>
+						<input type="color"<?php else: ?>
+						<input type="text"<?php endif; ?> name="<?= !empty($setting['default']) ? 'default_' : '' ?>options[<?= $setting['id'] ?>]" id="options_<?= $setting['id'] ?>" value="<?= $setting['value'] ?>"<?= $setting['type'] == 'number' ? '' : (empty($setting['size']) ? ' size="40"' : ' size="' . $setting['size'] . '"') ?>>
+					</dd><?php endif; ?><?php endforeach; ?>
+				</dl>
+				<input type="submit" name="save" value="<?= Lang::getTxt('save', file: 'General') ?>" class="button">
+				<input type="hidden" name="<?= Utils::$context['session_var'] ?>" value="<?= Utils::$context['session_id'] ?>">
+				<input type="hidden" name="<?= Utils::$context['admin-sts_token_var'] ?>" value="<?= Utils::$context['admin-sts_token'] ?>">
+			</div><!-- .windowbg -->
+		</form>
+	</div><!-- #admin_form_wrapper --><?php if (!empty(Utils::$context['theme_variants'])): ?>
+		<script>
+		var oThumbnails = {<?php
+// All the variant thumbnails.
+$count = 1;
+?><?php foreach (Utils::$context['theme_variants'] as $key => $variant): ?>
+
+			'<?= $key ?>': '<?= $variant['thumbnail'] ?>'<?= (count(Utils::$context['theme_variants']) == $count ? '' : ',') ?><?php $count++; ?><?php endforeach; ?>
+
+		}
+		</script><?php endif; ?>
diff --git a/Themes/default/templates/TimeZoneSelect/index.php b/Themes/default/templates/TimeZoneSelect/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/TimeZoneSelect/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/TimeZoneSelect/timezone_select.php b/Themes/default/templates/TimeZoneSelect/timezone_select.php
new file mode 100644
index 00000000000..d2408db5dad
--- /dev/null
+++ b/Themes/default/templates/TimeZoneSelect/timezone_select.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\TimeZone;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Template for a select menu to choose a time zone.
+ *
+ * @param string $name The name of the select menu.
+ * @param string $selection The currently selected time zone identifier.
+ * @param int $disabled If 0, the select is enabled. If 1, it is disabled.
+ *    If 2, it is disabled and cannot be re-enabled by JavaScript.
+ *    Default: 0.
+ * @param array $extra Key-value pairs for any extra attributes to set on the
+ *    select menu, where keys are attributes names. For boolean attributes, set
+ *    the value to true.
+ *    Default: ''.
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['disabled' => 0, 'extra' => []], EXTR_SKIP);
+?><?php
+$timezone_list = Utils::$context['all_timezones'] ?? TimeZone::list();
+$attributes = [
+	'name="' . $name . '"',
+	'id="' . $name . '"',
+];
+?><?php if ($disabled): ?><?php $attributes[] = 'disabled'; ?><?php endif; ?><?php if ($disabled > 1): ?><?php $attributes[] = 'data-force-disabled'; ?><?php endif; ?><?php foreach ($extra as $key => $value): ?><?php if (empty($value)): ?><?php continue; ?><?php endif; ?><?php if ($value === true): ?><?php $attributes[] = $key; ?><?php else: ?><?php $attributes[] = $key . '="' . $value . '"'; ?><?php endif; ?><?php endforeach; ?><?php
+// Setting width on selects inside floating elements can be flaky,
+// so we need to calculate the width value manually.
+$width = 0;
+?><?php foreach ($timezone_list as $list): ?><?php $width = max($width, max(array_map(fn($label) => Utils::entityStrlen($label), $list))); ?><?php endforeach; ?><?php $attributes[] = 'style="width:min(' . ($width * 0.9) . 'ch, 100%)'; ?>
+								<select <?= implode(' ', $attributes) ?>"><?php foreach ($timezone_list as $country => $list): ?>
+									<optgroup label="<?= $country ?>"><?php foreach ($list as $tzid => $label): ?>
+										<option<?= is_numeric($tzid) ? ' value="" disabled' : ' value="' . $tzid . '"' ?><?= $tzid === $selection ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+									</optgroup><?php endforeach; ?>
+								</select>
\ No newline at end of file
diff --git a/Themes/default/templates/Who/credits.php b/Themes/default/templates/Who/credits.php
new file mode 100644
index 00000000000..8ea39d93fc6
--- /dev/null
+++ b/Themes/default/templates/Who/credits.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This displays a nice credits page
+ */
+?>
+
+<?php /* The most important part - the credits :P. */ ?>
+	<div class="main_section" id="credits">
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('credits', file: 'Who') ?></h3>
+		</div>
+<?php foreach (Utils::$context['credits'] as $section): ?>
+<?php if (isset($section['pretext'])): ?>
+		<div class="windowbg">
+			<p><?= $section['pretext'] ?></p>
+		</div>
+<?php endif; ?>
+<?php if (isset($section['title'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= $section['title'] ?></h3>
+		</div>
+<?php endif; ?>
+		<div class="windowbg">
+			<dl>
+<?php foreach ($section['groups'] as $group): ?>
+				<dt>
+					<?= isset($group['title']) ? '<strong>' . $group['title'] . '</strong>' : '' ?>
+				</dt>
+				<dd><?= Lang::getTxt('credits_list', ['names' => Lang::sentenceList($group['members'])], file: 'Who') ?>
+				</dd>
+<?php endforeach; ?>
+			</dl>
+<?php if (isset($section['posttext'])): ?>
+				<p class="posttext"><?= $section['posttext'] ?></p>
+<?php endif; ?>
+		</div>
+<?php endforeach; ?>
+<?php /* Other software and graphics */ ?>
+<?php if (!empty(Utils::$context['credits_software_graphics'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('credits_software_graphics', file: 'Who') ?></h3>
+		</div>
+		<div class="windowbg">
+<?php if (!empty(Utils::$context['credits_software_graphics']['graphics'])): ?>
+			<dl>
+				<dt><strong><?= Lang::getTxt('credits_graphics', file: 'Who') ?></strong></dt>
+				<dd><?= implode('</dd><dd>', Utils::$context['credits_software_graphics']['graphics']) ?></dd>
+			</dl>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['credits_software_graphics']['software'])): ?>
+			<dl>
+				<dt><strong><?= Lang::getTxt('credits_software', file: 'Who') ?></strong></dt>
+				<dd><?= implode('</dd><dd>', Utils::$context['credits_software_graphics']['software']) ?></dd>
+			</dl>
+<?php endif; ?>
+<?php if (!empty(Utils::$context['credits_software_graphics']['fonts'])): ?>
+			<dl>
+				<dt><strong><?= Lang::getTxt('credits_fonts', file: 'Who') ?></strong></dt>
+				<dd><?= implode('</dd><dd>', Utils::$context['credits_software_graphics']['fonts']) ?></dd>
+			</dl>
+<?php endif; ?>
+		</div>
+<?php endif; ?>
+<?php /* How about Modifications, we all love em */ ?>
+<?php if (!empty(Utils::$context['credits_modifications']) || !empty(Utils::$context['copyrights']['mods'])): ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('credits_modifications', file: 'Who') ?></h3>
+		</div>
+		<div class="windowbg">
+			<ul>
+<?php /* Display the credits. */ ?>
+<?php if (!empty(Utils::$context['credits_modifications'])): ?>
+				<li><?= implode('</li><li>', Utils::$context['credits_modifications']) ?></li>
+<?php endif; ?>
+<?php /* Legacy. */ ?>
+<?php if (!empty(Utils::$context['copyrights']['mods'])): ?>
+				<li><?= implode('</li><li>', Utils::$context['copyrights']['mods']) ?></li>
+<?php endif; ?>
+			</ul>
+		</div>
+<?php endif; ?>
+<?php /* SMF itself */ ?>
+		<div class="cat_bar">
+			<h3 class="catbg"><?= Lang::getTxt('credits_forum', file: 'Who') ?></h3>
+		</div>
+		<div class="windowbg">
+			<?= Utils::$context['copyrights']['smf'] ?>
+		</div>
+	</div><!-- #credits -->
\ No newline at end of file
diff --git a/Themes/default/templates/Who/index.php b/Themes/default/templates/Who/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Who/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Who/main.php b/Themes/default/templates/Who/main.php
new file mode 100644
index 00000000000..cbe1969c290
--- /dev/null
+++ b/Themes/default/templates/Who/main.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This handles the Who's Online page
+ */
+?><?php /* Display the table header and linktree. */ ?>
+	<div class="main_section" id="whos_online">
+		<form action="<?= Config::$scripturl ?>?action=who" method="post" id="whoFilter" accept-charset="UTF-8">
+			<div class="cat_bar">
+				<h3 class="catbg"><?= Lang::getTxt('who_title', file: 'General') ?></h3>
+			</div>
+			<div id="mlist">
+				<div class="pagesection">
+					<div class="pagelinks floatleft"><?= Utils::$context['page_index'] ?></div>
+					<div class="selectbox floatright" id="upper_show">
+						<?= Lang::getTxt('who_show', file: 'Who') ?>
+						<select name="show_top" onchange="document.forms.whoFilter.show.value = this.value; document.forms.whoFilter.submit();"><?php foreach (Utils::$context['show_methods'] as $value => $label): ?>
+							<option value="<?= $value ?>" <?= $value == Utils::$context['show_by'] ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+						</select>
+						<noscript>
+							<input type="submit" name="submit_top" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button">
+						</noscript>
+					</div>
+				</div>
+				<table class="table_grid">
+					<thead>
+						<tr class="title_bar">
+							<th scope="col" class="lefttext" style="width: 40%;"><a href="<?= Config::$scripturl ?>?action=who;start=<?= Utils::$context['start'] ?>;show=<?= Utils::$context['show_by'] ?>;sort=user<?= Utils::$context['sort_direction'] != 'down' && Utils::$context['sort_by'] == 'user' ? '' : ';asc' ?>" rel="nofollow"><?= Lang::getTxt('who_user', file: 'Who') ?><?= Utils::$context['sort_by'] == 'user' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th>
+							<th scope="col" class="lefttext time" style="width: 10%;"><a href="<?= Config::$scripturl ?>?action=who;start=<?= Utils::$context['start'] ?>;show=<?= Utils::$context['show_by'] ?>;sort=time<?= Utils::$context['sort_direction'] == 'down' && Utils::$context['sort_by'] == 'time' ? ';asc' : '' ?>" rel="nofollow"><?= Lang::getTxt('who_time', file: 'Who') ?><?= Utils::$context['sort_by'] == 'time' ? '<span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '' ?></a></th>
+							<th scope="col" class="lefttext half_table"><?= Lang::getTxt('who_action', file: 'Who') ?></th>
+						</tr>
+					</thead>
+					<tbody><?php foreach (Utils::$context['members'] as $member): ?>
+						<tr class="windowbg">
+							<td><?php /* Guests can't be messaged. */ ?><?php if (!$member['is_guest']): ?>
+								<span class="contact_info floatright">
+									<?= Utils::$context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . Lang::getTxt('pm_online', file: 'General') . '">' : '' ?><span class="main_icons im_<?= ($member['online']['is_online'] == 1 ? 'on' : 'off') ?>" title="<?= Lang::getTxt('pm_online', file: 'General') ?>"></span><?= Utils::$context['can_send_pm'] ? '</a>' : '' ?>
+								</span><?php endif; ?>
+								<span class="member<?= $member['is_hidden'] ? ' hidden' : '' ?>">
+									<?= $member['is_guest'] ? $member['name'] : '<a href="' . $member['href'] . '" title="' . Lang::getTxt('view_profile_of_username', ['name' => $member['name']], file: 'General') . '"' . (empty($member['color']) ? '' : ' style="color: ' . $member['color'] . ';"') . '>' . $member['name'] . '</a>' ?>
+								</span><?php if (!empty($member['ip'])): ?>
+								(<a href="<?= Config::$scripturl ?>?action=<?= ($member['is_guest'] ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $member['id']) ?>;searchip=<?= $member['ip'] ?>"><?= str_replace(':', ':&ZeroWidthSpace;', $member['ip']) ?></a>)<?php endif; ?>
+							</td>
+							<td class="time"><?= $member['time'] ?></td>
+							<td><?php if (is_array($member['action'])): ?><?php $tag = !empty($member['action']['tag']) ? $member['action']['tag'] : 'span'; ?>
+								<<?= $tag ?><?= !empty($member['action']['class']) ? ' class="' . $member['action']['class'] . '"' : '' ?>>
+									<?= Lang::getTxt($member['action']['label'], file: 'Who') ?><?= (!empty($member['action']['error_message']) ? $member['action']['error_message'] : '') ?>
+								</<?= $tag ?>><?php else: ?><?= $member['action'] ?><?php endif; ?>
+							</td>
+						</tr><?php endforeach; ?><?php /* No members? */ ?><?php if (empty(Utils::$context['members'])): ?>
+						<tr class="windowbg">
+							<td colspan="3">
+							<?= Lang::getTxt('who_no_online_' . (Utils::$context['show_by'] == 'guests' || Utils::$context['show_by'] == 'spiders' ? Utils::$context['show_by'] : 'members'), file: 'Who') ?>
+							</td>
+						</tr><?php endif; ?>
+					</tbody>
+				</table>
+				<div class="pagesection" id="lower_pagesection">
+					<div class="pagelinks floatleft" id="lower_pagelinks"><?= Utils::$context['page_index'] ?></div>
+					<div class="selectbox floatright">
+						<?= Lang::getTxt('who_show', file: 'Who') ?>
+						<select name="show" onchange="document.forms.whoFilter.submit();"><?php foreach (Utils::$context['show_methods'] as $value => $label): ?>
+							<option value="<?= $value ?>" <?= $value == Utils::$context['show_by'] ? ' selected' : '' ?>><?= $label ?></option><?php endforeach; ?>
+						</select>
+						<noscript>
+							<input type="submit" value="<?= Lang::getTxt('go', file: 'General') ?>" class="button">
+						</noscript>
+					</div>
+				</div><!-- #lower_pagesection -->
+			</div><!-- #mlist -->
+		</form>
+	</div><!-- #whos_online -->
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/check_username.php b/Themes/default/templates/Xml/check_username.php
new file mode 100644
index 00000000000..a268511cfb2
--- /dev/null
+++ b/Themes/default/templates/Xml/check_username.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for instantly showing whether a username is valid on the registration page
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<username valid="<?= Utils::$context['valid_username'] ? 1 : 0 ?>"><?= Utils::cleanXml(Utils::$context['checked_username']) ?></username>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/generic_xml.php b/Themes/default/templates/Xml/generic_xml.php
new file mode 100644
index 00000000000..50cebeb8007
--- /dev/null
+++ b/Themes/default/templates/Xml/generic_xml.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This prints XML in its most generic form.
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?><?php /* Show the data. */ ?><?php $this->subTemplate('generic_xml_recursive', ['xml_data' => Utils::$context['xml_data'], 'parent_tag' => 'smf']); ?>
diff --git a/Themes/default/templates/Xml/generic_xml_recursive.php b/Themes/default/templates/Xml/generic_xml_recursive.php
new file mode 100644
index 00000000000..f4e4ef5e332
--- /dev/null
+++ b/Themes/default/templates/Xml/generic_xml_recursive.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Recursive function for displaying well-formed XML data.
+ *
+ * @param array $xml_data An array of XML data
+ * @param string $parent_tag The parent tag
+ * @param string $child_tag The child tag
+ * @param int $level How many levels to indent the code
+ * @param array $parent_attributes Attributes for the parent node
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['child_tag' => '', 'level' => 0, 'parent_attributes' => []], EXTR_SKIP);
+?><?php
+$level = max(0, $level);
+$indent = str_repeat("\t", $level);
+?><?= "\n" ?><?= $indent ?><<?= $parent_tag ?><?php foreach ($parent_attributes as $attr_key => $attr_value): ?> <?= htmlspecialchars(Utils::cleanXml($attr_key), ENT_XML1, 'UTF-8') ?>="<?= htmlspecialchars(Utils::cleanXml($attr_value), ENT_XML1, 'UTF-8') ?>"<?php endforeach; ?>><?php foreach ($xml_data as $key => $data): ?><?php /* Handle nested groups */ ?><?php if (is_array($data) && isset($data['identifier'], $data['children'])): ?><?php $node_attributes = $data['attributes'] ?? []; ?><?php $this->subTemplate('generic_xml_recursive', ['xml_data' => $data['children'], 'parent_tag' => $key, 'child_tag' => $data['identifier'] ?? null, 'level' => $level + 1, 'parent_attributes' => $node_attributes]); ?><?php /* Handle individual elements */ ?><?php elseif (is_array($data) && isset($data['value'])): ?><?= "\n" ?><?= $indent ?><?= "\t<" ?><?= ($data['identifier'] ?? $child_tag ?? $key) ?><?php if (isset($data['attributes'])): ?><?php foreach ($data['attributes'] as $attr_key => $attr_value): ?> <?= htmlspecialchars(Utils::cleanXml($attr_key), ENT_XML1, 'UTF-8') ?>="<?= htmlspecialchars(Utils::cleanXml($attr_value), ENT_XML1, 'UTF-8') ?>"<?php endforeach; ?><?php endif; ?><?php
+$escaped_value = Utils::cleanXml($data['value']);
+// Self-closing tag for empty value
+?><?php if ($escaped_value === ''): ?> /><?php else: ?><?php if (preg_match('/[<&>]/', $escaped_value)): ?>><![CDATA[<?= $escaped_value ?>]]><?php else: ?>><?= htmlspecialchars($escaped_value, ENT_XML1, 'UTF-8') ?><?php endif; ?></<?= ($data['identifier'] ?? $child_tag ?? $key) ?>><?php endif; ?><?php endif; ?><?php endforeach; ?><?= "\n" ?><?= $indent ?></<?= $parent_tag ?>>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/index.php b/Themes/default/templates/Xml/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/Xml/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/Xml/jump_to.php b/Themes/default/templates/Xml/jump_to.php
new file mode 100644
index 00000000000..62d13644918
--- /dev/null
+++ b/Themes/default/templates/Xml/jump_to.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for the Jump To box
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf><?php foreach (Utils::$context['jump_to'] as $category): ?>
+	<item type="category" id="<?= $category['id'] ?>"><![CDATA[<?= Utils::cleanXml($category['name']) ?>]]></item><?php foreach ($category['boards'] as $board): ?>
+	<item type="board" id="<?= $board['id'] ?>" childlevel="<?= $board['child_level'] ?>" is_redirect="<?= (int) !empty($board['redirect']) ?>"><![CDATA[<?= Utils::cleanXml($board['name']) ?>]]></item><?php endforeach; ?><?php endforeach; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/message_icons.php b/Themes/default/templates/Xml/message_icons.php
new file mode 100644
index 00000000000..3d4dfb1f7b8
--- /dev/null
+++ b/Themes/default/templates/Xml/message_icons.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for displaying a column of message icons and selecting one via AJAX
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf><?php foreach (Utils::$context['icons'] as $icon): ?>
+	<icon value="<?= $icon['value'] ?>" url="<?= $icon['url'] ?>"><![CDATA[<?= Utils::cleanXml($icon['name']) ?>]]></icon><?php endforeach; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/modifydone.php b/Themes/default/templates/Xml/modifydone.php
new file mode 100644
index 00000000000..3c6140e9a43
--- /dev/null
+++ b/Themes/default/templates/Xml/modifydone.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for handling things when you're done editing a post inline
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<message id="msg_<?= Utils::$context['message']['id'] ?>"><?php if (empty(Utils::$context['message']['errors'])): ?><?php
+// Build our string of info about when and why it was modified
+$modified = empty(Utils::$context['message']['modified']['time']) ? '' : Lang::getTxt('last_edit_by', ['time' => Utils::$context['message']['modified']['time'], 'member' => Utils::$context['message']['modified']['name']], file: 'General');
+$modified .= empty(Utils::$context['message']['modified']['reason']) ? '' : ' ' . Lang::getTxt('last_edit_reason', ['reason' => Utils::$context['message']['modified']['reason']], file: 'General');
+?>
+		<modified><![CDATA[<?= empty($modified) ? '' : Utils::cleanXml($modified) ?>]]></modified>
+		<subject is_first="<?= Utils::$context['message']['first_in_topic'] ? '1' : '0' ?>"><![CDATA[<?= Utils::cleanXml(Utils::$context['message']['subject']) ?>]]></subject>
+		<body><![CDATA[<?= Utils::$context['message']['body'] ?>]]></body>
+		<success><![CDATA[<?= Lang::getTxt('quick_modify_message', file: 'General') ?>]]></success><?php else: ?>
+		<error in_subject="<?= Utils::$context['message']['error_in_subject'] ? '1' : '0' ?>" in_body="<?= Utils::cleanXml(Utils::$context['message']['error_in_body']) ? '1' : '0' ?>"><![CDATA[<?= implode('<br />', Utils::$context['message']['errors']) ?>]]></error><?php endif; ?>
+	</message>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/modifyfast.php b/Themes/default/templates/Xml/modifyfast.php
new file mode 100644
index 00000000000..4bee1170897
--- /dev/null
+++ b/Themes/default/templates/Xml/modifyfast.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This defines the XML for the inline edit feature
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<subject><![CDATA[<?= Utils::cleanXml(Utils::$context['message']['subject']) ?>]]></subject>
+	<message id="msg_<?= Utils::$context['message']['id'] ?>"><![CDATA[<?= Utils::cleanXml(Utils::$context['message']['body']) ?>]]></message>
+	<reason time="<?= Utils::$context['message']['reason']['time'] ?>" name="<?= Utils::$context['message']['reason']['name'] ?>"><![CDATA[<?= Utils::cleanXml(Utils::$context['message']['reason']['text']) ?>]]></reason>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/modifytopicdone.php b/Themes/default/templates/Xml/modifytopicdone.php
new file mode 100644
index 00000000000..43f22f5951a
--- /dev/null
+++ b/Themes/default/templates/Xml/modifytopicdone.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This handles things when editing a topic's subject from the messageindex.
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<message id="msg_<?= Utils::$context['message']['id'] ?>"><?php if (empty(Utils::$context['message']['errors'])): ?><?php
+// Build our string of info about when and why it was modified
+$modified = empty(Utils::$context['message']['modified']['time']) ? '' : Lang::getTxt('last_edit_by', ['time' => Utils::$context['message']['modified']['time'], 'member' => Utils::$context['message']['modified']['name']], file: 'General');
+$modified .= empty(Utils::$context['message']['modified']['reason']) ? '' : Lang::getTxt('last_edit_reason', ['reason' => Utils::$context['message']['modified']['reason']], file: 'General');
+?>
+		<modified><![CDATA[<?= empty($modified) ? '' : Utils::cleanXml('<em>' . $modified . '</em>') ?>]]></modified><?php if (!empty(Utils::$context['message']['subject'])): ?>
+		<subject><![CDATA[<?= Utils::cleanXml(Utils::$context['message']['subject']) ?>]]></subject><?php endif; ?><?php else: ?>
+		<error in_subject="<?= Utils::$context['message']['error_in_subject'] ? '1' : '0' ?>"><![CDATA[<?= Utils::cleanXml(implode('<br />', Utils::$context['message']['errors'])) ?>]]></error><?php endif; ?>
+	</message>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/pm.php b/Themes/default/templates/Xml/pm.php
new file mode 100644
index 00000000000..8347ae33c87
--- /dev/null
+++ b/Themes/default/templates/Xml/pm.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * All the XML for previewing a PM
+ */
+?><?php /* @todo something could be removed...otherwise it can be merged again with template_post */ ?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<preview>
+		<subject><![CDATA[<?= Lang::getTxt('preview_subject', ['subject' => !empty(Utils::$context['preview_subject']) ? Utils::$context['preview_subject'] : Lang::getTxt('no_subject', file: 'General')]) ?>]]></subject>
+		<body><![CDATA[<?= Utils::$context['preview_message'] ?>]]></body>
+	</preview>
+	<errors serious="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1' ?>"><?php if (!empty(Utils::$context['post_error']['messages'])): ?><?php foreach (Utils::$context['post_error']['messages'] as $message): ?>
+		<error><![CDATA[<?= Utils::cleanXml($message) ?>]]></error><?php endforeach; ?><?php endif; ?>
+		<caption name="to" class="<?= isset(Utils::$context['post_error']['no_to']) ? 'error' : '' ?>" />
+		<caption name="bbc" class="<?= isset(Utils::$context['post_error']['no_bbc']) ? 'error' : '' ?>" />
+		<caption name="subject" class="<?= isset(Utils::$context['post_error']['no_subject']) ? 'error' : '' ?>" />
+		<caption name="question" class="<?= isset(Utils::$context['post_error']['no_question']) ? 'error' : '' ?>" /><?= isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? '
+		<post_error />' : '' ?>
+	</errors>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/post.php b/Themes/default/templates/Xml/post.php
new file mode 100644
index 00000000000..b208777e0c1
--- /dev/null
+++ b/Themes/default/templates/Xml/post.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The massive XML for previewing posts.
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<preview>
+		<subject><![CDATA[<?= Utils::$context['preview_subject'] ?>]]></subject>
+		<body><![CDATA[<?= Utils::$context['preview_message'] ?>]]></body>
+	</preview>
+	<errors serious="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1' ?>" topic_locked="<?= Utils::$context['locked'] ? '1' : '0' ?>"><?php if (!empty(Utils::$context['post_error'])): ?><?php foreach (Utils::$context['post_error'] as $message): ?>
+		<error><![CDATA[<?= Utils::cleanXml($message) ?>]]></error><?php endforeach; ?><?php endif; ?>
+		<caption name="guestname" class="<?= isset(Utils::$context['post_error']['long_name']) || isset(Utils::$context['post_error']['no_name']) || isset(Utils::$context['post_error']['bad_name']) ? 'error' : '' ?>" />
+		<caption name="email" class="<?= isset(Utils::$context['post_error']['no_email']) || isset(Utils::$context['post_error']['bad_email']) ? 'error' : '' ?>" />
+		<caption name="evtitle" class="<?= isset(Utils::$context['post_error']['no_event']) ? 'error' : '' ?>" />
+		<caption name="subject" class="<?= isset(Utils::$context['post_error']['no_subject']) ? 'error' : '' ?>" />
+		<caption name="question" class="<?= isset(Utils::$context['post_error']['no_question']) ? 'error' : '' ?>" /><?= isset(Utils::$context['post_error']['no_message']) || isset(Utils::$context['post_error']['long_message']) ? '
+		<post_error />' : '' ?>
+	</errors>
+	<last_msg><?= Utils::$context['topic_last_message'] ?? '0' ?></last_msg><?php if (!empty(Utils::$context['previous_posts'])): ?>
+	<new_posts><?php foreach (Utils::$context['previous_posts'] as $post): ?>
+		<post id="<?= $post['id'] ?>">
+			<time><![CDATA[<?= $post['time'] ?>]]></time>
+			<poster><![CDATA[<?= Utils::cleanXml($post['poster']) ?>]]></poster>
+			<message><![CDATA[<?= Utils::cleanXml($post['message']) ?>]]></message>
+			<is_ignored><?= $post['is_ignored'] ? '1' : '0' ?></is_ignored>
+		</post><?php endforeach; ?>
+	</new_posts><?php endif; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/quotefast.php b/Themes/default/templates/Xml/quotefast.php
new file mode 100644
index 00000000000..07a25921d78
--- /dev/null
+++ b/Themes/default/templates/Xml/quotefast.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This defines the XML for the AJAX quote feature
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<quote><?= Utils::cleanXml(Utils::$context['quote']['xml']) ?></quote>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/results.php b/Themes/default/templates/Xml/results.php
new file mode 100644
index 00000000000..16e96977bc3
--- /dev/null
+++ b/Themes/default/templates/Xml/results.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * XML for search results
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf><?php if (empty(Utils::$context['topics'])): ?>
+		<noresults><?= Lang::getTxt('search_no_results', file: 'General') ?></noresults><?php else: ?>
+		<results><?php while ($topic = Utils::$context['get_topics']()): ?>
+			<result>
+				<id><?= $topic['id'] ?></id>
+				<relevance><?= $topic['relevance'] ?></relevance>
+				<board>
+					<id><?= $topic['board']['id'] ?></id>
+					<name><?= Utils::cleanXml($topic['board']['name']) ?></name>
+					<href><?= $topic['board']['href'] ?></href>
+				</board>
+				<category>
+					<id><?= $topic['category']['id'] ?></id>
+					<name><?= Utils::cleanXml($topic['category']['name']) ?></name>
+					<href><?= $topic['category']['href'] ?></href>
+				</category>
+				<messages><?php foreach ($topic['matches'] as $message): ?>
+					<message>
+						<id><?= $message['id'] ?></id>
+						<subject><![CDATA[<?= Utils::cleanXml($message['subject_highlighted'] != '' ? $message['subject_highlighted'] : $message['subject']) ?>]]></subject>
+						<body><![CDATA[<?= Utils::cleanXml($message['body_highlighted'] != '' ? $message['body_highlighted'] : $message['body']) ?>]]></body>
+						<time><?= $message['time'] ?></time>
+						<timestamp><?= $message['timestamp'] ?></timestamp>
+						<start><?= $message['start'] ?></start>
+
+						<author>
+							<id><?= $message['member']['id'] ?></id>
+							<name><?= Utils::cleanXml($message['member']['name']) ?></name>
+							<href><?= $message['member']['href'] ?></href>
+						</author>
+					</message><?php endforeach; ?>
+				</messages>
+			</result><?php endwhile; ?>
+		</results><?php endif; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/sendbody.php b/Themes/default/templates/Xml/sendbody.php
new file mode 100644
index 00000000000..e589fa7a706
--- /dev/null
+++ b/Themes/default/templates/Xml/sendbody.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This defines the XML for sending the body of a message
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<message view="<?= Utils::$context['view'] ?>"><?= Utils::cleanXml(Utils::$context['message']) ?></message>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/split.php b/Themes/default/templates/Xml/split.php
new file mode 100644
index 00000000000..5bf3f8bd18a
--- /dev/null
+++ b/Themes/default/templates/Xml/split.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for selecting items to split
+ */
+?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<pageIndex section="not_selected" startFrom="<?= Utils::$context['not_selected']['start'] ?>"><![CDATA[<?= Utils::$context['not_selected']['page_index'] ?>]]></pageIndex>
+	<pageIndex section="selected" startFrom="<?= Utils::$context['selected']['start'] ?>"><![CDATA[<?= Utils::$context['selected']['page_index'] ?>]]></pageIndex><?php foreach (Utils::$context['changes'] as $change): ?><?php if ($change['type'] == 'remove'): ?>
+	<change id="<?= $change['id'] ?>" curAction="remove" section="<?= $change['section'] ?>" /><?php else: ?>
+	<change id="<?= $change['id'] ?>" curAction="insert" section="<?= $change['section'] ?>">
+		<subject><![CDATA[<?= Utils::cleanXml($change['insert_value']['subject']) ?>]]></subject>
+		<time><![CDATA[<?= Utils::cleanXml($change['insert_value']['time']) ?>]]></time>
+		<body><![CDATA[<?= Utils::cleanXml($change['insert_value']['body']) ?>]]></body>
+		<poster><![CDATA[<?= Utils::cleanXml($change['insert_value']['poster']) ?>]]></poster>
+	</change><?php endif; ?><?php endforeach; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/stats.php b/Themes/default/templates/Xml/stats.php
new file mode 100644
index 00000000000..5a4b08122cc
--- /dev/null
+++ b/Themes/default/templates/Xml/stats.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for hiding/showing stats sections via AJAX
+ */
+?><?php if (empty(Utils::$context['yearly'])): ?><?php return; ?><?php endif; ?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf><?php foreach (Utils::$context['yearly'] as $year): ?><?php foreach ($year['months'] as $month): ?>
+	<month id="<?= $month['date']['year'] ?><?= $month['date']['month'] ?>"><?php foreach ($month['days'] as $day): ?>
+		<day date="<?= $day['year'] ?>-<?= $day['month'] ?>-<?= $day['day'] ?>" new_topics="<?= $day['new_topics'] ?>" new_posts="<?= $day['new_posts'] ?>" new_members="<?= $day['new_members'] ?>" most_members_online="<?= $day['most_members_online'] ?>"<?= empty(Config::$modSettings['hitStats']) ? '' : ' hits="' . $day['hits'] . '"' ?> /><?php endforeach; ?>
+	</month><?php endforeach; ?><?php endforeach; ?>
+
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/Xml/warning.php b/Themes/default/templates/Xml/warning.php
new file mode 100644
index 00000000000..1162006e5b6
--- /dev/null
+++ b/Themes/default/templates/Xml/warning.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The XML for previewing a warning
+ */
+?><?php /* @todo something could be removed...otherwise it can be merged again with template_post */ ?><?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
+
+<smf>
+	<preview>
+		<subject><![CDATA[<?= Utils::$context['preview_subject'] ?>]]></subject>
+		<body><![CDATA[<?= Utils::$context['preview_message'] ?>]]></body>
+	</preview>
+	<errors serious="<?= empty(Utils::$context['error_type']) || Utils::$context['error_type'] != 'serious' ? '0' : '1' ?>"><?php if (!empty(Utils::$context['post_error']['messages'])): ?><?php foreach (Utils::$context['post_error']['messages'] as $message): ?>
+		<error><![CDATA[<?= Utils::cleanXml($message) ?>]]></error><?php endforeach; ?><?php endif; ?>
+	</errors>
+</smf>
\ No newline at end of file
diff --git a/Themes/default/templates/index.php b/Themes/default/templates/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/index/banned_warning_above.php b/Themes/default/templates/index/banned_warning_above.php
new file mode 100644
index 00000000000..c2c6e26593c
--- /dev/null
+++ b/Themes/default/templates/index/banned_warning_above.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Time;
+use SMF\User;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The upper part of the ban warning box
+ */
+?>
+	<div class="noticebox">
+		<p><?= Lang::getTxt('you_are_post_banned', ['name' => User::$me->is_guest ? Lang::getTxt('guest_title', file: 'General') : User::$me->name]) ?></p>
+<?php if (!empty($_SESSION['ban']['cannot_post']['reason'])): ?>
+		<p><?= $_SESSION['ban']['cannot_post']['reason'] ?></p>
+<?php endif; ?>
+<?php if (!empty($_SESSION['ban']['expire_time'])): ?>
+		<p><?= Lang::getTxt('your_ban_expires', ['datetime' => Time::create('@' . $_SESSION['ban']['expire_time'])->format(null, false)], file: 'General') ?></p>
+<?php else: ?>
+		<p><?= Lang::getTxt('your_ban_expires_never', file: 'General') ?></p>
+<?php endif; ?>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/index/banned_warning_below.php b/Themes/default/templates/index/banned_warning_below.php
new file mode 100644
index 00000000000..30de5aaf1d4
--- /dev/null
+++ b/Themes/default/templates/index/banned_warning_below.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The lower part of the ban warning box.
+ */
diff --git a/Themes/default/templates/index/body_above.php b/Themes/default/templates/index/body_above.php
new file mode 100644
index 00000000000..851da74b348
--- /dev/null
+++ b/Themes/default/templates/index/body_above.php
@@ -0,0 +1,167 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Time;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The upper part of the main template layer. This is the stuff that shows above the main forum content.
+ */
+?><?php /* Wrapper div now echoes permanently for better layout options. h1 a is now target for "Go up" links. */ ?>
+	<div id="top_section">
+		<div class="inner_wrap content_wrapper"><?php /* If the user is logged in, display some things that might be useful. */ ?><?php if (!User::$me->is_guest): ?><?php /* Firstly, the user's menu */ ?>
+			<ul class="floatleft" id="top_info">
+				<li>
+					<a href="<?= Config::$scripturl ?>?action=profile"<?= !empty(Utils::$context['self_profile']) ? ' class="active"' : '' ?> id="profile_menu_top"><?php if (!empty(User::$me->avatar)): ?><?= User::$me->avatar['image'] ?><?php endif; ?><span class="textmenu"><?= User::$me->name ?></span></a>
+					<div id="profile_menu" class="top_menu"></div>
+				</li><?php /* Secondly, PMs if we're doing them */ ?><?php if (Utils::$context['allow_pm']): ?>
+				<li>
+					<a href="<?= Config::$scripturl ?>?action=pm"<?= !empty(Utils::$context['self_pm']) ? ' class="active"' : '' ?> id="pm_menu_top">
+						<span class="main_icons inbox"></span>
+						<span class="textmenu"><?= Lang::getTxt('pm_short', file: 'General') ?></span><?= !empty(User::$me->unread_messages) ? '
+						<span class="amt">' . User::$me->unread_messages . '</span>' : '' ?>
+					</a>
+					<div id="pm_menu" class="top_menu scrollable"></div>
+				</li><?php endif; ?><?php /* Thirdly, alerts */ ?>
+				<li>
+					<a href="<?= Config::$scripturl ?>?action=profile;area=showalerts;u=<?= User::$me->id ?>"<?= !empty(Utils::$context['self_alerts']) ? ' class="active"' : '' ?> id="alerts_menu_top">
+						<span class="main_icons alerts"></span>
+						<span class="textmenu"><?= Lang::getTxt('alerts', file: 'General') ?></span><?= !empty(User::$me->alerts) ? '
+						<span class="amt">' . User::$me->alerts . '</span>' : '' ?>
+					</a>
+					<div id="alerts_menu" class="top_menu scrollable"></div>
+				</li><?php /* A logout button for people without JavaScript. */ ?><?php if (empty(Theme::$current->settings['login_main_menu'])): ?>
+				<li id="nojs_logout">
+					<a href="<?= Config::$scripturl ?>?action=logout;<?= Utils::$context['session_var'] ?>=<?= Utils::$context['session_id'] ?>"><?= Lang::getTxt('logout', file: 'General') ?></a>
+					<script>document.getElementById("nojs_logout").style.display = "none";</script>
+				</li><?php endif; ?><?php /* And now we're done. */ ?>
+			</ul><?php /* Otherwise they're a guest. Ask them to either register or login. */ ?><?php elseif (empty(Config::$maintenance)): ?><?php /* Some people like to do things the old-fashioned way. */ ?><?php if (!empty(Theme::$current->settings['login_main_menu'])): ?>
+			<ul class="floatleft">
+				<li class="welcome"><?= Lang::getTxt(
+				Utils::$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest',
+				[
+					'forum_name' => Utils::$context['forum_name_html_safe'],
+					'login_url' => Config::$scripturl . '?action=login',
+					'onclick' => 'return reqOverlayDiv(this.href, ' . Utils::escapeJavaScript(Lang::getTxt('login', file: 'General')) . ', \'login\');',
+					'register_url' => Config::$scripturl . '?action=signup',
+				],
+				file: 'General',
+			) ?></li>
+			</ul><?php else: ?>
+			<ul class="floatleft" id="top_info">
+				<li class="welcome">
+					<?= Lang::getTxt('welcome_to_forum', ['forum_name' => Utils::$context['forum_name_html_safe']], file: 'General') ?>
+				</li>
+				<li class="button_login">
+					<a href="<?= Config::$scripturl ?>?action=login" class="<?= Utils::$context['current_action'] == 'login' ? 'active' : 'open' ?>" onclick="return reqOverlayDiv(this.href, <?= Utils::escapeJavaScript(Lang::getTxt('login', file: 'General')) ?>, 'login');">
+						<span class="main_icons login"></span>
+						<span class="textmenu"><?= Lang::getTxt('login', file: 'General') ?></span>
+					</a>
+				</li><?php if (Utils::$context['can_register']): ?>
+				<li class="button_signup">
+					<a href="<?= Config::$scripturl ?>?action=signup" class="<?= Utils::$context['current_action'] == 'signup' ? 'active' : 'open' ?>">
+						<span class="main_icons regcenter"></span>
+						<span class="textmenu"><?= Lang::getTxt('register', file: 'General') ?></span>
+					</a>
+				</li><?php endif; ?>
+			</ul><?php endif; ?><?php else: ?><?php /* In maintenance mode, only login is allowed and don't show OverlayDiv */ ?>
+			<ul class="floatleft welcome">
+				<li><?= Lang::getTxt(
+			'welcome_guest',
+			[
+				'forum_name' => Utils::$context['forum_name_html_safe'],
+				'login_url' => Config::$scripturl . '?action=login',
+				'onclick' => 'return true;',
+			],
+			file: 'General',
+		) ?></li>
+			</ul><?php endif; ?><?php if (!empty(Config::$modSettings['userLanguage']) && !empty(Utils::$context['languages']) && count(Utils::$context['languages']) > 1): ?>
+			<form id="languages_form" method="get" class="floatright">
+				<select id="language_select" name="language" onchange="this.form.submit()"><?php foreach (Utils::$context['languages'] as $language): ?>
+					<option value="<?= $language['filename'] ?>"<?= isset(User::$me->language) && User::$me->language == $language['filename'] ? ' selected="selected"' : '' ?>><?= str_replace('-utf8', '', $language['name']) ?></option><?php endforeach; ?>
+				</select>
+				<noscript>
+					<input type="submit" value="<?= Lang::getTxt('quick_mod_go', file: 'General') ?>">
+				</noscript>
+			</form><?php endif; ?><?php if (Utils::$context['allow_search']): ?>
+			<form id="search_form" class="floatright" action="<?= Config::$scripturl ?>?action=search2" method="post" accept-charset="UTF-8">
+				<input type="search" name="search" value="">&nbsp;<?php
+// Using the quick search dropdown?
+$selected = !empty(Utils::$context['current_topic']) ? 'current_topic' : (!empty(Utils::$context['current_board']) ? 'current_board' : 'all');
+?>
+				<select name="search_selection">
+					<option value="all"<?= ($selected == 'all' ? ' selected' : '') ?>><?= Lang::getTxt('search_entireforum', file: 'General') ?> </option><?php /* Can't limit it to a specific topic if we are not in one */ ?><?php if (!empty(Utils::$context['current_topic'])): ?>
+					<option value="topic"<?= ($selected == 'current_topic' ? ' selected' : '') ?>><?= Lang::getTxt('search_thistopic', file: 'General') ?></option><?php endif; ?><?php /* Can't limit it to a specific board if we are not in one */ ?><?php if (!empty(Utils::$context['current_board'])): ?>
+					<option value="board"<?= ($selected == 'current_board' ? ' selected' : '') ?>><?= Lang::getTxt('search_thisboard', file: 'General') ?></option><?php endif; ?><?php /* Can't search for members if we can't see the memberlist */ ?><?php if (!empty(Utils::$context['allow_memberlist'])): ?>
+					<option value="members"<?= ($selected == 'members' ? ' selected' : '') ?>><?= Lang::getTxt('search_members', file: 'General') ?> </option><?php endif; ?>
+				</select><?php /* Search within current topic? */ ?><?php if (!empty(Utils::$context['current_topic'])): ?>
+				<input type="hidden" name="sd_topic" value="<?= Utils::$context['current_topic'] ?>"><?php /* If we're on a certain board, limit it to this board ;). */ ?><?php elseif (!empty(Utils::$context['current_board'])): ?>
+				<input type="hidden" name="sd_brd" value="<?= Utils::$context['current_board'] ?>"><?php endif; ?>
+				<input type="submit" name="search2" value="<?= Lang::getTxt('search', file: 'General') ?>" class="button">
+				<input type="hidden" name="advanced" value="0">
+			</form><?php endif; ?>
+		</div><!-- .inner_wrap -->
+	</div><!-- #top_section -->
+	<header id="header" class="content_wrapper">
+		<h1 class="forumtitle">
+			<a id="top" href="<?= Config::$scripturl ?>"><?= empty(Utils::$context['header_logo_url_html_safe']) ? Utils::$context['forum_name_html_safe'] : '<img src="' . Utils::$context['header_logo_url_html_safe'] . '" alt="' . Utils::$context['forum_name_html_safe'] . '">' ?></a>
+		</h1>
+		<?= empty(Theme::$current->settings['site_slogan']) ? '<img id="smflogo" src="' . Theme::$current->settings['images_url'] . '/smflogo.svg" alt="Simple Machines Forum" title="Simple Machines Forum">' : '<div id="siteslogan">' . Theme::$current->settings['site_slogan'] . '</div>' ?>
+	</header><?php
+// The menu is a band of its own across the page, with its contents lined up
+// with everything else by the wrapper inside it.
+?>
+	<nav id="main_menu" aria-label="<?= Lang::getTxt('mobile_user_menu', file: 'General') ?>">
+		<div class="content_wrapper">
+			<a class="mobile_user_menu">
+				<span class="menu_icon"></span>
+				<span class="text_menu"><?= Lang::getTxt('mobile_user_menu', file: 'General') ?></span>
+			</a>
+			<div id="mobile_user_menu" class="popup_container">
+				<div class="popup_window description">
+					<div class="popup_heading"><?= Lang::getTxt('mobile_user_menu', file: 'General') ?>
+						<a href="javascript:void(0);" class="main_icons hide_popup"></a>
+					</div>
+					<?php $this->subTemplate('menu'); ?>
+				</div>
+			</div>
+		</div>
+	</nav>
+	<div id="wrapper" class="content_wrapper">
+		<div id="inner_wrap"<?= User::$me->is_guest ? ' class="hide_720"' : '' ?>>
+			<div class="user">
+				<time datetime="<?= Time::gmstrftime('%FT%TZ') ?>"><?= Utils::$context['current_time'] ?></time><?php if (!User::$me->is_guest): ?>
+				<ul class="unread_links">
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=unread" title="<?= Lang::getTxt('unread_since_visit', file: 'General') ?>"><?= Lang::getTxt('view_unread_category', file: 'General') ?></a>
+					</li>
+					<li>
+						<a href="<?= Config::$scripturl ?>?action=unreadreplies" title="<?= Lang::getTxt('show_unread_replies', file: 'General') ?>"><?= Lang::getTxt('unread_replies', file: 'General') ?></a>
+					</li>
+				</ul><?php endif; ?>
+			</div><?php /* Show a random news item? (or you could pick one from news_lines...) */ ?><?php if (!empty(Theme::$current->settings['enable_news']) && !empty(Utils::$context['random_news_line'])): ?>
+			<div class="news">
+				<h2><?= Lang::getTxt('news', file: 'General') ?>: </h2>
+				<p><?= Utils::$context['random_news_line'] ?></p>
+			</div><?php endif; ?>
+		</div><!-- #inner_wrap --><?php $this->subTemplate('linktree'); ?><?php /* The main content should go here. */ ?>
+		<div id="content_section">
+			<main id="main_content_section">
\ No newline at end of file
diff --git a/Themes/default/templates/index/body_below.php b/Themes/default/templates/index/body_below.php
new file mode 100644
index 00000000000..6ff58e49c08
--- /dev/null
+++ b/Themes/default/templates/index/body_below.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The stuff shown immediately below the main content, including the footer
+ */
+?>
+			</main><!-- #main_content_section -->
+		</div><!-- #content_section -->
+	</div><!-- #wrapper -->
+</div><!-- #footerfix -->
+<?php /* Show the footer with copyright, terms and help links. */ ?>
+	<footer id="footer">
+		<div class="content_wrapper">
+<?php
+// The copyright at one end, the help links and the "Go to top" link at the
+// other. They used to be separated by literal pipes; the gap does that now.
+?>
+		<ul>
+			<li class="copyright"><?= Theme::copyright() ?></li>
+			<li class="helplinks">
+				<a href="<?= Config::$scripturl ?>?action=help"><?= Lang::getTxt('help', file: 'General') ?></a><?= (!empty(Config::$modSettings['requireAgreement'])) ? '
+				<a href="' . Config::$scripturl . '?action=agreement">' . Lang::getTxt('terms_and_rules', file: 'General') . '</a>' : '' ?>
+				<a href="#top_section"><?= Lang::getTxt('go_up', file: 'General') ?> &#9650;</a>
+			</li>
+		</ul>
+<?php /* Show the load time? */ ?>
+<?php if (Utils::$context['show_load_time']): ?>
+		<p><?= Lang::getTxt(
+			'page_created_full',
+			[
+				Utils::$context['load_time'],
+				Utils::$context['load_queries'],
+			],
+			file: 'General',
+		) ?></p>
+<?php endif; ?>
+		</div>
+	</footer><!-- #footer -->
\ No newline at end of file
diff --git a/Themes/default/templates/index/button_strip.php b/Themes/default/templates/index/button_strip.php
new file mode 100644
index 00000000000..683c6c50679
--- /dev/null
+++ b/Themes/default/templates/index/button_strip.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Generate a strip of buttons.
+ *
+ * @param array $button_strip An array with info for displaying the strip
+ * @param string $direction The direction
+ * @param array $strip_options Options for the button strip
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['direction' => '', 'strip_options' => []], EXTR_SKIP);
+?><?php if (!is_array($strip_options)): ?><?php $strip_options = []; ?><?php endif; ?><?php
+// Create the buttons...
+$buttons = [];
+?><?php foreach ($button_strip as $key => $value): ?><?php /* As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!) */ ?><?php if (!isset($value['test']) || !empty(Utils::$context[$value['test']])): ?><?php if (!isset($value['id'])): ?><?php $value['id'] = $key; ?><?php endif; ?><?php
+$button = '
+				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . (!empty($value['icon']) ? '<span class="main_icons ' . $value['icon'] . '"></span>' : '') . Lang::getTxt($value['text']) . '</a>';
+?><?php if (!empty($value['sub_buttons'])): ?><?php
+$button .= '
+					<div class="top_menu dropmenu ' . $key . '_dropdown">
+						<div class="viewport">
+							<div class="overview">';
+?><?php foreach ($value['sub_buttons'] as $element): ?><?php if (isset($element['test']) && empty(Utils::$context[$element['test']])): ?><?php continue; ?><?php endif; ?><?php
+$button .= '
+								<a href="' . $element['url'] . '"><strong>' . Lang::getTxt($element['text']) . '</strong>';
+?><?php if (Lang::txtExists($element['text'] . '_desc')): ?><?php $button .= '<br><span>' . Lang::getTxt($element['text'] . '_desc') . '</span>'; ?><?php endif; ?><?php $button .= '</a>'; ?><?php endforeach; ?><?php
+$button .= '
+							</div><!-- .overview -->
+						</div><!-- .viewport -->
+					</div><!-- .top_menu -->';
+?><?php endif; ?><?php $buttons[] = $button; ?><?php endif; ?><?php endforeach; ?><?php /* No buttons? No button strip either. */ ?><?php if (empty($buttons)): ?><?php return; ?><?php endif; ?>
+		<div class="buttonlist<?= !empty($direction) ? ' float' . $direction : '' ?>"<?= (empty($buttons) ? ' style="display: none;"' : '') ?><?= (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : '') ?>>
+			<?= implode('', $buttons) ?>
+		</div>
\ No newline at end of file
diff --git a/Themes/default/templates/index/html_above.php b/Themes/default/templates/index/html_above.php
new file mode 100644
index 00000000000..c572b013bb7
--- /dev/null
+++ b/Themes/default/templates/index/html_above.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The main sub template above the content.
+ */
+?><?php /* Show right to left, the language code, and the character set for ease of translating. */ ?><!DOCTYPE html>
+<html<?= Utils::$context['right_to_left'] ? ' dir="rtl"' : '' ?><?= !empty(Lang::getTxt('lang_locale', file: 'General')) ? ' lang="' . str_replace('_', '-', substr(Lang::getTxt('lang_locale', file: 'General'), 0, strcspn(Lang::getTxt('lang_locale', file: 'General'), '.'))) . '"' : '' ?><?= !empty(Theme::$current->settings['theme_variants']) ? ' data-variant=' . (Utils::$context['theme_variant'] ?: 'default') . '' : '' ?><?= !empty(Theme::$current->settings['has_dark_mode']) ? ' data-mode=' . (Utils::$context['theme_colormode'] ?? 'light') . '' : '' ?>>
+<head>
+	<meta charset="UTF-8"><?php
+/*
+		You don't need to manually load index.css, this will be set up for you.
+		Note that RTL will also be loaded for you.
+		To load other CSS and JS files you should use the functions
+		Theme::loadCSSFile() and Theme::loadJavaScriptFile() respectively.
+		This approach will let you take advantage of SMF's automatic CSS
+		minimization and other benefits. You can, of course, manually add any
+		other files you want after Theme::template_css() has been run.
+
+	*	Short example:
+			- CSS: Theme::loadCSSFile('filename.css', array('minimize' => true));
+			- JS:  Theme::loadJavaScriptFile('filename.js', array('minimize' => true));
+			You can also read more detailed usages of the parameters for these
+			functions on the SMF wiki.
+
+	*	Themes:
+			The most efficient way of writing multi themes is to use a master
+			index.css plus variant.css files. If you've set them up properly
+			(through Theme::$current->settings['theme_variants']), the variant files will be loaded
+			for you automatically.
+			Additionally, tweaking the CSS for the editor requires you to include
+			a custom 'jquery.sceditor.theme.css' file in the css folder if you need it.
+
+	*	MODs:
+			If you want to load CSS or JS files in here, the best way is to use the
+			'integrate_load_theme' hook for adding multiple files, or using
+			'integrate_pre_css_output', 'integrate_pre_javascript_output' for a single file.
+	*/
+?><?php /* load in any css from mods or themes so they can overwrite if wanted */ ?><?php Theme::template_css(); ?><?php /* load in any javascript files from mods and themes */ ?><?php Theme::template_javascript(); ?>
+	<title><?= Utils::$context['page_title_html_safe'] ?></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1"><?php /* Content related meta tags, like description, keywords, Open Graph stuff, etc... */ ?><?php foreach (Utils::$context['meta_tags'] as $meta_tag): ?>
+	<meta<?php foreach ($meta_tag as $meta_key => $meta_value): ?> <?= $meta_key ?>="<?= $meta_value ?>"<?php endforeach; ?>><?php endforeach; ?><?php
+/*	What is your Lollipop's color?
+		Theme Authors, you can change the color here to make sure your theme's main color gets visible on tab */
+?>
+	<meta name="theme-color" content="#557EA0"><?php /* Please don't index these Mr Robot. */ ?><?php if (!empty(Utils::$context['robot_no_index'])): ?>
+	<meta name="robots" content="noindex"><?php endif; ?><?php /* Present a canonical url for search engines to prevent duplicate content in their indices. */ ?><?php if (!empty(Utils::$context['canonical_url'])): ?>
+	<link rel="canonical" href="<?= Utils::$context['canonical_url'] ?>"><?php endif; ?><?php /* Show all the relative links, such as help, search, contents, and the like. */ ?>
+	<link rel="help" href="<?= Config::$scripturl ?>?action=help">
+	<link rel="contents" href="<?= Config::$scripturl ?>"><?= (Utils::$context['allow_search'] ? '
+	<link rel="search" href="' . Config::$scripturl . '?action=search">' : '') ?><?php /* If RSS feeds are enabled, advertise the presence of one. */ ?><?php if (!empty(Config::$modSettings['xmlnews_enable']) && (!empty(Config::$modSettings['allow_guestAccess']) || !User::$me->is_guest)): ?>
+	<link rel="alternate" type="application/rss+xml" title="<?= Utils::$context['forum_name_html_safe'] ?> - <?= Lang::getTxt('rss', file: 'General') ?>" href="<?= Config::$scripturl ?>?action=feed;type=rss2<?= !empty(Utils::$context['current_board']) ? ';board=' . Utils::$context['current_board'] : '' ?>">
+	<link rel="alternate" type="application/atom+xml" title="<?= Utils::$context['forum_name_html_safe'] ?> - <?= Lang::getTxt('atom', file: 'General') ?>" href="<?= Config::$scripturl ?>?action=feed;type=atom<?= !empty(Utils::$context['current_board']) ? ';board=' . Utils::$context['current_board'] : '' ?>"><?php endif; ?><?php /* If we're viewing a topic, these should be the previous and next topics, respectively. */ ?><?php if (!empty(Utils::$context['links']['next'])): ?>
+	<link rel="next" href="<?= Utils::$context['links']['next'] ?>"><?php endif; ?><?php if (!empty(Utils::$context['links']['prev'])): ?>
+	<link rel="prev" href="<?= Utils::$context['links']['prev'] ?>"><?php endif; ?><?php /* If we're in a board, or a topic for that matter, the index will be the board's index. */ ?><?php if (!empty(Utils::$context['current_board'])): ?>
+	<link rel="index" href="<?= Config::$scripturl ?>?board=<?= Utils::$context['current_board'] ?>.0"><?php endif; ?><?php /* Output any remaining HTML headers. (from mods, maybe?) */ ?><?= Utils::$context['html_headers'] ?>
+
+</head>
+<body id="<?= Utils::$context['browser_body_id'] ?>" class="action_<?= !empty(Utils::$context['current_action']) ? Utils::$context['current_action'] : (!empty(Utils::$context['current_board']) ?
+		'messageindex' : (!empty(Utils::$context['current_topic']) ? 'display' : 'home')) ?><?= !empty(Utils::$context['current_board']) ? ' board_' . Utils::$context['current_board'] : '' ?>">
+<div id="footerfix">
\ No newline at end of file
diff --git a/Themes/default/templates/index/html_below.php b/Themes/default/templates/index/html_below.php
new file mode 100644
index 00000000000..5125825fe27
--- /dev/null
+++ b/Themes/default/templates/index/html_below.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Theme;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * This shows any deferred JavaScript and closes out the HTML
+ */
+?><?php /* Load in any javascript that could be deferred to the end of the page */ ?><?php Theme::template_javascript(true); ?>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/Themes/default/templates/index/index.php b/Themes/default/templates/index/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/Themes/default/templates/index/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/Themes/default/templates/index/init.php b/Themes/default/templates/index/init.php
new file mode 100644
index 00000000000..677c888e1ff
--- /dev/null
+++ b/Themes/default/templates/index/init.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Theme;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*	This template is, perhaps, the most important template in the theme. It
+	contains the main template layer that displays the header and footer of
+	the forum, namely with main_above and main_below. It also contains the
+	menu sub template, which appropriately displays the menu; the init sub
+	template, which is there to set the theme up; (init can be missing.) and
+	the linktree sub template, which sorts out the link tree.
+
+	The init sub template should load any data and set any hardcoded options.
+
+	The main_above sub template is what is shown above the main content, and
+	should contain anything that should be shown up there.
+
+	The main_below sub template, conversely, is shown after the main content.
+	It should probably contain the copyright statement and some other things.
+
+	The linktree sub template should display the link tree, using the data
+	in the Utils::$context['linktree'] variable.
+
+	The menu sub template should display all the relevant buttons the user
+	wants and or needs.
+
+	For more information on the templating system, please see the site at:
+	https://www.simplemachines.org/
+*/
+/*
+ * Initialize the template... mainly little settings.
+ */
+?><?php
+/* $context, $options and $txt may be available for use, but may not be fully populated yet. */
+// The version this template/theme is for. This should probably be the version of SMF it was created for.
+Theme::$current->settings['theme_version'] = '2.1';
+/*
+	 * Whether this theme supports a dark mode.
+	 *
+	 * Set this to `false` to disable.
+	 *
+	 * A not so trivial note:
+	 * A 'dark' theme with dark mode is exactly the same as a 'light'
+	 * theme with dark mode. This means the index.css file should
+	 * always contain the light colors.
+	 */
+Theme::$current->settings['has_dark_mode'] = true;
+/*
+	 * Define the theme variants. Each variant has its own CSS file.
+	 *
+	 * Example:
+	 * - index_red.css is loaded when the user selects the `red` variant.
+	 *
+	 * Additionally, a variants.css file is always loaded as well, in
+	 * case you'd rather keep the styles in a single file or they're minimal.
+	 */
+Theme::$current->settings['theme_variants'] = [];
+// Set the following variable to true if this theme wants to display the avatar of the user that posted the last and the first post on the message index and recent pages.
+Theme::$current->settings['avatars_on_indexes'] = false;
+// Set the following variable to true if this theme wants to display the avatar of the user that posted the last post on the board index.
+Theme::$current->settings['avatars_on_boardIndex'] = false;
+// Set the following variable to true if this theme wants to display the login and register buttons in the main forum menu.
+Theme::$current->settings['login_main_menu'] = false;
+// This defines the formatting for the page indexes used throughout the forum.
+Theme::$current->settings['page_index'] = [
+	'extra_before' => '<span class="pages">' . Lang::getTxt('pages', file: 'General') . '</span>',
+	'previous_page' => '<span class="main_icons previous_page"></span>',
+	'current_page' => '<span class="current_page">%1$d</span> ',
+	'page' => '<a class="nav_page" href="{URL}">%2$s</a> ',
+	'expand_pages' => '<span class="expand_pages" onclick="expandPages(this, {LINK}, {FIRST_PAGE}, {LAST_PAGE}, {PER_PAGE});"> ... </span>',
+	'next_page' => '<span class="main_icons next_page"></span>',
+	'extra_after' => '',
+];
+// Allow css/js files to be disabled for this specific theme.
+// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
+?><?php if (!isset(Theme::$current->settings['disable_files'])): ?><?php Theme::$current->settings['disable_files'] = []; ?><?php endif; ?>
diff --git a/Themes/default/templates/index/linktree.php b/Themes/default/templates/index/linktree.php
new file mode 100644
index 00000000000..0a74150fdba
--- /dev/null
+++ b/Themes/default/templates/index/linktree.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show a linktree. This is that thing that shows "My Community | General Category | General Discussion"..
+ *
+ * @param bool $force_show Whether to force showing it even if settings say otherwise
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['force_show' => false], EXTR_SKIP);
+?><?php
+global $shown_linktree;
+// If linktree is empty, just return - also allow an override.
+?><?php if (empty(Utils::$context['linktree']) || (!empty(Utils::$context['dont_default_linktree']) && !$force_show)): ?><?php return; ?><?php endif; ?><?php
+// A breadcrumb trail is a landmark, and it is an ordered list rather than an
+// unordered one - "General Category" comes before "General Discussion".
+?>
+				<nav class="navigate_section" aria-label="<?= Lang::getTxt('breadcrumb', file: 'General') ?>">
+					<ol itemscope itemtype="https://schema.org/BreadcrumbList"><?php /* Each tree item has a URL and name. Some may have extra_before and extra_after. */ ?><?php foreach (Utils::$context['linktree'] as $link_num => $tree): ?>
+						<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"<?= ($link_num == count(Utils::$context['linktree']) - 1) ? ' class="last"' : '' ?>><?php
+// Don't show a separator for the first one.
+// Better here. Always points to the next level when the linktree breaks to a second line.
+// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
+?><?php if ($link_num != 0): ?>
+							<span class="dividers"><?= Utils::$context['right_to_left'] ? ' &#9668; ' : ' &#9658; ' ?></span><?php endif; ?><?php /* Show something before the link? */ ?><?php if (isset($tree['extra_before'])): ?><?= $tree['extra_before'] ?> <?php endif; ?><?php
+// Show the link, including a URL if it should have one. The itemprop
+// attributes let a search engine read the trail as a breadcrumb.
+?><?php if (isset($tree['url'])): ?>
+							<a itemprop="item" href="<?= $tree['url'] ?>"><span itemprop="name"><?= $tree['name'] ?></span></a><?php else: ?>
+							<span itemprop="name"><?= $tree['name'] ?></span><?php endif; ?><?php /* Where this one sits in the trail. Positions are 1 based. */ ?>
+							<meta itemprop="position" content="<?= $link_num + 1 ?>"><?php /* Show something after the link...? */ ?><?php if (isset($tree['extra_after'])): ?> <?= $tree['extra_after'] ?><?php endif; ?>
+						</li><?php endforeach; ?>
+					</ol>
+				</nav><!-- .navigate_section --><?php $shown_linktree = true; ?>
diff --git a/Themes/default/templates/index/maint_warning_above.php b/Themes/default/templates/index/maint_warning_above.php
new file mode 100644
index 00000000000..352e6c7fa24
--- /dev/null
+++ b/Themes/default/templates/index/maint_warning_above.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The upper part of the maintenance warning box
+ */
+?>
+	<div class="errorbox" id="errors">
+		<dl>
+			<dt>
+				<strong id="error_serious"><?= Lang::getTxt('forum_in_maintenance', file: 'General') ?></strong>
+			</dt>
+			<dd class="error" id="error_list">
+				<?= Lang::getTxt('maintenance_page', ['url' => Config::$scripturl . '?action=admin;area=serversettings;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']], file: 'General') ?>
+			</dd>
+		</dl>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/index/maint_warning_below.php b/Themes/default/templates/index/maint_warning_below.php
new file mode 100644
index 00000000000..8497e7002e2
--- /dev/null
+++ b/Themes/default/templates/index/maint_warning_below.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The lower part of the maintenance warning box.
+ */
diff --git a/Themes/default/templates/index/menu.php b/Themes/default/templates/index/menu.php
new file mode 100644
index 00000000000..978acd2d712
--- /dev/null
+++ b/Themes/default/templates/index/menu.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Show the menu up top. Something like [home] [help] [profile] [logout]...
+ */
+?>
+					<ul class="dropmenu menu_nav">
+<?php /* Note: Menu markup has been cleaned up to remove unnecessary spans and classes. */ ?>
+<?php foreach (Utils::$context['menu_buttons'] as $act => $button): ?>
+						<li class="button_<?= $act ?><?= !empty($button['sub_buttons']) ? ' subsections"' : '"' ?>>
+							<a<?= $button['active_button'] ? ' class="active"' : '' ?> href="<?= $button['href'] ?>"<?= isset($button['target']) ? ' target="' . $button['target'] . '"' : '' ?><?= isset($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '' ?>>
+								<?= $button['icon'] ?><span class="textmenu"><?= $button['title'] ?><?= !empty($button['amt']) ? ' <span class="amt">' . $button['amt'] . '</span>' : '' ?></span>
+							</a>
+<?php /* 2nd level menus */ ?>
+<?php if (!empty($button['sub_buttons'])): ?>
+							<ul>
+<?php foreach ($button['sub_buttons'] as $childbutton): ?>
+								<li<?= !empty($childbutton['sub_buttons']) ? ' class="subsections"' : '' ?>>
+									<a href="<?= $childbutton['href'] ?>"<?= isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '' ?><?= isset($childbutton['onclick']) ? ' onclick="' . $childbutton['onclick'] . '"' : '' ?>>
+										<?= $childbutton['title'] ?><?= !empty($childbutton['amt']) ? ' <span class="amt">' . $childbutton['amt'] . '</span>' : '' ?>
+									</a>
+<?php /* 3rd level menus :) */ ?>
+<?php if (!empty($childbutton['sub_buttons'])): ?>
+									<ul>
+<?php foreach ($childbutton['sub_buttons'] as $grandchildbutton): ?>
+										<li>
+											<a href="<?= $grandchildbutton['href'] ?>"<?= isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '' ?><?= isset($grandchildbutton['onclick']) ? ' onclick="' . $grandchildbutton['onclick'] . '"' : '' ?>>
+												<?= $grandchildbutton['title'] ?><?= !empty($grandchildbutton['amt']) ? ' <span class="amt">' . $grandchildbutton['amt'] . '</span>' : '' ?>
+											</a>
+										</li>
+<?php endforeach; ?>
+									</ul>
+<?php endif; ?>
+								</li>
+<?php endforeach; ?>
+							</ul>
+<?php endif; ?>
+						</li>
+<?php endforeach; ?>
+					</ul><!-- .menu_nav -->
\ No newline at end of file
diff --git a/Themes/default/templates/index/quickbuttons.php b/Themes/default/templates/index/quickbuttons.php
new file mode 100644
index 00000000000..51f26435496
--- /dev/null
+++ b/Themes/default/templates/index/quickbuttons.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\IntegrationHook;
+use SMF\Lang;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * Generate a list of quickbuttons.
+ *
+ * @param array $list_items An array with info for displaying the strip
+ * @param string $list_class Used for integration hooks and as a class name
+ * @param string $output_method Ignored: the buttons are output, and template_quickbuttons() returns them when asked.
+ */
+
+// The parameters that were not passed get the defaults they had as arguments.
+extract(['list_class' => null, 'output_method' => 'echo'], EXTR_SKIP);
+?><?php /* Enable manipulation with hooks */ ?><?php if (!empty($list_class)): ?><?php IntegrationHook::call('integrate_' . $list_class . '_quickbuttons', [&$list_items]); ?><?php endif; ?><?php /* Make sure the list has at least one shown item */ ?><?php foreach ($list_items as $key => $li): ?><?php /* Is there a sublist, and does it have any shown items */ ?><?php if ($key == 'more'): ?><?php foreach ($li as $subkey => $subli): ?><?php if (isset($subli['show']) && !$subli['show']): ?><?php unset($list_items[$key][$subkey]); ?><?php endif; ?><?php endforeach; ?><?php if (empty($list_items[$key])): ?><?php unset($list_items[$key]); ?><?php endif; ?><?php /* A normal list item */ ?><?php elseif (isset($li['show']) && !$li['show']): ?><?php unset($list_items[$key]); ?><?php endif; ?><?php endforeach; ?><?php /* Now check if there are any items left */ ?><?php if (empty($list_items)): ?><?php return; ?><?php endif; ?><?php /* Print the quickbuttons */ ?><?php
+$output = '
+		<ul class="quickbuttons' . (!empty($list_class) ? ' quickbuttons_' . $list_class : '') . '">';
+// This is used for a list item or a sublist item
+$list_item_format = function ($li) {
+		$html = '
+			<li' . (!empty($li['class']) ? ' class="' . $li['class'] . '"' : '') . (!empty($li['id']) ? ' id="' . $li['id'] . '"' : '') . (!empty($li['custom']) ? ' ' . $li['custom'] : '') . '>';
+
+		if (isset($li['content'])) {
+			$html .= $li['content'];
+		} else {
+		$html .= '
+				<a href="' . (!empty($li['href']) ? $li['href'] : 'javascript:void(0);') . '"' . (!empty($li['javascript']) ? ' ' . $li['javascript'] : '') . '>
+					' . (!empty($li['icon']) ? '<span class="main_icons ' . $li['icon'] . '"></span>' : '') . (!empty($li['label']) ? $li['label'] : '') . '
+				</a>';
+		}
+
+		$html .= '
+			</li>';
+
+		return $html;
+	};
+?><?php foreach ($list_items as $key => $li): ?><?php /* Handle the sublist */ ?><?php if ($key == 'more'): ?><?php
+$output .= '
+			<li class="post_options">
+				<a href="javascript:void(0);">' . Lang::getTxt('post_options', file: 'General') . '</a>
+				<ul>';
+?><?php foreach ($li as $subli): ?><?php $output .= $list_item_format($subli); ?><?php endforeach; ?><?php
+$output .= '
+				</ul>
+			</li>';
+// Ordinary list item
+?><?php else: ?><?php $output .= $list_item_format($li); ?><?php endif; ?><?php endforeach; ?><?php
+$output .= '
+		</ul><!-- .quickbuttons -->';
+// There are a few spots where the result needs to be returned
+?><?= $output ?>
diff --git a/Themes/default/templates/index/security_warning_above.php b/Themes/default/templates/index/security_warning_above.php
new file mode 100644
index 00000000000..3cba4edeece
--- /dev/null
+++ b/Themes/default/templates/index/security_warning_above.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+use SMF\Lang;
+use SMF\Utils;
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The upper part of the security warning box
+ */
+?>
+	<div class="errorbox">
+		<p class="alert">!!</p>
+		<h3><?= Lang::getTxt(!isset(Utils::$context['warnings']['file']) && empty(Utils::$context['auth_secret_missing']) ? 'generic_warning' : 'security_risk', file: 'General') ?></h3>
+<?php foreach ((Utils::$context['warnings']['file'] ?? []) as $security_file): ?>
+		<p><?= Lang::getTxt($security_file[0], $security_file[1], file: 'General') ?></p>
+<?php endforeach; ?>
+<?php for ($i = 0, $n = count(Utils::$context['warnings']) - 1; $i < $n; $i++): ?>
+<?php if (is_string(Utils::$context['warnings'][$i])): ?>
+		<p><?= Utils::$context['warnings'][$i] ?></p>
+<?php else: ?>
+		<p><?= Lang::getTxt(Utils::$context['warnings'][$i][0], Utils::$context['warnings'][$i][1] ?? [], file: 'General') ?></p>
+<?php endif; ?>
+<?php endfor; ?>
+	</div>
\ No newline at end of file
diff --git a/Themes/default/templates/index/security_warning_below.php b/Themes/default/templates/index/security_warning_below.php
new file mode 100644
index 00000000000..8aa3c47823c
--- /dev/null
+++ b/Themes/default/templates/index/security_warning_below.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+if (!defined('SMF')) {
+	die('No direct access...');
+}
+
+/*
+ * The lower part of the security warning box.
+ */
diff --git a/composer.json b/composer.json
index b9f22a9ac6a..2692b6d644c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
 		"bjeavons/zxcvbn-php": "^1.0",
 		"google/recaptcha": "^1.3",
 		"league/container": "^4.0",
+		"league/plates": "^3.6",
 		"matthiasmullie/minify": "^1.3",
 		"matthiasmullie/path-converter": "^1.1"
 	},
diff --git a/composer.lock b/composer.lock
index d3d12406ee2..6228f7ded8f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f9d2858bac9dad4df280b40cb5714a8a",
+    "content-hash": "ad92ac01378c3517e8bfd6d923265285",
     "packages": [
         {
             "name": "bjeavons/zxcvbn-php",
@@ -197,6 +197,70 @@
             ],
             "time": "2025-05-20T12:55:37+00:00"
         },
+        {
+            "name": "league/plates",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/plates.git",
+                "reference": "12ee65166adbc6fb5916fb80b0c0758e49a2d996"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/plates/zipball/12ee65166adbc6fb5916fb80b0c0758e49a2d996",
+                "reference": "12ee65166adbc6fb5916fb80b0c0758e49a2d996",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "^1.6",
+                "phpunit/phpunit": "^11.4",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Plates\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonathan Reinink",
+                    "email": "jonathan@reinink.ca",
+                    "role": "Developer"
+                },
+                {
+                    "name": "RJ Garcia",
+                    "email": "ragboyjr@icloud.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Plates, the native PHP template system that's fast, easy to use and easy to extend.",
+            "homepage": "https://platesphp.com",
+            "keywords": [
+                "league",
+                "package",
+                "templates",
+                "templating",
+                "views"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/plates/issues",
+                "source": "https://github.com/thephpleague/plates/tree/v3.6.0"
+            },
+            "time": "2024-11-02T15:03:35+00:00"
+        },
         {
             "name": "matthiasmullie/minify",
             "version": "1.3.75",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8d9fe7313e0..fd802300bd5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -26,6 +26,16 @@
 
 		<testsuite name="http">
 			<directory>tests/Integration/Http</directory>
+			<exclude>tests/Integration/Http/Snapshot</exclude>
+		</testsuite>
+
+		<!--
+			What every page renders today, for checking a template conversion
+			against. Several hundred requests, so it has a suite of its own. See
+			tests/Integration/Http/Snapshot/SnapshotTestCase.php.
+		-->
+		<testsuite name="snapshot">
+			<directory>tests/Integration/Http/Snapshot</directory>
 		</testsuite>
 	</testsuites>
 	<source>
diff --git a/tests/Integration/Http/HttpTestCase.php b/tests/Integration/Http/HttpTestCase.php
index c0716b7b262..6577312de75 100644
--- a/tests/Integration/Http/HttpTestCase.php
+++ b/tests/Integration/Http/HttpTestCase.php
@@ -4,6 +4,7 @@
 
 namespace SMF\Tests\Integration\Http;
 
+use SMF\Db\DatabaseApi as Db;
 use SMF\Tests\Integration\IntegrationTestCase;
 use SMF\Tests\Support\HttpClient;
 use SMF\Tests\Support\HttpResponse;
@@ -20,20 +21,6 @@
  */
 abstract class HttpTestCase extends IntegrationTestCase
 {
-	/*****************
-	 * Class constants
-	 *****************/
-
-	/**
-	 * How long to wait out flood control, in seconds.
-	 *
-	 * Security::spamProtection() allows a moderator one login, post or search
-	 * every two seconds, counted per IP address - and every test here arrives
-	 * from the same one, back to back, far faster than a person would. Three
-	 * seconds clears the two second window with room to spare.
-	 */
-	protected const FLOOD_WAIT = 3;
-
 	/*********************
 	 * Internal properties
 	 *********************/
@@ -129,7 +116,21 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$this->http = self::$client_cache['guest'] ??= new HttpClient();
+		$this->http = $this->client();
+	}
+
+	/**
+	 * A browser for the test.
+	 *
+	 * Tests share one guest browser. A class whose browser signs in as
+	 * somebody has to give it one of its own, or every test after it would
+	 * be browsing as that member.
+	 *
+	 * @return HttpClient The browser.
+	 */
+	protected function client(): HttpClient
+	{
+		return self::$client_cache['guest'] ??= new HttpClient();
 	}
 
 	/**
@@ -159,13 +160,10 @@ protected function signInAsAdmin(bool $use_client_cache = true): HttpResponse
 		// Load a fresh token first.
 		$this->http->get('');
 
-		$response = $this->attemptSignIn();
-
-		if (self::isThrottled($response)) {
-			sleep(self::FLOOD_WAIT);
-
-			$response = $this->attemptSignIn();
-		}
+		$response = $this->submitForm($this->fetch('?action=login'), [
+			'user' => self::adminName(),
+			'passwrd' => self::adminPassword(),
+		], '//form[contains(@action, "action=login2")]');
 
 		// A password that does not match is a misconfigured forum rather than a
 		// regression, and failing every test in the file over it would say
@@ -188,12 +186,7 @@ protected function signInAsAdmin(bool $use_client_cache = true): HttpResponse
 	}
 
 	/**
-	 * Submits a form, waiting out flood control if it gets in the way.
-	 *
-	 * Tests do in half a second what a person would take a minute over, so they
-	 * trip SMF's flood protection routinely. That is the forum working, not a
-	 * regression, and the difference between a suite people trust and one that
-	 * fails now and then for reasons nobody can reproduce.
+	 * Submits a form, with flood control out of the way.
 	 *
 	 * @param HttpResponse $page The page holding the form.
 	 * @param array $overrides Values to change or add, including the button.
@@ -202,17 +195,30 @@ protected function signInAsAdmin(bool $use_client_cache = true): HttpResponse
 	 */
 	protected function submitForm(HttpResponse $page, array $overrides, string $xpath): HttpResponse
 	{
-		$response = $this->http->submit($page, $overrides, $xpath);
-
-		if (!self::isThrottled($response)) {
-			return $response;
-		}
+		$this->forgetFloodControl();
 
-		sleep(self::FLOOD_WAIT);
+		return $this->http->submit($page, $overrides, $xpath);
+	}
 
-		// The page has to be fetched again rather than resubmitted: its security
-		// token was spent on the attempt that just bounced.
-		return $this->http->submit($this->http->get($page->url), $overrides, $xpath);
+	/**
+	 * Forgets every recent login, post and search the forum is counting.
+	 *
+	 * Security::spamProtection() allows a moderator one login, post or search
+	 * every two seconds, counted per IP address, by keeping a row for each in
+	 * log_floodcontrol until it is old enough. Every test here arrives from the
+	 * same address, back to back, far faster than a person would, and being
+	 * turned away for it is the forum working rather than a regression. With
+	 * the rows gone there is nothing to wait out.
+	 *
+	 * The table only ever holds the last few seconds, so clearing all of it
+	 * takes nothing from anybody else.
+	 */
+	protected function forgetFloodControl(): void
+	{
+		Db::$db->query(
+			'DELETE FROM {db_prefix}log_floodcontrol',
+			[],
+		);
 	}
 
 	/**
@@ -281,37 +287,4 @@ protected function assertLooksLikeAForumPage(HttpResponse $response, string $whe
 			$where . ' rendered an error box: ' . $response->errorText(),
 		);
 	}
-
-	/**
-	 * One go at the login form.
-	 *
-	 * @return HttpResponse The response to the post.
-	 */
-	private function attemptSignIn(): HttpResponse
-	{
-		$form = $this->fetch('?action=login');
-
-		return $this->http->submit($form, [
-			'user' => self::adminName(),
-			'passwrd' => self::adminPassword(),
-		], '//form[contains(@action, "action=login2")]');
-	}
-
-	/*************************
-	 * Internal static methods
-	 *************************/
-
-	/**
-	 * Whether a response is SMF turning us away for going too fast.
-	 *
-	 * @param HttpResponse $response The response to look at.
-	 * @return bool Whether flood control rejected it.
-	 */
-	protected static function isThrottled(HttpResponse $response): bool
-	{
-		$error = $response->errorText();
-
-		return str_contains($error, 'You will have to wait')
-			|| str_contains($error, 'The last posting from your IP');
-	}
 }
diff --git a/tests/Integration/Http/Snapshot/AdminSnapshotTest.php b/tests/Integration/Http/Snapshot/AdminSnapshotTest.php
new file mode 100644
index 00000000000..49cd6488d50
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/AdminSnapshotTest.php
@@ -0,0 +1,341 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Integration\Http\Snapshot;
+
+use PHPUnit\Framework\Attributes\CoversNothing;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+/**
+ * The administration and moderation centres, and the parts of the forum only an
+ * administrator sees, as the templates render them today.
+ *
+ * Only pages reached by following a link. Nothing here submits a form or
+ * follows a link that does something, since the forum these run against is
+ * shared.
+ *
+ * Deliberately not here:
+ *
+ *  - Anything that fetches from simplemachines.org or a package server, since
+ *    what comes back is not ours to pin down and may not come back at all.
+ *  - The theme editor's view of a file, which shows the template's own source
+ *    and so changes, by design, with every template that is converted.
+ *  - The integration hooks list, which reads every source file on each request
+ *    and takes longer than the client waits over a Windows bind mount.
+ *  - phpinfo(), which describes the machine rather than the forum.
+ *  - The error log. Its filters are built from whatever has been logged, and an
+ *    empty log is a different page again, so it depends on what ran before it.
+ */
+#[CoversNothing]
+class AdminSnapshotTest extends SnapshotTestCase
+{
+	/*****************
+	 * Class constants
+	 *****************/
+
+	/**
+	 * What an admin page's snapshot covers: the page, without the menu beside
+	 * it, which is the same on every page and has a snapshot of its own.
+	 */
+	public const ADMIN = ['title', '.navigate_section', '#admin_content'];
+
+	/**
+	 * The rows of a log, which grows with everything anybody does. The list's
+	 * headings and filters are still compared.
+	 */
+	public const LOG_ROWS = ['table.table_grid tbody'];
+
+	/**
+	 * A list's page links, and the box below the list that only holds them,
+	 * neither of which is there at all until the list fills a second page.
+	 */
+	public const LIST_PAGES = ['.pagesection', 'table.table_grid + .flow_auto'];
+
+	/**
+	 * On a member's tracking pages, the addresses their errors came from and
+	 * the other members seen at theirs, which is everybody who ever posted
+	 * from the same machine.
+	 */
+	public const SHARED_ADDRESSES = ['#tracking dd:nth-of-type(n+3)'];
+
+	/**
+	 * Settings only one database engine has: PostgreSQL's fulltext search
+	 * language, and the rule above it.
+	 */
+	public const ENGINE_SETTINGS = ['hr:has(+ dl #search_language)', 'dl:has(#search_language)'];
+
+	/**
+	 * The permission profiles, which are loaded in no particular order and
+	 * come back from PostgreSQL in a different one from MySQL.
+	 */
+	public const PROFILE_LISTS = ['#admin_content table.table_grid tbody', 'select[name="copy_from"]', 'select[name="profile"]'];
+
+	/**
+	 * The list of every category and its boards on the board management page,
+	 * as a heading and a list for each category.
+	 */
+	public const CATEGORY_LIST = ['#admin_content .windowbg > .sub_bar', '#admin_content .windowbg > form'];
+
+	/**
+	 * The versions of the database, PHP, the web server and the extensions,
+	 * which describe the machine rather than the forum: Apache in the
+	 * container, PHP's own server in CI, and MySQL or PostgreSQL either way.
+	 */
+	public const SUPPORT_INFORMATION = [
+		'#admin_content .roundframe > .title_bar:not(#support_resources) + .padding',
+		'#admin_content script',
+	];
+
+	/**
+	 * Which cache accelerators PHP was built with, and the settings form, which
+	 * has a section for each one it found. The form is the same settings
+	 * template as every other settings page here.
+	 */
+	public const CACHE_SETTINGS = [
+		'#admin_content .information + .information',
+		'#admin_form_wrapper .windowbg',
+	];
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Each page renders as its recorded snapshot.
+	 *
+	 * Expected: for each case in pages(), the page at its path, seen by
+	 *           the administrator, reads the same as
+	 *           snapshots/admin/<name>.txt.
+	 */
+	#[DataProvider('pages')]
+	public function testThePageRendersAsItDid(string $name, string $path, array $roots = self::ADMIN, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		$this->assertPageMatchesSnapshot($name, $path, $roots, $ignore, $only, $unordered);
+	}
+
+	/**
+	 * The chrome around every page renders as its recorded snapshot.
+	 *
+	 * Expected: the board index, seen by the administrator, with
+	 *           #main_content_section left out, reads the same as
+	 *           snapshots/admin/chrome.txt.
+	 */
+	public function testTheChromeRendersAsItDid(): void
+	{
+		$this->assertPageMatchesSnapshot('chrome', '', self::CHROME, self::CHROME_IGNORE);
+	}
+
+	/**
+	 * The admin menu renders as its recorded snapshot.
+	 *
+	 * Expected: #genericmenu on ?action=admin reads the same as
+	 *           snapshots/admin/admin_menu.txt.
+	 */
+	public function testTheAdminMenuRendersAsItDid(): void
+	{
+		$this->assertPageMatchesSnapshot('admin_menu', '?action=admin', ['#genericmenu']);
+	}
+
+	/**
+	 * The moderation menu renders as its recorded snapshot.
+	 *
+	 * Expected: #genericmenu on ?action=moderate reads the same as
+	 *           snapshots/admin/moderation_menu.txt.
+	 */
+	public function testTheModerationMenuRendersAsItDid(): void
+	{
+		$this->assertPageMatchesSnapshot('moderation_menu', '?action=moderate', ['#genericmenu']);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	public static function audience(): string
+	{
+		return 'admin';
+	}
+
+	/**
+	 * The pages, as name, path, and optionally what to compare and what to
+	 * leave out of it.
+	 *
+	 * @return array The cases.
+	 */
+	public static function pages(): array
+	{
+		return self::cases([
+			// The forum, as an administrator sees it.
+			['board_index', '', self::BOARD_INDEX, self::BOARD_INDEX_IGNORE],
+			['message_index', '?board={board:Snapshot board}.0', self::PAGE],
+			['display', '?topic={topic:Snapshot topic}.0', self::PAGE],
+			['display_poll', '?topic={topic:Snapshot poll topic}.0', self::PAGE],
+			['post_edit', '?action=post;msg={first_msg:Snapshot topic};topic={topic:Snapshot topic}.0', self::PAGE],
+			['post_edit_poll', '?action=editpoll;topic={topic:Snapshot poll topic}.0', self::PAGE],
+			['split_topic', '?action=splittopics;topic={topic:Snapshot topic}.0;at={first_msg:Snapshot topic}', self::PAGE, [], [], ['.split_messages']],
+			['merge_topic', '?action=mergetopics;board={board:Snapshot board}.0;from={topic:Snapshot second topic}', self::PAGE, [], ['select[name="targetboard"] optgroup']],
+			['move_topic', '?action=movetopic;current_board={board:Snapshot board};topic={topic:Snapshot second topic}.0', self::PAGE, [], ['select[name="toboard"] optgroup']],
+			['track_ip', '?action=trackip;searchip=127.0.0.1', self::PAGE, self::LOG_ROWS, self::LIST_PAGES],
+
+			// A member's profile, as an administrator sees it.
+			['profile_summary', '?action=profile;u={member:snapshot_member}', self::PAGE],
+			['profile_account', '?action=profile;u={member:snapshot_member};area=account', self::PAGE],
+			['profile_forum', '?action=profile;u={member:snapshot_member};area=forumprofile', self::PAGE],
+			['profile_permissions', '?action=profile;u={member:snapshot_member};area=permissions', self::PAGE, [], [], ['table.table_grid tbody']],
+			['profile_issue_warning', '?action=profile;u={member:snapshot_member};area=issuewarning', self::PAGE],
+			['profile_track_activity', '?action=profile;u={member:snapshot_member};area=tracking;sa=activity', self::PAGE, [...self::LOG_ROWS, ...self::SHARED_ADDRESSES], self::LIST_PAGES],
+			['profile_track_ip', '?action=profile;u={member:snapshot_member};area=tracking;sa=ip', self::PAGE, self::LOG_ROWS, self::LIST_PAGES],
+			['profile_track_edits', '?action=profile;u={member:snapshot_member};area=tracking;sa=edits', self::PAGE, [...self::LOG_ROWS, ...self::SHARED_ADDRESSES], self::LIST_PAGES],
+			['profile_track_logins', '?action=profile;u={member:snapshot_member};area=tracking;sa=logins', self::PAGE, self::LOG_ROWS, self::LIST_PAGES],
+			['profile_delete', '?action=profile;u={member:snapshot_member};area=deleteaccount', self::PAGE],
+
+			// The moderation centre.
+			['moderate_index', '?action=moderate;area=index'],
+			['moderate_modlog', '?action=moderate;area=modlog', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['moderate_reported_posts', '?action=moderate;area=reportedposts'],
+			['moderate_reported_posts_closed', '?action=moderate;area=reportedposts;sa=closed'],
+			['moderate_reported_members', '?action=moderate;area=reportedmembers'],
+			['moderate_reported_members_closed', '?action=moderate;area=reportedmembers;sa=closed'],
+			['moderate_warnings', '?action=moderate;area=warnings'],
+			['moderate_warning_log', '?action=moderate;area=warnings;sa=log'],
+			['moderate_warning_templates', '?action=moderate;area=warnings;sa=templates'],
+			['moderate_group_requests', '?action=moderate;area=groups;sa=requests'],
+			['moderate_view_groups', '?action=moderate;area=viewgroups'],
+			['moderate_watched_members', '?action=moderate;area=userwatch;sa=member'],
+			['moderate_watched_posts', '?action=moderate;area=userwatch;sa=post'],
+			['moderate_unapproved_posts', '?action=moderate;area=postmod;sa=posts'],
+			['moderate_unapproved_topics', '?action=moderate;area=postmod;sa=topics'],
+			['moderate_unapproved_attachments', '?action=moderate;area=attachmod'],
+
+			// Administration: the centre itself.
+			['admin_index', '?action=admin'],
+			['admin_credits', '?action=admin;area=credits', self::ADMIN, self::SUPPORT_INFORMATION],
+
+			// Configuration.
+			// The time zones are named and ordered by whether daylight saving is
+			// in effect today, so the list changes with the seasons.
+			['features_basic', '?action=admin;area=featuresettings;sa=basic', self::ADMIN, ['#default_timezone']],
+			['features_bbc', '?action=admin;area=featuresettings;sa=bbc'],
+			['features_layout', '?action=admin;area=featuresettings;sa=layout'],
+			['features_sig', '?action=admin;area=featuresettings;sa=sig'],
+			['features_profile', '?action=admin;area=featuresettings;sa=profile'],
+			['features_profile_field_new', '?action=admin;area=featuresettings;sa=profileedit'],
+			['features_profile_field_edit', '?action=admin;area=featuresettings;sa=profileedit;fid=1'],
+			['features_likes', '?action=admin;area=featuresettings;sa=likes'],
+			['features_mentions', '?action=admin;area=featuresettings;sa=mentions'],
+			['features_alerts', '?action=admin;area=featuresettings;sa=alerts'],
+			['antispam', '?action=admin;area=antispam'],
+			['languages', '?action=admin;area=languages'],
+			['languages_add', '?action=admin;area=languages;sa=add'],
+			['languages_edit', '?action=admin;area=languages;sa=edit'],
+			['languages_settings', '?action=admin;area=languages;sa=settings'],
+			['server_general', '?action=admin;area=serversettings;sa=general'],
+			['server_database', '?action=admin;area=serversettings;sa=database', self::ADMIN, [], self::ENGINE_SETTINGS],
+			['server_cookie', '?action=admin;area=serversettings;sa=cookie'],
+			['server_security', '?action=admin;area=serversettings;sa=security'],
+			['server_cache', '?action=admin;area=serversettings;sa=cache', self::ADMIN, self::CACHE_SETTINGS],
+			['server_export', '?action=admin;area=serversettings;sa=export'],
+			['server_loads', '?action=admin;area=serversettings;sa=loads'],
+			['themes', '?action=admin;area=theme;sa=admin'],
+			['themes_list', '?action=admin;area=theme;sa=list'],
+			['themes_settings', '?action=admin;area=theme;sa=list;th=1'],
+			['themes_reset', '?action=admin;area=theme;sa=reset'],
+			['themes_reset_options', '?action=admin;area=theme;th=1;sa=reset;who=1'],
+			['themes_edit', '?action=admin;area=theme;sa=edit'],
+			['themes_copy', '?action=admin;area=theme;th=1;sa=copy'],
+			['modsettings', '?action=admin;area=modsettings;sa=general'],
+
+			// Layout.
+			['manage_boards', '?action=admin;area=manageboards;sa=main', self::ADMIN, [], self::CATEGORY_LIST],
+			['manage_boards_move', '?action=admin;area=manageboards;move={board:Snapshot child two}', self::ADMIN, [], self::CATEGORY_LIST],
+			['manage_boards_new_category', '?action=admin;area=manageboards;sa=newcat', self::ADMIN, [], ['select[name="cat_order"] option']],
+			['manage_boards_edit_category', '?action=admin;area=manageboards;sa=cat;cat={category}', self::ADMIN, [], ['select[name="cat_order"] option']],
+			['manage_boards_new_board', '?action=admin;area=manageboards;sa=newboard;cat={category}', self::ADMIN, [], ['select[name="new_cat"] option'], self::PROFILE_LISTS],
+			['manage_boards_edit_board', '?action=admin;area=manageboards;sa=board;boardid={board:Snapshot board}', self::ADMIN, [], ['select[name="new_cat"] option'], self::PROFILE_LISTS],
+			['manage_boards_settings', '?action=admin;area=manageboards;sa=settings', self::ADMIN, [], ['#recycle_board option']],
+			['news', '?action=admin;area=news;sa=editnews'],
+			['news_mailing', '?action=admin;area=news;sa=mailingmembers'],
+			['news_settings', '?action=admin;area=news;sa=settings'],
+			['post_settings', '?action=admin;area=postsettings;sa=posts'],
+			['post_settings_topics', '?action=admin;area=postsettings;sa=topics'],
+			['post_settings_drafts', '?action=admin;area=postsettings;sa=drafts'],
+			['post_settings_censor', '?action=admin;area=postsettings;sa=censor'],
+			['manage_calendar', '?action=admin;area=managecalendar'],
+			['manage_search', '?action=admin;area=managesearch;sa=method'],
+			['manage_search_settings', '?action=admin;area=managesearch;sa=settings'],
+			['manage_search_weights', '?action=admin;area=managesearch;sa=weights'],
+			['search_engines', '?action=admin;area=sengines'],
+			['smileys', '?action=admin;area=smileys;sa=editsets'],
+			['smileys_set', '?action=admin;area=smileys;sa=modifyset;set=fugue'],
+			['smileys_new_set', '?action=admin;area=smileys;sa=modifyset'],
+			['smileys_settings', '?action=admin;area=smileys;sa=settings'],
+			['attachments', '?action=admin;area=manageattachments;sa=attachments'],
+			['attachments_avatars', '?action=admin;area=manageattachments;sa=avatars'],
+			['attachments_browse', '?action=admin;area=manageattachments;sa=browse'],
+			['attachments_browse_avatars', '?action=admin;area=manageattachments;sa=browse;avatars'],
+			['attachments_browse_thumbs', '?action=admin;area=manageattachments;sa=browse;thumbs'],
+			['attachments_maintenance', '?action=admin;area=manageattachments;sa=maintenance'],
+			['attachments_paths', '?action=admin;area=manageattachments;sa=attachpaths'],
+
+			// Members.
+			['members', '?action=admin;area=viewmembers;sa=all', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['members_search', '?action=admin;area=viewmembers;sa=search'],
+			['members_settings', '?action=admin;area=viewmembers;sa=settings'],
+			['membergroups', '?action=admin;area=membergroups;sa=index'],
+			['membergroups_add', '?action=admin;area=membergroups;sa=add;generalgroup', self::ADMIN, [], ['li.category']],
+			['membergroups_add_post_group', '?action=admin;area=membergroups;sa=add;postgroup', self::ADMIN, [], ['li.category']],
+			['membergroups_edit', '?action=admin;area=membergroups;sa=edit;group=2', self::ADMIN, [], ['li.category']],
+			['membergroups_settings', '?action=admin;area=membergroups;sa=settings'],
+			['permissions', '?action=admin;area=permissions;sa=index'],
+			['permissions_group', '?action=admin;area=permissions;sa=modify;group=0'],
+			['permissions_board', '?action=admin;area=permissions;sa=board', self::ADMIN, [], ['#admin_content .windowbg > .sub_bar', '#admin_content ul.perm_boards']],
+			['permissions_profiles', '?action=admin;area=permissions;sa=profiles', self::ADMIN, [], [], self::PROFILE_LISTS],
+			['permissions_settings', '?action=admin;area=permissions;sa=settings'],
+			['registration', '?action=admin;area=regcenter;sa=register'],
+			['registration_agreement', '?action=admin;area=regcenter;sa=agreement'],
+			['registration_policy', '?action=admin;area=regcenter;sa=policy'],
+			['registration_reserved', '?action=admin;area=regcenter;sa=reservednames'],
+			['registration_settings', '?action=admin;area=regcenter;sa=settings'],
+			['bans', '?action=admin;area=ban;sa=list'],
+			['bans_add', '?action=admin;area=ban;sa=add'],
+			['bans_browse', '?action=admin;area=ban;sa=browse;entity=ip'],
+			['bans_log', '?action=admin;area=ban;sa=log', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['paid_subscriptions', '?action=admin;area=paidsubscribe'],
+			['warnings', '?action=admin;area=warnings'],
+
+			// Maintenance.
+			['maintain_routine', '?action=admin;area=maintain;sa=routine'],
+			['maintain_database', '?action=admin;area=maintain;sa=database'],
+			['maintain_members', '?action=admin;area=maintain;sa=members'],
+			// The board picker for pruning splits the categories into two
+			// columns by how many there are, so which column the fixtures land in
+			// is the forum's business. The same boards are in the two selects.
+			['maintain_topics', '?action=admin;area=maintain;sa=topics', self::ADMIN, ['#rotPanel > div'], ['#id_board_from optgroup', '#id_board_to optgroup']],
+			['scheduled_tasks', '?action=admin;area=scheduledtasks;sa=tasks', self::ADMIN, [], [], ['#scheduled_tasks tbody']],
+			['scheduled_task_edit', '?action=admin;area=scheduledtasks;sa=taskedit;tid=3'],
+			['scheduled_tasks_log', '?action=admin;area=scheduledtasks;sa=tasklog', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['scheduled_tasks_settings', '?action=admin;area=scheduledtasks;sa=settings'],
+			['logs_settings', '?action=admin;area=logs;sa=settings'],
+			['logs_admin', '?action=admin;area=logs;sa=adminlog', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['logs_moderation', '?action=admin;area=logs;sa=modlog', self::ADMIN, self::LOG_ROWS, self::LIST_PAGES],
+			['mail_queue', '?action=admin;area=mailqueue;sa=browse'],
+			['mail_settings', '?action=admin;area=mailqueue;sa=settings'],
+			['mail_test', '?action=admin;area=mailqueue;sa=test'],
+			['reports', '?action=admin;area=reports'],
+			['packages', '?action=admin;area=packages;sa=browse'],
+			['packages_options', '?action=admin;area=packages;sa=options'],
+		]);
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/CalendarSnapshotTest.php b/tests/Integration/Http/Snapshot/CalendarSnapshotTest.php
new file mode 100644
index 00000000000..b3ec30455d7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/CalendarSnapshotTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Integration\Http\Snapshot;
+
+use PHPUnit\Framework\Attributes\CoversNothing;
+use PHPUnit\Framework\Attributes\DataProvider;
+use SMF\Db\DatabaseApi as Db;
+
+/**
+ * The calendar, as the fixture member sees it, as the templates render it today.
+ *
+ * The calendar is off on a new forum, so this class turns it on for as long as
+ * it runs and puts the setting back afterwards. Every page looks at January
+ * 2020, where the fixture events are, so that nothing on it depends on today's
+ * date.
+ */
+#[CoversNothing]
+class CalendarSnapshotTest extends SnapshotTestCase
+{
+	/****************************
+	 * Internal static properties
+	 ****************************/
+
+	/**
+	 * @var string|null What cal_enabled was before this class changed it, or
+	 *     null when it has not.
+	 */
+	private static ?string $previous = null;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Each page renders as its recorded snapshot.
+	 *
+	 * Expected: for each case in pages(), the page at its path, seen by
+	 *           the fixture member, with the calendar turned on, reads the same as
+	 *           snapshots/member/<name>.txt.
+	 */
+	#[DataProvider('pages')]
+	public function testThePageRendersAsItDid(string $name, string $path, array $roots = self::PAGE, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		$this->assertPageMatchesSnapshot($name, $path, $roots, $ignore, $only, $unordered);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	public static function audience(): string
+	{
+		return 'member';
+	}
+
+	public static function tearDownAfterClass(): void
+	{
+		if (self::$previous !== null && isset(Db::$db)) {
+			self::setCalendar(self::$previous);
+			self::$previous = null;
+		}
+
+		parent::tearDownAfterClass();
+	}
+
+	/**
+	 * The pages, as name, path, and optionally what to compare and what to
+	 * leave out of it.
+	 *
+	 * @return array The cases.
+	 */
+	public static function pages(): array
+	{
+		return self::cases([
+			['calendar_month', '?action=calendar;year=2020;month=1;day=15'],
+			['calendar_week', '?action=calendar;viewweek;year=2020;month=1;day=20'],
+			['calendar_list', '?action=calendar;viewlist;year=2020;month=1;day=1'],
+			['calendar_post', '?action=calendar;sa=post'],
+		]);
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		if (self::$previous === null) {
+			self::$previous = $this->rawSetting('cal_enabled') ?? '0';
+			self::setCalendar('1');
+		}
+	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * Turns the calendar on or off.
+	 *
+	 * Written to the table rather than through Config::updateModSettings(),
+	 * which skips a value it believes is already set. IntegrationTestCase puts
+	 * Config::$modSettings back after every test, so by the time this class
+	 * finishes, the copy in memory says the calendar is off while the table
+	 * still says it is on, and the calendar would never be turned off again.
+	 *
+	 * @param string $value '1' or '0'.
+	 */
+	private static function setCalendar(string $value): void
+	{
+		Db::$db->insert(
+			'replace',
+			'{db_prefix}settings',
+			['variable' => 'string-255', 'value' => 'string-65534'],
+			[['cal_enabled', $value]],
+			['variable'],
+		);
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/GuestSnapshotTest.php b/tests/Integration/Http/Snapshot/GuestSnapshotTest.php
new file mode 100644
index 00000000000..69441989671
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/GuestSnapshotTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Integration\Http\Snapshot;
+
+use PHPUnit\Framework\Attributes\CoversNothing;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+/**
+ * The pages a visitor sees before signing in, as the templates render them today.
+ *
+ * Pages a guest is not allowed to see are here too, since the page that turns
+ * them away is a template as well.
+ */
+#[CoversNothing]
+class GuestSnapshotTest extends SnapshotTestCase
+{
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Each page renders as its recorded snapshot.
+	 *
+	 * Expected: for each case in pages(), the page at its path, seen by
+	 *           a guest, reads the same as
+	 *           snapshots/guest/<name>.txt.
+	 */
+	#[DataProvider('pages')]
+	public function testThePageRendersAsItDid(string $name, string $path, array $roots = self::PAGE, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		$this->assertPageMatchesSnapshot($name, $path, $roots, $ignore, $only, $unordered);
+	}
+
+	/**
+	 * The chrome around every page renders as its recorded snapshot.
+	 *
+	 * Expected: the board index, seen by a guest, with
+	 *           #main_content_section left out, reads the same as
+	 *           snapshots/guest/chrome.txt.
+	 */
+	public function testTheChromeRendersAsItDid(): void
+	{
+		$this->assertPageMatchesSnapshot('chrome', '', self::CHROME, self::CHROME_IGNORE);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	public static function audience(): string
+	{
+		return 'guest';
+	}
+
+	/**
+	 * The pages, as name, path, and optionally what to compare and what to
+	 * leave out of it.
+	 *
+	 * @return array The cases.
+	 */
+	public static function pages(): array
+	{
+		return self::cases([
+			// Browsing.
+			['board_index', '', self::BOARD_INDEX, self::BOARD_INDEX_IGNORE],
+			['message_index', '?board={board:Snapshot board}.0'],
+			['message_index_child', '?board={board:Snapshot child one}.0'],
+			['message_index_empty', '?board={board:Snapshot empty board}.0'],
+			['display', '?topic={topic:Snapshot topic}.0'],
+			['display_poll', '?topic={topic:Snapshot poll topic}.0'],
+			['display_child', '?topic={topic:Snapshot child topic}.0'],
+			['printpage', '?action=printpage;topic={topic:Snapshot topic}.0', self::WHOLE_PAGE],
+			['recent', '?action=recent;c={category}'],
+			['unread', '?action=unread'],
+			['post', '?action=post;board={board:Snapshot board}.0'],
+			['not_found', '?action=smf_snapshot_no_such_action'],
+			['no_such_topic', '?topic=999999999.0'],
+
+			// Signing in and up.
+			['login', '?action=login'],
+			['login_popup', '?action=login;ajax', self::WHOLE_PAGE],
+			['reminder', '?action=reminder'],
+			['activate', '?action=activate'],
+			['signup', '?action=signup'],
+			['agreement', '?action=agreement'],
+
+			// Everything else a guest can try.
+			['search', '?action=search', self::PAGE, [], ['.boardslist > ul > li']],
+			['search_results', '?action=search2;search=bold;brd[{board:Snapshot board}]={board:Snapshot board}'],
+			// Narrowed to the fixture members by a search, since the list of everybody
+			// grows a page at a time.
+			['member_list', '?action=mlist;sa=search;search=snapshot;fields=name'],
+			['profile', '?action=profile;u={member:snapshot_member}'],
+			['stats', '?action=stats'],
+			['groups', '?action=groups'],
+			['help', '?action=help'],
+			['help_popup', '?action=helpadmin;help=registration_agreement', self::WHOLE_PAGE],
+			['credits', '?action=credits'],
+			['theme_picker', '?action=theme;sa=pick'],
+		]);
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/MemberSnapshotTest.php b/tests/Integration/Http/Snapshot/MemberSnapshotTest.php
new file mode 100644
index 00000000000..f14d377a614
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/MemberSnapshotTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Integration\Http\Snapshot;
+
+use PHPUnit\Framework\Attributes\CoversNothing;
+use PHPUnit\Framework\Attributes\DataProvider;
+
+/**
+ * The pages an ordinary member sees, as the templates render them today.
+ *
+ * Signed in as the member fixture-forum.php registers, who has posted in the
+ * fixture boards and nowhere else, and has been sent one personal message.
+ */
+#[CoversNothing]
+class MemberSnapshotTest extends SnapshotTestCase
+{
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Each page renders as its recorded snapshot.
+	 *
+	 * Expected: for each case in pages(), the page at its path, seen by
+	 *           the fixture member, reads the same as
+	 *           snapshots/member/<name>.txt.
+	 */
+	#[DataProvider('pages')]
+	public function testThePageRendersAsItDid(string $name, string $path, array $roots = self::PAGE, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		$this->assertPageMatchesSnapshot($name, $path, $roots, $ignore, $only, $unordered);
+	}
+
+	/**
+	 * The chrome around every page renders as its recorded snapshot.
+	 *
+	 * Expected: the board index, seen by the fixture member, with
+	 *           #main_content_section left out, reads the same as
+	 *           snapshots/member/chrome.txt.
+	 */
+	public function testTheChromeRendersAsItDid(): void
+	{
+		$this->assertPageMatchesSnapshot('chrome', '', self::CHROME, self::CHROME_IGNORE);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	public static function audience(): string
+	{
+		return 'member';
+	}
+
+	/**
+	 * The pages, as name, path, and optionally what to compare and what to
+	 * leave out of it.
+	 *
+	 * @return array The cases.
+	 */
+	public static function pages(): array
+	{
+		return self::cases([
+			// Browsing.
+			['board_index', '', self::BOARD_INDEX, self::BOARD_INDEX_IGNORE],
+			['message_index', '?board={board:Snapshot board}.0'],
+			['message_index_child', '?board={board:Snapshot child one}.0'],
+			['message_index_empty', '?board={board:Snapshot empty board}.0'],
+			['display', '?topic={topic:Snapshot topic}.0'],
+			['display_poll', '?topic={topic:Snapshot poll topic}.0'],
+			['display_child', '?topic={topic:Snapshot child topic}.0'],
+			['printpage', '?action=printpage;topic={topic:Snapshot topic}.0', self::WHOLE_PAGE],
+			['recent', '?action=recent;c={category}'],
+			['unread', '?action=unread;boards={board:Snapshot board}'],
+			['unread_replies', '?action=unreadreplies;boards={board:Snapshot board}'],
+
+			// Posting.
+			['post_new_topic', '?action=post;board={board:Snapshot board}.0'],
+			['post_reply', '?action=post;topic={topic:Snapshot topic}.0'],
+			['post_new_poll', '?action=post;board={board:Snapshot board}.0;poll'],
+			['post_in_locked_topic', '?action=post;topic={topic:Snapshot poll topic}.0'],
+			['report_to_moderator', '?action=reporttm;topic={topic:Snapshot topic}.0;msg={first_msg:Snapshot topic}'],
+
+			// Personal messages.
+			['pm_inbox', '?action=pm'],
+			['pm_outbox', '?action=pm;f=sent'],
+			['pm_read', '?action=pm;pmsg={pm}'],
+			['pm_send', '?action=pm;sa=send'],
+			['pm_reply', '?action=pm;sa=send;f=inbox;pmsg={pm};quote;u={member:snapshot_other}'],
+			['pm_search', '?action=pm;sa=search'],
+			['pm_labels', '?action=pm;sa=manlabels'],
+			['pm_rules', '?action=pm;sa=manrules'],
+			['pm_settings', '?action=pm;sa=settings'],
+			['pm_prune', '?action=pm;sa=prune'],
+
+			// The member's own profile.
+			['profile_summary', '?action=profile'],
+			['profile_statistics', '?action=profile;area=statistics'],
+			['profile_posts', '?action=profile;area=showposts'],
+			['profile_topics', '?action=profile;area=showposts;sa=topics'],
+			['profile_attachments', '?action=profile;area=showposts;sa=attach'],
+			['profile_alerts', '?action=profile;area=showalerts'],
+			['profile_drafts', '?action=profile;area=showdrafts'],
+			['profile_permissions', '?action=profile;area=permissions', self::PAGE, [], [], ['table.table_grid tbody']],
+			['profile_account', '?action=profile;area=account'],
+			['profile_forum', '?action=profile;area=forumprofile'],
+			// The time zones are named and ordered by whether daylight saving is
+			// in effect today, so the list changes with the seasons.
+			['profile_theme', '?action=profile;area=theme', self::PAGE, ['#timezone']],
+			['profile_notification', '?action=profile;area=notification'],
+			['profile_notification_topics', '?action=profile;area=notification;sa=topics'],
+			['profile_notification_boards', '?action=profile;area=notification;sa=boards'],
+			['profile_ignore_boards', '?action=profile;area=ignoreboards'],
+			['profile_buddies', '?action=profile;area=lists;sa=buddies'],
+			['profile_ignore_list', '?action=profile;area=lists;sa=ignore'],
+			['profile_groups', '?action=profile;area=groupmembership'],
+			['profile_delete', '?action=profile;area=deleteaccount'],
+
+			// Somebody else's profile.
+			['other_profile_summary', '?action=profile;u={member:snapshot_other}'],
+			['other_profile_posts', '?action=profile;u={member:snapshot_other};area=showposts'],
+
+			// Everything else a member can reach.
+			['search', '?action=search', self::PAGE, [], ['.boardslist > ul > li']],
+			['search_results', '?action=search2;search=bold;brd[{board:Snapshot board}]={board:Snapshot board}'],
+			// Narrowed to the fixture members by a search, since the list of everybody
+			// grows a page at a time.
+			['member_list', '?action=mlist;sa=search;search=snapshot;fields=name'],
+			['member_list_search', '?action=mlist;sa=search'],
+			['groups', '?action=groups'],
+			['stats', '?action=stats'],
+			['help', '?action=help'],
+			['credits', '?action=credits'],
+			['likes', '?action=likes;sa=view;ltype=msg;like={first_msg:Snapshot topic}'],
+			['theme_picker', '?action=theme;sa=pick'],
+		]);
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/SnapshotTestCase.php b/tests/Integration/Http/Snapshot/SnapshotTestCase.php
new file mode 100644
index 00000000000..7fb740e5b6c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/SnapshotTestCase.php
@@ -0,0 +1,574 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Integration\Http\Snapshot;
+
+use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
+use SMF\Tests\Integration\Http\HttpTestCase;
+use SMF\Tests\Support\DomSnapshot;
+use SMF\Tests\Support\HttpClient;
+use SMF\Tests\Support\HttpResponse;
+
+/**
+ * Base class for the template snapshot tests.
+ *
+ * These pin down what the templates emit today, so that moving them to another
+ * template engine can be checked page by page: a page that renders differently
+ * afterwards fails, and the diff says what changed.
+ *
+ * What gets compared is DomSnapshot's description of the page, not the HTML,
+ * so whitespace, attribute order and the forum's own data do not count - see
+ * that class for the rules. Pages that list content are pointed at the content
+ * fixture-forum.php makes, so a snapshot does not change when somebody posts
+ * elsewhere on the forum.
+ *
+ * The errors a page logs are part of its snapshot too. A converted template that
+ * renders the same page while logging an undefined index has still regressed,
+ * and a page that logs something today is recorded as doing so rather than
+ * failing, which is the point of freezing the current state.
+ *
+ * To record the snapshots afresh, after a change that is meant to alter the
+ * output:
+ *
+ *   SMF_UPDATE_SNAPSHOTS=1 .dev/test.sh --engine mysql --testsuite snapshot
+ *
+ * and read the diff before committing it.
+ *
+ * To keep each page's HTML as well, for comparing two runs byte for byte, name
+ * a directory inside the checkout, so that the container can write to it. Not
+ * cache/, which the forum empties; logs/ is ignored by git and left alone:
+ *
+ *   SMF_SNAPSHOT_RAW=logs/raw-before .dev/test.sh --engine mysql --testsuite snapshot
+ *
+ * What the snapshots cannot make up for is configuration. The admin pages show
+ * the forum's settings, so a forum set up differently from a new one - with the
+ * admin password prompt switched off, say - reads differently there too. Record
+ * on a freshly installed forum, and compare against one; that is also what CI
+ * installs. Install with the web server's user, not root: a Settings_bak.php
+ * the forum cannot write puts a warning on every settings page.
+ */
+abstract class SnapshotTestCase extends HttpTestCase
+{
+	/*****************
+	 * Class constants
+	 *****************/
+
+	/**
+	 * What a page's snapshot covers unless told otherwise: its title, its
+	 * breadcrumbs and everything below them. The rest of the page is the same
+	 * on every page and has a snapshot of its own; see ChromeSnapshotTest.
+	 */
+	public const PAGE = ['title', '.navigate_section', '#content_section'];
+
+	/**
+	 * For pages that do not use the forum's layout at all, such as the
+	 * printable version of a topic.
+	 */
+	public const WHOLE_PAGE = ['head', 'body'];
+
+	/**
+	 * The layout around every page: the head, the header, the menu, the user
+	 * area and the footer. Each audience has one snapshot of it, taken on the
+	 * board index, rather than every page carrying its own copy.
+	 */
+	public const CHROME = ['head', 'body'];
+
+	/**
+	 * The page itself, which the other snapshots cover.
+	 */
+	public const CHROME_IGNORE = ['#main_content_section'];
+
+	/**
+	 * The board index, less every board that is not a fixture, since those are
+	 * somebody else's content.
+	 */
+	public const BOARD_INDEX = ['title', '#category_{category}', '#category_{category}_boards', '#info_center'];
+
+	/**
+	 * Who is online, and how many, which changes from one second to the next.
+	 * It is also where the wording changes between "1 guest" and "2 guests".
+	 */
+	public const BOARD_INDEX_IGNORE = ['#upshrink_stats > p:nth-of-type(2)'];
+
+	/**
+	 * Parts of the page that change between two identical requests whatever
+	 * the templates do.
+	 */
+	public const ALWAYS_IGNORE = [
+		// The verification honeypot, whose field Verifier names at random on
+		// every request so that a bot cannot learn to leave it alone.
+		'.vv_special input',
+
+		// The bar drawn for each entry of a top ten. A count of nothing draws
+		// an empty one, and whether any entry has a count of nothing depends
+		// on how busy the rest of the forum is.
+		'.statsbar > .bar',
+	];
+
+	/**
+	 * Parts of the page that are there or not depending on the forum's data,
+	 * and are left out without a trace.
+	 *
+	 * The count of unread messages or alerts beside a menu item, which is only
+	 * drawn when there are some.
+	 */
+	public const ALWAYS_DROP = ['.amt'];
+
+	/**
+	 * What every fixture's name starts with, for narrowing a list of everything
+	 * on the forum to the fixtures. See DomSnapshot::describe().
+	 */
+	public const FIXTURE_MARKER = 'Snapshot';
+
+	/**
+	 * Text that is the forum's data wherever it appears, and is not in a link
+	 * that DomSnapshot would recognise as such. See DomSnapshot::describe().
+	 *
+	 * A post count group changes as its member posts, so the administrator's
+	 * reads "Newbie" or "Hero Member" depending on how the forum has been used.
+	 * When a member was last active reads "Today" or "3 days ago" depending on
+	 * when the list is looked at.
+	 */
+	public const MASKS = ['.postgroup', 'td.last_active'];
+
+	/*********************
+	 * Internal properties
+	 *********************/
+
+	/**
+	 * @var int The last error logged before the page being compared was
+	 *     requested.
+	 */
+	private int $watermark = 0;
+
+	/****************************
+	 * Internal static properties
+	 ****************************/
+
+	/**
+	 * @var array|null Where the fixtures are, once they have been built.
+	 */
+	private static ?array $fixtures = null;
+
+	/**
+	 * @var array Signed in clients, by audience, shared by every test in the
+	 *     process. Signing in once per test would spend most of the run waiting
+	 *     for flood control.
+	 */
+	private static array $clients = [];
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Fetches a page and compares it with its snapshot.
+	 *
+	 * The status is part of the snapshot rather than asserted, so that a page
+	 * which today turns the visitor away, or redirects, is pinned down as doing
+	 * exactly that.
+	 *
+	 * @param string $name The snapshot's name, which is also its file name.
+	 * @param string $path The page, as HttpClient::get() takes it, with
+	 *     {board:Name}, {topic:Subject}, {member:name} and friends standing for
+	 *     the fixtures' ids.
+	 * @param array $roots What to compare. See DomSnapshot::describe().
+	 * @param array $ignore What to leave out.
+	 * @param array $only Lists of everything on the forum, to narrow to the
+	 *     entries that mention the fixtures.
+	 * @param array $unordered Lists in whatever order the database returns.
+	 */
+	public function assertPageMatchesSnapshot(string $name, string $path, array $roots = self::PAGE, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		// Some pages count as a search, and a search within a few seconds of the
+		// last is turned away. Pages follow each other faster than that.
+		$this->forgetFloodControl();
+
+		$this->assertMatchesSnapshot($name, $this->http->get($this->resolve($path)), $roots, $ignore, $only, $unordered);
+	}
+
+	/**
+	 * Compares a response with its snapshot.
+	 *
+	 * @param string $name The snapshot's name.
+	 * @param HttpResponse $response What came back.
+	 * @param array $roots What to compare.
+	 * @param array $ignore What to leave out.
+	 * @param array $only Lists to narrow to the fixtures.
+	 * @param array $unordered Lists in whatever order the database returns.
+	 */
+	public function assertMatchesSnapshot(string $name, HttpResponse $response, array $roots = self::PAGE, array $ignore = [], array $only = [], array $unordered = []): void
+	{
+		$actual = $this->describe($response, $roots, array_merge(static::ALWAYS_IGNORE, $ignore), $only, $unordered);
+		$file = $this->snapshotDirectory() . '/' . $name . '.txt';
+
+		// The page as it was sent, for comparing two runs byte for byte. A
+		// template rewritten to render exactly what it did before should leave
+		// nothing but sessions, tokens and times different.
+		if (($raw_dir = getenv('SMF_SNAPSHOT_RAW')) !== false && $raw_dir !== '') {
+			$raw_file = $raw_dir . '/' . static::audience() . '/' . $name . '.html';
+
+			if (!is_dir(\dirname($raw_file))) {
+				mkdir(\dirname($raw_file), 0o777, true);
+			}
+
+			file_put_contents($raw_file, $response->body);
+		}
+
+		if (getenv('SMF_UPDATE_SNAPSHOTS') === '1') {
+			if (!is_dir(\dirname($file))) {
+				mkdir(\dirname($file), 0o777, true);
+			}
+
+			file_put_contents($file, $actual);
+		}
+
+		if (!is_file($file)) {
+			$this->fail(
+				'there is no snapshot for ' . $name . ' yet. Record one with SMF_UPDATE_SNAPSHOTS=1 '
+				. 'and read it before committing it.',
+			);
+		}
+
+		$this->assertSame(
+			(string) file_get_contents($file),
+			$actual,
+			$name . ' (' . $response->url . ') no longer renders as it did. If the change is '
+			. 'intended, record it again with SMF_UPDATE_SNAPSHOTS=1.',
+		);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	/**
+	 * Who the tests in the class are looking at the forum as.
+	 *
+	 * @return string 'guest', 'member' or 'admin'.
+	 */
+	abstract public static function audience(): string;
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	/**
+	 * The audience's browser, once there is one.
+	 *
+	 * A new browser costs a request to arrive at the forum and more to sign in,
+	 * and at a second or so a page over a Windows bind mount, making one per test
+	 * only to throw it away doubled the time the suite took.
+	 *
+	 * The first one is a browser of its own rather than the guest browser the
+	 * other HTTP tests share, since the member audience signs it in.
+	 *
+	 * @return HttpClient The browser.
+	 */
+	protected function client(): HttpClient
+	{
+		return self::$clients[static::audience()] ?? new HttpClient();
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		self::$fixtures ??= $this->buildFixtures();
+
+		$audience = static::audience();
+
+		if (!isset(self::$clients[$audience])) {
+			// The first request of a new session regenerates it, so a page recorded
+			// or a token taken from that request belongs to a session that is
+			// already gone. Arrive at the forum the way a person would first.
+			$this->http->get('');
+
+			if ($audience === 'admin') {
+				// A browser of its own, not the administrator's browser the other
+				// HTTP tests share: passing the admin security check changes what
+				// its session can see.
+				$this->signInAsAdmin(false);
+				$this->passSecurity('?action=admin', self::adminPassword());
+			} elseif ($audience === 'member') {
+				$this->signInAsMember();
+				$this->passSecurity('?action=profile;area=account', (string) ($this->fixtures()['member_password'] ?? ''));
+			}
+
+			// signInAsAdmin() replaces the browser with the one it signs in, so the
+			// audience's browser is whichever is left once signing in is done.
+			self::$clients[$audience] = $this->http;
+		}
+
+		$this->http = self::$clients[$audience];
+
+		// The fixture member is signed in by one class and looked at by the
+		// others, which would then show them as online or not depending on the
+		// order the classes ran in and how long ago that was. Removing them from
+		// the who's online log makes them offline to everybody else, while
+		// leaving their session alone; their own next request puts them back.
+		Db::$db->query(
+			'DELETE FROM {db_prefix}log_online
+			WHERE id_member IN ({array_int:members})',
+			[
+				'members' => array_values($this->fixtures()['members'] ?? [0]),
+			],
+		);
+
+		// Taken after signing in, which is not what is being tested.
+		$row = $this->queryRow('SELECT COALESCE(MAX(id_error), 0) AS id_error FROM {db_prefix}log_errors');
+		$this->watermark = (int) ($row['id_error'] ?? 0);
+	}
+
+	/**
+	 * The fixtures, as fixture-forum.php described them.
+	 *
+	 * @return array The fixtures.
+	 */
+	protected function fixtures(): array
+	{
+		return self::$fixtures ?? [];
+	}
+
+	/**
+	 * Replaces the fixture placeholders in a path with ids.
+	 *
+	 * @param string $path The path.
+	 * @return string The path with ids in it.
+	 */
+	protected function resolve(string $path): string
+	{
+		$fixtures = $this->fixtures();
+
+		return (string) preg_replace_callback(
+			'~\{(board|topic|first_msg|member|category|admin|pm)(?::([^}]+))?\}~',
+			function (array $match) use ($fixtures, $path): string {
+				$id = match ($match[1]) {
+					'board' => $fixtures['boards'][$match[2]] ?? null,
+					'topic' => $fixtures['topics'][$match[2]] ?? null,
+					'first_msg' => $fixtures['first_msgs'][$match[2]] ?? null,
+					'member' => $fixtures['members'][$match[2]] ?? null,
+					'category' => $fixtures['category'] ?? null,
+					'admin' => $fixtures['admin'] ?? null,
+					'pm' => $fixtures['pm'] ?? null,
+				};
+
+				$this->assertNotNull($id, 'no fixture for ' . $match[0] . ' in ' . $path);
+
+				return (string) $id;
+			},
+			$path,
+		);
+	}
+
+	/**
+	 * Describes a response, with the errors it logged.
+	 *
+	 * @param HttpResponse $response The response.
+	 * @param array $roots What to describe.
+	 * @param array $ignore What to leave out.
+	 * @param array $only Lists to narrow to the fixtures.
+	 * @param array $unordered Lists in whatever order the database returns.
+	 * @return string The description.
+	 */
+	protected function describe(HttpResponse $response, array $roots, array $ignore, array $only = [], array $unordered = []): string
+	{
+		// Where the forum is installed shows up in the server settings, and is
+		// /var/www/html in the container and a runner's home directory in CI.
+		// The name is whatever it was installed with, and the image proxy's
+		// secret is made up by the installer and shown in the server settings.
+		$snapshot = new DomSnapshot([
+			$this->http->base_url => '{boardurl}',
+			Config::$boardurl => '{boardurl}',
+			Config::$boarddir => '{boarddir}',
+			Config::$mbname => '{forum_name}',
+			Config::$image_proxy_secret => '{secret}',
+		]);
+
+		// Described first, since that is what finds the session on the page for
+		// the masking of the location to use.
+		$body = $snapshot->describe(
+			$response->body,
+			array_map([$this, 'resolve'], $roots),
+			array_map([$this, 'resolve'], $ignore),
+			static::MASKS,
+			array_fill_keys($only, self::FIXTURE_MARKER) + array_fill_keys(static::ALWAYS_DROP, null),
+			$unordered,
+		);
+
+		$description = 'status ' . $response->status . "\n";
+
+		if (isset($response->headers['location'])) {
+			$description .= 'location ' . $snapshot->mask((string) $response->headers['location'], true) . "\n";
+		}
+
+		$description .= $body;
+
+		$errors = $this->loggedErrors($snapshot);
+
+		if ($errors !== []) {
+			$description .= "\n= errors logged\n" . implode("\n", $errors) . "\n";
+		}
+
+		return $description;
+	}
+
+	/**
+	 * What the forum logged since the test started, masked like the page.
+	 *
+	 * The file and line are left out, since they move whenever anything above
+	 * them in the file changes.
+	 *
+	 * @param DomSnapshot $snapshot For its masking rules.
+	 * @return array One line per distinct error, sorted.
+	 */
+	protected function loggedErrors(DomSnapshot $snapshot): array
+	{
+		$request = Db::$db->query(
+			'SELECT id_error, error_type, message
+			FROM {db_prefix}log_errors
+			WHERE id_error > {int:watermark}',
+			[
+				'watermark' => $this->watermark,
+			],
+		);
+
+		$errors = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			// Once a request has logged something the watermark moves on, so the
+			// next comparison in the same test only reports what came after it.
+			$this->watermark = max($this->watermark, (int) $row['id_error']);
+
+			$message = html_entity_decode((string) $row['message'], ENT_QUOTES | ENT_HTML5, 'UTF-8');
+			$message = trim((string) preg_replace('~\s+~u', ' ', strip_tags($message)));
+
+			$errors[] = '[' . trim((string) $row['error_type']) . '] ' . $snapshot->mask($message);
+		}
+
+		Db::$db->free_result($request);
+
+		$errors = array_unique($errors);
+		sort($errors);
+
+		return $errors;
+	}
+
+	/**
+	 * Where this class keeps its snapshots.
+	 *
+	 * @return string The directory.
+	 */
+	protected function snapshotDirectory(): string
+	{
+		return __DIR__ . '/snapshots/' . static::audience();
+	}
+
+	/**
+	 * Signs in as the fixture member.
+	 */
+	protected function signInAsMember(): void
+	{
+		$response = $this->submitForm($this->http->get('?action=login'), [
+			'user' => 'snapshot_member',
+			'passwrd' => (string) ($this->fixtures()['member_password'] ?? ''),
+		], '//form[contains(@action, "action=login2")]');
+
+		$this->assertSignedIn(true, 'could not sign in as the fixture member: ' . $response->errorText());
+	}
+
+	/**
+	 * Gets through the password prompt put in front of the admin area, and of
+	 * a member's own account settings, when the forum has it switched on.
+	 *
+	 * Once given, the password is good for the rest of the session, so the
+	 * pages behind it are compared rather than the prompt. A forum with the
+	 * prompt switched off never shows it, and the pages read the same.
+	 *
+	 * @param string $path A page behind the prompt.
+	 * @param string $password The password to give.
+	 */
+	protected function passSecurity(string $path, string $password): void
+	{
+		$page = $this->http->get($path);
+		$form = '//form[.//input[@name="admin_pass"]]';
+
+		if ($page->xpath($form)->length === 0) {
+			return;
+		}
+
+		$response = $this->submitForm($page, ['admin_pass' => $password], $form);
+
+		$this->assertSame(
+			0,
+			$response->xpath($form)->length,
+			$path . ' asked for the password again: ' . $response->errorText(),
+		);
+	}
+
+	/**
+	 * Builds the fixtures, in a process of its own.
+	 *
+	 * @return array Where they are.
+	 */
+	private function buildFixtures(): array
+	{
+		$script = __DIR__ . '/fixture-forum.php';
+
+		$process = proc_open(
+			[PHP_BINARY, $script],
+			[1 => ['pipe', 'w'], 2 => ['pipe', 'w']],
+			$pipes,
+			Config::$boarddir,
+		);
+
+		$this->assertIsResource($process, 'could not run ' . $script);
+
+		$out = (string) stream_get_contents($pipes[1]);
+		$err = (string) stream_get_contents($pipes[2]);
+		fclose($pipes[1]);
+		fclose($pipes[2]);
+
+		$status = proc_close($process);
+		$fixtures = json_decode($out, true);
+
+		$this->assertSame(0, $status, 'building the fixtures failed: ' . $err . $out);
+		$this->assertIsArray($fixtures, 'the fixture script printed no JSON: ' . $err . $out);
+
+		return $fixtures;
+	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * Keys each case by its name, which is what PHPUnit reports.
+	 *
+	 * @param array $cases The cases, each starting with its name.
+	 * @return array The same, keyed.
+	 */
+	protected static function cases(array $cases): array
+	{
+		$keyed = [];
+
+		foreach ($cases as $case) {
+			$keyed[$case[0]] = $case;
+		}
+
+		return $keyed;
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/fixture-forum.php b/tests/Integration/Http/Snapshot/fixture-forum.php
new file mode 100644
index 00000000000..282254605fd
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/fixture-forum.php
@@ -0,0 +1,723 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+/*
+ * Builds the content the template snapshots are taken of, and prints where it is.
+ *
+ *   php tests/Integration/Http/Snapshot/fixture-forum.php
+ *
+ * Run by SnapshotTestCase in a process of its own, because it has to boot the
+ * whole forum through SSI.php to use SMF's own API for this, and a test process
+ * that has booted SMF cannot make HTTP requests to it afterwards.
+ *
+ * The snapshots only ever look at what this makes, so they do not change when
+ * somebody posts, registers or adds a board anywhere else on the forum. For that
+ * to hold, the content has to be the same on every forum it is built on:
+ *
+ *  - Every timestamp is pinned to a fixed moment in January 2020, so no date on
+ *    a snapshotted page depends on when the fixtures were made.
+ *  - There are at least two of everything a template loops over - boards,
+ *    child boards, topics, replies, recipients - so that one more of them is
+ *    another copy of something the snapshot already shows rather than a new
+ *    shape.
+ *  - Everything is marked read for every member the snapshots sign in as, so a
+ *    page does not grow or lose a "new" marker depending on who has looked at
+ *    what.
+ *  - Nothing is posted or received by the forum's own administrator, whose
+ *    profile is somebody else's to change. A fixture administrator does it.
+ *
+ * Idempotent. When fixtures of this version already exist nothing is created,
+ * and the ids are looked up and printed instead. Fixtures of another version
+ * are removed and built again, so that changing what is built here takes
+ * effect on every forum the suite runs against.
+ *
+ * Prints a single line of JSON on standard output.
+ */
+
+declare(strict_types=1);
+
+use SMF\Board;
+use SMF\Category;
+use SMF\Db\DatabaseApi as Db;
+use SMF\Msg;
+use SMF\PersonalMessage\PM;
+use SMF\User;
+use SMF\Utils;
+
+// SSI.php must not think it is answering a request.
+$_SERVER['REQUEST_METHOD'] = 'GET';
+
+$board_dir = dirname(__DIR__, 4);
+
+ob_start();
+
+require_once $board_dir . '/SSI.php';
+
+// SSI prints nothing when there is no request, but anything it did print would
+// be in front of the JSON the caller is waiting for.
+ob_end_clean();
+
+/**
+ * The names everything is found by. They are what the snapshots show, so
+ * changing one means updating every snapshot.
+ */
+const FIXTURE_CATEGORY = 'Snapshot fixtures';
+const FIXTURE_TIME = 1579082400; // 2020-01-15 10:00:00 UTC
+const MEMBER_PASSWORD = 'snapshot-password-1';
+const FIXTURE_MEMBERS = ['snapshot_member', 'snapshot_other', 'snapshot_admin'];
+
+/**
+ * Raise this whenever what create() builds changes, so that forums holding the
+ * old fixtures get the new ones.
+ */
+const FIXTURE_VERSION = 2;
+
+$fixtures = new SnapshotFixtures();
+
+echo json_encode($fixtures->build(), JSON_PRETTY_PRINT), "\n";
+
+/**
+ * Does the work, so the script above reads as what it does.
+ */
+final class SnapshotFixtures
+{
+	/*********************
+	 * Internal properties
+	 *********************/
+
+	/**
+	 * @var int The forum's administrator, who creates the boards.
+	 */
+	private int $admin;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Creates the fixtures, or finds the ones already there.
+	 *
+	 * @return array Where everything is, for the tests.
+	 */
+	public function build(): array
+	{
+		$this->admin = $this->adminId();
+
+		User::setMe($this->admin);
+
+		// Some of what follows asks for the administrator's password again,
+		// unless the forum has switched that off. Having just given it is what
+		// User::validateSession() looks for.
+		$_SESSION['admin_time'] = time();
+
+		$category = $this->categoryId();
+
+		if ($category !== 0 && $this->categoryDescription($category) !== self::description()) {
+			$this->remove($category);
+			$category = 0;
+		}
+
+		if ($category === 0) {
+			$this->create();
+		}
+
+		return $this->locate();
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	/**
+	 * Makes the fixtures.
+	 */
+	private function create(): void
+	{
+		$member = $this->registerMember('snapshot_member', 'Snapshot Member');
+		$other = $this->registerMember('snapshot_other', 'Snapshot Other');
+		$admin = $this->registerMember('snapshot_admin', 'Snapshot Admin', 1);
+
+		$category = Category::create([
+			'cat_name' => FIXTURE_CATEGORY,
+			'cat_desc' => self::description(),
+			'move_after' => 0,
+		]);
+
+		// -1 is guests and 0 regular members; administrators see everything.
+		$groups = [-1, 0];
+
+		$board = Board::create([
+			'board_name' => 'Snapshot board',
+			'board_description' => 'Topics, replies and a poll for the snapshot tests.',
+			'move_to' => 'bottom',
+			'target_category' => $category,
+			'access_groups' => $groups,
+			'moderators' => 'snapshot_other',
+		]);
+
+		$child_one = Board::create([
+			'board_name' => 'Snapshot child one',
+			'board_description' => 'The first child board.',
+			'move_to' => 'child',
+			'target_category' => $category,
+			'target_board' => $board,
+			'access_groups' => $groups,
+		]);
+
+		Board::create([
+			'board_name' => 'Snapshot child two',
+			'board_description' => 'The second child board, which stays empty.',
+			'move_to' => 'after',
+			'target_category' => $category,
+			'target_board' => $child_one,
+			'access_groups' => $groups,
+		]);
+
+		Board::create([
+			'board_name' => 'Snapshot empty board',
+			'board_description' => 'A board with nothing in it.',
+			'move_to' => 'bottom',
+			'target_category' => $category,
+			'access_groups' => $groups,
+		]);
+
+		$time = FIXTURE_TIME;
+
+		// The topic most snapshots look at. The guest reply is deliberately not
+		// the last post anywhere, so that no list of recent posts ever has to
+		// show a guest's name - one does on this topic's own page, and that is
+		// enough.
+		$topic = $this->post($board, 0, $member, 'Snapshot topic', self::richBody(), $time);
+		$this->post($board, $topic, 0, 'Re: Snapshot topic', 'A reply from a guest.', $time += 3600, 'Snapshot Guest');
+		$this->post($board, $topic, $admin, 'Re: Snapshot topic', '[quote author=Snapshot Member]The quoted text.[/quote]' . "\n" . 'A reply from an administrator.', $time += 3600);
+		$this->post($board, $topic, $other, 'Re: Snapshot topic', 'A reply from another member, with a smiley :)', $time += 3600);
+
+		$poll = $this->poll($admin, 'Which colour?', ['Red', 'Green', 'Blue']);
+
+		$this->post($board, 0, $admin, 'Snapshot poll topic', 'A sticky, locked topic with a poll.', $time += 3600, '', [
+			'poll' => $poll,
+			'sticky_mode' => 1,
+			'lock_mode' => 1,
+		]);
+
+		$this->post($board, 0, $other, 'Snapshot second topic', 'Another topic, so the board lists more than one.', $time += 3600);
+		$this->post($child_one, 0, $other, 'Snapshot child topic', 'A topic in a child board.', $time += 3600);
+		$this->post($child_one, 0, $member, 'Snapshot second child topic', 'A second topic in the child board.', $time += 3600);
+
+		$this->personalMessage($other, [$member, $admin], 'Snapshot message', 'A personal message to two people.', $time += 3600);
+
+		// In the same month as everything else, which is the month the calendar
+		// snapshots look at. One with a time and one lasting all day, since the
+		// calendar draws the two differently.
+		SMF\Calendar\Event::create([
+			'board' => 0,
+			'topic' => 0,
+			'member' => $member,
+			'title' => 'Snapshot event',
+			'location' => 'Snapshot location',
+			'start_date' => '2020-01-20',
+			'end_date' => '2020-01-20',
+			'start_time' => '10:00',
+			'end_time' => '11:30',
+			'timezone' => 'UTC',
+			'allday' => false,
+		]);
+
+		SMF\Calendar\Event::create([
+			'board' => 0,
+			'topic' => 0,
+			'member' => $other,
+			'title' => 'Snapshot all day event',
+			'location' => '',
+			'start_date' => '2020-01-22',
+			'end_date' => '2020-01-23',
+			'start_time' => '00:00',
+			'end_time' => '00:00',
+			'timezone' => 'UTC',
+			'allday' => true,
+		]);
+
+		// Every visit to a topic counts as a view, and "1 view" is worded
+		// differently from "2 views", so the count starts high enough that
+		// the wording never changes again.
+		Db::$db->query(
+			'UPDATE {db_prefix}topics
+			SET num_views = {int:views}
+			WHERE id_board IN ({array_int:boards})',
+			['views' => 10, 'boards' => [$board, $child_one]],
+		);
+
+		$this->pinMembers([$member, $other, $admin], $time);
+		$this->markEverythingRead([$this->admin, $member, $other, $admin]);
+	}
+
+	/**
+	 * Removes fixtures built by another version of this script.
+	 *
+	 * @param int $category The fixture category.
+	 */
+	private function remove(int $category): void
+	{
+		// The boards go with it, and the topics with them.
+		Category::delete([$category]);
+
+		$members = $this->column(
+			'SELECT member_name, id_member FROM {db_prefix}members WHERE member_name IN ({array_string:names})',
+			['names' => FIXTURE_MEMBERS],
+		);
+
+		if ($members !== []) {
+			User::delete(array_values($members));
+		}
+
+		$pms = $this->column(
+			'SELECT id_pm, id_pm FROM {db_prefix}personal_messages WHERE subject = {string:subject}',
+			['subject' => 'Snapshot message'],
+		);
+
+		if ($pms !== []) {
+			foreach (['pm_recipients', 'personal_messages'] as $table) {
+				Db::$db->query(
+					'DELETE FROM {db_prefix}' . $table . ' WHERE id_pm IN ({array_int:pms})',
+					['pms' => array_keys($pms)],
+				);
+			}
+		}
+
+		Db::$db->query(
+			'DELETE FROM {db_prefix}calendar WHERE title IN ({array_string:titles})',
+			['titles' => ['Snapshot event', 'Snapshot all day event']],
+		);
+	}
+
+	/**
+	 * Finds everything the tests need to know about.
+	 *
+	 * @return array Board, topic and member ids by name.
+	 */
+	private function locate(): array
+	{
+		$category = $this->categoryId();
+
+		$boards = $this->column(
+			'SELECT name, id_board FROM {db_prefix}boards WHERE id_cat = {int:cat}',
+			['cat' => $category],
+		);
+
+		$topics = $this->column(
+			'SELECT m.subject, t.id_topic
+			FROM {db_prefix}topics AS t
+				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
+			WHERE t.id_board IN ({array_int:boards})',
+			['boards' => array_values($boards)],
+		);
+
+		$first_msgs = $this->column(
+			'SELECT m.subject, t.id_first_msg
+			FROM {db_prefix}topics AS t
+				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
+			WHERE t.id_board IN ({array_int:boards})',
+			['boards' => array_values($boards)],
+		);
+
+		$members = $this->column(
+			'SELECT member_name, id_member FROM {db_prefix}members WHERE member_name IN ({array_string:names})',
+			['names' => FIXTURE_MEMBERS],
+		);
+
+		$pm = $this->column(
+			'SELECT subject, id_pm FROM {db_prefix}personal_messages WHERE subject = {string:subject}',
+			['subject' => 'Snapshot message'],
+		);
+
+		return [
+			'category' => $category,
+			'boards' => $boards,
+			'topics' => $topics,
+			'first_msgs' => $first_msgs,
+			'members' => $members,
+			'admin' => $this->admin,
+			'member_password' => MEMBER_PASSWORD,
+			'pm' => (int) ($pm['Snapshot message'] ?? 0),
+		];
+	}
+
+	/**
+	 * Posts, as the given member or as a guest.
+	 *
+	 * @param int $board Where.
+	 * @param int $topic The topic to reply to, or 0 for a new one.
+	 * @param int $poster The member, or 0 for a guest.
+	 * @param string $subject The subject.
+	 * @param string $body The body, in BBCode.
+	 * @param int $time When it was posted.
+	 * @param string $guest_name The name a guest posts under.
+	 * @param array $topic_options Anything else the topic needs.
+	 * @return int The topic id.
+	 */
+	private function post(int $board, int $topic, int $poster, string $subject, string $body, int $time, string $guest_name = '', array $topic_options = []): int
+	{
+		$msgOptions = [
+			'subject' => Utils::htmlspecialchars($subject),
+			'body' => Utils::htmlspecialchars($body),
+			'icon' => 'xx',
+			'smileys_enabled' => true,
+			'approved' => 1,
+			'poster_time' => $time,
+			'send_notifications' => false,
+		];
+
+		$topicOptions = $topic_options + [
+			'id' => $topic,
+			'board' => $board,
+			'mark_as_read' => false,
+		];
+
+		$posterOptions = [
+			'id' => $poster,
+			'ip' => '127.0.0.1',
+			'update_post_count' => $poster !== 0,
+		];
+
+		if ($poster === 0) {
+			$posterOptions['name'] = $guest_name;
+			$posterOptions['email'] = 'guest@example.com';
+		}
+
+		Msg::create($msgOptions, $topicOptions, $posterOptions);
+
+		// Msg::create() stamps the topic and board with the time now in a few
+		// places of its own; the message carries the pinned time already.
+		return (int) $topicOptions['id'];
+	}
+
+	/**
+	 * Creates a poll to attach to a topic.
+	 *
+	 * @param int $poster Who asked.
+	 * @param string $question The question.
+	 * @param array $choices The answers.
+	 * @return int The poll id.
+	 */
+	private function poll(int $poster, string $question, array $choices): int
+	{
+		$id = (int) Db::$db->insert(
+			'',
+			'{db_prefix}polls',
+			[
+				'question' => 'string-255',
+				'hide_results' => 'int',
+				'max_votes' => 'int',
+				'expire_time' => 'int',
+				'id_member' => 'int',
+				'poster_name' => 'string-255',
+				'change_vote' => 'int',
+				'guest_vote' => 'int',
+			],
+			[[$question, 0, 1, 0, $poster, 'snapshot_admin', 0, 0]],
+			['id_poll'],
+			Db::INSERT_RETURN_MODE_SINGLE,
+		);
+
+		$rows = [];
+
+		foreach ($choices as $i => $label) {
+			// Two votes for the first, one for the second, none for the third, so
+			// the results show a bar of each width.
+			$rows[] = [$id, $i, $label, max(0, 2 - $i)];
+		}
+
+		Db::$db->insert(
+			'',
+			'{db_prefix}poll_choices',
+			['id_poll' => 'int', 'id_choice' => 'int', 'label' => 'string-255', 'votes' => 'int'],
+			$rows,
+			['id_poll', 'id_choice'],
+		);
+
+		return $id;
+	}
+
+	/**
+	 * Sends a personal message and pins its time.
+	 *
+	 * @param int $from The sender.
+	 * @param array $to The recipients.
+	 * @param string $subject The subject.
+	 * @param string $body The body.
+	 * @param int $time When it was sent.
+	 */
+	private function personalMessage(int $from, array $to, string $subject, string $body, int $time): void
+	{
+		$sender = $this->queryRow(
+			'SELECT member_name, real_name FROM {db_prefix}members WHERE id_member = {int:id}',
+			['id' => $from],
+		);
+
+		PM::send(['to' => $to, 'bcc' => []], $subject, $body, true, [
+			'id' => $from,
+			'name' => $sender['real_name'],
+			'username' => $sender['member_name'],
+		]);
+
+		Db::$db->query(
+			'UPDATE {db_prefix}personal_messages
+			SET msgtime = {int:time}
+			WHERE subject = {string:subject}',
+			['time' => $time, 'subject' => $subject],
+		);
+
+		// Read already, as it will be once the member tests have opened it, so
+		// the unread count in the menu is the same before that as after.
+		Db::$db->query(
+			'UPDATE {db_prefix}pm_recipients
+			SET is_read = {int:read}, is_new = {int:not_new}
+			WHERE id_member IN ({array_int:members})',
+			['read' => 1, 'not_new' => 0, 'members' => $to],
+		);
+
+		Db::$db->query(
+			'UPDATE {db_prefix}members
+			SET unread_messages = {int:none}, new_pm = {int:none}
+			WHERE id_member IN ({array_int:members})',
+			['none' => 0, 'members' => $to],
+		);
+	}
+
+	/**
+	 * Registers a member who can sign in straight away.
+	 *
+	 * @param string $name The member name.
+	 * @param string $display The display name.
+	 * @param int $group Their primary membergroup, 0 for none.
+	 * @return int The member id.
+	 */
+	private function registerMember(string $name, string $display, int $group = 0): int
+	{
+		$options = [
+			'interface' => 'admin',
+			'username' => $name,
+			'email' => $name . '@example.com',
+			'password' => MEMBER_PASSWORD,
+			'password_check' => MEMBER_PASSWORD,
+			'check_reserved_name' => false,
+			'check_password_strength' => false,
+			'check_email_ban' => false,
+			'send_welcome_email' => false,
+			'require' => 'nothing',
+			'memberGroup' => $group,
+		];
+
+		$id = SMF\Actions\Register2::registerMember($options, true);
+
+		if (!is_int($id)) {
+			fwrite(STDERR, 'could not register ' . $name . ': ' . json_encode($id) . "\n");
+
+			exit(1);
+		}
+
+		Db::$db->query(
+			'UPDATE {db_prefix}members
+			SET real_name = {string:display},
+				personal_text = {string:personal_text},
+				signature = {string:signature},
+				website_title = {string:website_title},
+				website_url = {string:website_url},
+				member_ip = {inet:ip},
+				member_ip2 = {inet:ip}
+			WHERE id_member = {int:id}',
+			[
+				'id' => $id,
+				'display' => $display,
+				'personal_text' => 'Personal text for ' . $display,
+				'signature' => 'A signature with [b]bold[/b] text.',
+				'website_title' => 'Example',
+				'website_url' => 'https://www.example.com',
+				// Registering from the command line records no address, which
+				// no real member is without, and the tracking pages fatal on.
+				'ip' => '127.0.0.1',
+			],
+		);
+
+		return $id;
+	}
+
+	/**
+	 * Pins the dates a profile shows.
+	 *
+	 * @param array $members Who.
+	 * @param int $time The last thing that happened.
+	 */
+	private function pinMembers(array $members, int $time): void
+	{
+		Db::$db->query(
+			'UPDATE {db_prefix}members
+			SET date_registered = {int:registered}, last_login = {int:login}
+			WHERE id_member IN ({array_int:members})',
+			[
+				'members' => $members,
+				'registered' => FIXTURE_TIME - 86400,
+				'login' => $time,
+			],
+		);
+	}
+
+	/**
+	 * Marks every fixture board and topic read for these members.
+	 *
+	 * @param array $members Who.
+	 */
+	private function markEverythingRead(array $members): void
+	{
+		$boards = $this->column(
+			'SELECT id_board, id_msg_updated FROM {db_prefix}boards WHERE id_cat = {int:cat}',
+			['cat' => $this->categoryId()],
+		);
+
+		$topics = $this->column(
+			'SELECT id_topic, id_last_msg FROM {db_prefix}topics WHERE id_board IN ({array_int:boards})',
+			['boards' => array_keys($boards)],
+		);
+
+		$latest = max(array_merge([0], $topics, $boards));
+
+		foreach ($members as $member) {
+			foreach ($boards as $board => $msg) {
+				Db::$db->insert('replace', '{db_prefix}log_boards', ['id_member' => 'int', 'id_board' => 'int', 'id_msg' => 'int'], [[$member, $board, $latest]], ['id_member', 'id_board']);
+				Db::$db->insert('replace', '{db_prefix}log_mark_read', ['id_member' => 'int', 'id_board' => 'int', 'id_msg' => 'int'], [[$member, $board, $latest]], ['id_member', 'id_board']);
+			}
+
+			foreach ($topics as $topic => $msg) {
+				Db::$db->insert('replace', '{db_prefix}log_topics', ['id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'], [[$member, $topic, $latest, 0]], ['id_member', 'id_topic']);
+			}
+		}
+	}
+
+	/**
+	 * What a category is described as.
+	 *
+	 * @param int $category The category.
+	 * @return string The description.
+	 */
+	private function categoryDescription(int $category): string
+	{
+		$row = $this->queryRow(
+			'SELECT description FROM {db_prefix}categories WHERE id_cat = {int:cat}',
+			['cat' => $category],
+		);
+
+		return (string) ($row['description'] ?? '');
+	}
+
+	/**
+	 * The fixture category, if it has been made.
+	 *
+	 * @return int Its id, or 0.
+	 */
+	private function categoryId(): int
+	{
+		$row = $this->queryRow(
+			'SELECT id_cat FROM {db_prefix}categories WHERE name = {string:name}',
+			['name' => FIXTURE_CATEGORY],
+		);
+
+		return (int) ($row['id_cat'] ?? 0);
+	}
+
+	/**
+	 * The first administrator.
+	 *
+	 * @return int The member id.
+	 */
+	private function adminId(): int
+	{
+		$row = $this->queryRow(
+			'SELECT id_member FROM {db_prefix}members WHERE id_group = {int:group} ORDER BY id_member LIMIT 1',
+			['group' => 1],
+		);
+
+		return (int) ($row['id_member'] ?? 1);
+	}
+
+	/**
+	 * Runs a two column query into key => value.
+	 *
+	 * @param string $sql The query.
+	 * @param array $params Its parameters.
+	 * @return array The first column as keys, the second as integer values.
+	 */
+	private function column(string $sql, array $params): array
+	{
+		$request = Db::$db->query($sql, $params);
+		$result = [];
+
+		while ($row = Db::$db->fetch_row($request)) {
+			$result[$row[0]] = (int) $row[1];
+		}
+
+		Db::$db->free_result($request);
+
+		return $result;
+	}
+
+	/**
+	 * Runs a query and returns its first row.
+	 *
+	 * @param string $sql The query.
+	 * @param array $params Its parameters.
+	 * @return array|null The row.
+	 */
+	private function queryRow(string $sql, array $params): ?array
+	{
+		$request = Db::$db->query($sql, $params);
+		$row = Db::$db->fetch_assoc($request);
+		Db::$db->free_result($request);
+
+		return is_array($row) ? $row : null;
+	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * What the fixture category is described as, which says which version of
+	 * this script built it.
+	 *
+	 * @return string The description.
+	 */
+	private static function description(): string
+	{
+		return 'Content for the template snapshot tests, version ' . FIXTURE_VERSION . '.';
+	}
+
+	/**
+	 * A first post that exercises as much of the BBCode parser's output as a
+	 * template is likely to wrap.
+	 *
+	 * @return string The body.
+	 */
+	private static function richBody(): string
+	{
+		return implode("\n", [
+			'The first post, with [b]bold[/b], [i]italic[/i], [u]underlined[/u] and [s]struck[/s] text.',
+			'[url=https://www.simplemachines.org]A link[/url] and [email]someone@example.com[/email].',
+			'[quote]An unattributed quote.[/quote]',
+			'[code]echo "code";[/code]',
+			'[list][li]One[/li][li]Two[/li][/list]',
+			'[color=red]Red[/color] [size=12pt]Sized[/size] [center]Centred[/center]',
+			'[table][tr][td]A[/td][td]B[/td][/tr][/table]',
+			'[spoiler]Hidden[/spoiler] [hr] Smileys: :) ;)',
+		]);
+	}
+}
diff --git a/tests/Integration/Http/Snapshot/index.php b/tests/Integration/Http/Snapshot/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Integration/Http/Snapshot/perturb-forum.php b/tests/Integration/Http/Snapshot/perturb-forum.php
new file mode 100644
index 00000000000..84bb02220a6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/perturb-forum.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+/*
+ * Fills the forum with content that has nothing to do with the snapshots, to
+ * check that they do not change when it does.
+ *
+ *   php tests/Integration/Http/Snapshot/perturb-forum.php [scale]
+ *
+ * ONLY RUN THIS ON A FORUM YOU ARE GOING TO THROW AWAY. It registers members,
+ * creates categories and boards and posts, changes the administrator's profile,
+ * and does not clean up after itself.
+ *
+ * Everything it makes is outside the fixture category, so a snapshot that
+ * changes afterwards is showing somebody else's content, and needs scoping or
+ * masking until it does not. The way to use it, after adding a page to the
+ * snapshot tests:
+ *
+ *   1. install a fresh forum, and record the snapshots on it
+ *   2. run this, as many times as you like, with any scale
+ *   3. run the snapshot tests again, without recording; they should pass
+ *
+ * The scale is how many of each thing to make; the default of 10 is enough to
+ * push the member list, the recent posts and the statistics past one of
+ * everything, and 40 is enough to push most lists onto a second page.
+ */
+
+declare(strict_types=1);
+
+use SMF\Board;
+use SMF\Category;
+use SMF\Db\DatabaseApi as Db;
+use SMF\Msg;
+use SMF\PersonalMessage\PM;
+use SMF\User;
+use SMF\Utils;
+
+$_SERVER['REQUEST_METHOD'] = 'GET';
+
+ob_start();
+
+require_once dirname(__DIR__, 4) . '/SSI.php';
+
+ob_end_clean();
+
+$scale = max(1, (int) ($argv[1] ?? 10));
+$run = substr(md5(uniqid('', true)), 0, 6);
+
+$request = Db::$db->query(
+	'SELECT id_member FROM {db_prefix}members WHERE id_group = {int:group} ORDER BY id_member LIMIT 1',
+	['group' => 1],
+);
+[$admin] = Db::$db->fetch_row($request);
+Db::$db->free_result($request);
+
+User::setMe((int) $admin);
+$_SESSION['admin_time'] = time();
+
+// Members, with the sorts of names people have.
+$names = ['Zoë Ünïcödé', 'O\'Brien & Sons', 'user_' . $run, 'Another Member', 'Ma Li', 'Ångström'];
+$members = [];
+
+for ($i = 0; $i < $scale; $i++) {
+	$options = [
+		'interface' => 'admin',
+		'username' => 'perturb_' . $run . '_' . $i,
+		'email' => 'perturb_' . $run . '_' . $i . '@example.com',
+		'password' => 'perturb-password-1',
+		'password_check' => 'perturb-password-1',
+		'check_reserved_name' => false,
+		'check_password_strength' => false,
+		'check_email_ban' => false,
+		'send_welcome_email' => false,
+		'require' => 'nothing',
+		'memberGroup' => 0,
+	];
+
+	$id = SMF\Actions\Register2::registerMember($options, true);
+
+	if (is_int($id)) {
+		$members[] = $id;
+
+		Db::$db->query(
+			'UPDATE {db_prefix}members SET real_name = {string:name} WHERE id_member = {int:id}',
+			['id' => $id, 'name' => $names[$i % count($names)] . ' ' . $run . $i],
+		);
+	}
+}
+
+// A category with boards and child boards, and a child board of an existing
+// board.
+$category = Category::create(['cat_name' => 'Perturbation ' . $run, 'move_after' => 0]);
+
+$boards = [];
+
+$boards[] = Board::create([
+	'board_name' => 'Perturbed board ' . $run,
+	'move_to' => 'bottom',
+	'target_category' => $category,
+	'access_groups' => [-1, 0],
+]);
+
+$boards[] = Board::create([
+	'board_name' => 'Perturbed child ' . $run,
+	'move_to' => 'child',
+	'target_category' => $category,
+	'target_board' => $boards[0],
+	'access_groups' => [-1, 0],
+]);
+
+$request = Db::$db->query(
+	'SELECT id_board, id_cat FROM {db_prefix}boards WHERE name = {string:name} LIMIT 1',
+	['name' => 'General Discussion'],
+);
+$general = Db::$db->fetch_assoc($request);
+Db::$db->free_result($request);
+
+if (is_array($general)) {
+	$boards[] = (int) $general['id_board'];
+
+	$boards[] = Board::create([
+		'board_name' => 'Perturbed sub-board ' . $run,
+		'move_to' => 'child',
+		'target_category' => (int) $general['id_cat'],
+		'target_board' => (int) $general['id_board'],
+		'access_groups' => [-1, 0],
+	]);
+}
+
+// Topics and replies, from the administrator, the new members and a guest.
+$posters = array_merge([(int) $admin, 0], $members);
+
+for ($i = 0; $i < $scale; $i++) {
+	$board = $boards[$i % count($boards)];
+	$poster = $posters[$i % count($posters)];
+
+	$msgOptions = [
+		'subject' => Utils::htmlspecialchars('Unrelated topic ' . $run . ' number ' . $i . ' with a long subject & <markup>'),
+		'body' => Utils::htmlspecialchars('Body ' . $i . ' [b]bold[/b] :)'),
+		'approved' => 1,
+		'send_notifications' => false,
+	];
+	$topicOptions = [
+		'board' => $board,
+		'mark_as_read' => false,
+		'sticky_mode' => $i % 5 === 0 ? 1 : null,
+		'lock_mode' => $i % 7 === 0 ? 1 : null,
+	];
+	$posterOptions = ['id' => $poster, 'ip' => '127.0.0.1', 'update_post_count' => $poster !== 0];
+
+	if ($poster === 0) {
+		$posterOptions['name'] = 'A Guest ' . $run;
+		$posterOptions['email'] = 'guest@example.com';
+	}
+
+	Msg::create($msgOptions, $topicOptions, $posterOptions);
+
+	for ($j = 0; $j < 1 + $i % 3; $j++) {
+		$replier = $posters[($i + $j + 1) % count($posters)];
+
+		$replyOptions = [
+			'subject' => $msgOptions['subject'],
+			'body' => Utils::htmlspecialchars('Reply ' . $j . ' [quote]quoted[/quote]'),
+			'approved' => 1,
+			'send_notifications' => false,
+		];
+		$replyTopic = ['id' => $topicOptions['id'], 'board' => $board, 'mark_as_read' => false];
+		$replyPoster = ['id' => $replier, 'ip' => '127.0.0.1', 'update_post_count' => $replier !== 0];
+
+		if ($replier === 0) {
+			$replyPoster['name'] = 'A Guest ' . $run;
+			$replyPoster['email'] = 'guest@example.com';
+		}
+
+		Msg::create($replyOptions, $replyTopic, $replyPoster);
+	}
+}
+
+// Personal messages, to the administrator and between the new members.
+foreach (array_slice($members, 0, $scale) as $i => $from) {
+	$to = [(int) $admin];
+
+	if (isset($members[$i + 1])) {
+		$to[] = $members[$i + 1];
+	}
+
+	PM::send(['to' => $to, 'bcc' => []], 'Unrelated message ' . $run . ' ' . $i, 'Hello.', true, [
+		'id' => $from,
+		'name' => 'perturb_' . $run . '_' . $i,
+		'username' => 'perturb_' . $run . '_' . $i,
+	]);
+}
+
+// The forum's own administrator is somebody else's to change, and nothing in
+// the fixtures may depend on what their profile says.
+Db::$db->query(
+	'UPDATE {db_prefix}members
+	SET signature = {string:signature},
+		personal_text = {string:personal_text},
+		website_title = {string:website_title},
+		website_url = {string:website_url}
+	WHERE id_member = {int:admin}',
+	[
+		'admin' => (int) $admin,
+		'signature' => 'A signature the administrator added in run ' . $run . '.',
+		'personal_text' => 'Personal text ' . $run,
+		'website_title' => 'Site ' . $run,
+		'website_url' => 'https://www.example.org/' . $run,
+	],
+);
+
+echo 'added ', count($members), ' members, ', count($boards), ' boards and ', $scale, ' topics (run ', $run, ")\n";
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/admin_credits.txt b/tests/Integration/Http/Snapshot/snapshots/admin/admin_credits.txt
new file mode 100644
index 00000000000..6e045024518
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/admin_credits.txt
@@ -0,0 +1,90 @@
+status 200
+@ title
+title
+  "Support and Credits"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=credits;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Support and Credits"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Support and Credits"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  div.noup.roundframe
+    div.title_bar
+      h3.titlebg
+        "Support Information"
+    snapshot-ignored [selector="#admin_content .roundframe > .title_bar:not(#support_resources) + .padding"]
+    div#support_resources.title_bar
+      h3.titlebg
+        "Support Resources"
+    div.padding
+      p
+        "Our"
+        a [href="https://wiki.simplemachines.org/"]
+          "Online Manual"
+        "provides the main documentation for SMF. The SMF Online Manual has many documents to help answer support questions and explain"
+        a [href="https://wiki.simplemachines.org/smf/features#"]
+          "Features"
+        ","
+        a [href="https://wiki.simplemachines.org/smf/options#"]
+          "Settings"
+        ","
+        a [href="https://wiki.simplemachines.org/smf/themes#"]
+          "Themes"
+        ","
+        a [href="https://wiki.simplemachines.org/smf/packages#"]
+          "Packages"
+        ", etc. The Online Manual documents each area of SMF thoroughly and should answer most questions quickly."
+      p
+        "If you cannot find the answers to your questions in the Online Manual, you may want to search our"
+        a [href="https://www.simplemachines.org/community/"]
+          "Support Community"
+        "or ask for assistance in either our"
+        a [href="https://www.simplemachines.org/redirect/english_support"]
+          "English"
+        "or one of our many"
+        a [href="https://www.simplemachines.org/redirect/international_support_boards"]
+          "international support boards"
+        ". The SMF Support Community can be used for"
+        a [href="https://www.simplemachines.org/redirect/smf_support"]
+          "support"
+        ","
+        a [href="https://www.simplemachines.org/redirect/customize_support"]
+          "customization"
+        ", and many other things such as discussing SMF, finding a host, and discussing administrative issues with other forum administrators."
+    div#credits_sections.title_bar
+      h3.titlebg
+        "Credits"
+    snapshot-ignored [selector="#admin_content .roundframe > .title_bar:not(#support_resources) + .padding"]
+  snapshot-ignored [selector="#admin_content script"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/admin_index.txt b/tests/Integration/Http/Snapshot/snapshots/admin/admin_index.txt
new file mode 100644
index 00000000000..13440218ecd
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/admin_index.txt
@@ -0,0 +1,196 @@
+status 200
+@ title
+title
+  "Administration Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Administration Center"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    strong
+      "Hello, {member}."
+    "This is your \"Administration Center\". From here, you can edit settings, maintain your forum, view logs, install packages, manage themes, and many other things."
+    br
+    "If you have any trouble, please look at the \"Support & Credits\" page. If the information there does not help you, feel free to"
+    a [href="https://www.simplemachines.org/community/index.php" rel="noopener" target="_blank"]
+      "look to us for help"
+    "with the problem."
+    br
+    "You may also find answers to your questions or problems by clicking the"
+    span.help.main_icons [title="Help"]
+    "symbols for more information on the related functions."
+  div#update_section
+  div#admin_main_section
+    div#live_news.floatleft
+      div.cat_bar
+        h3.catbg
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          "Live from Simple Machines..."
+      div.nopadding.windowbg
+        div#smfAnnouncements
+          "You are unable to connect to simplemachines.org’s latest news file."
+    div#support_info.floatright
+      div.cat_bar
+        h3.catbg
+          a [href="{boardurl}/index.php?action=admin;area=credits"]
+            "Support Information"
+      div.nopadding.windowbg
+        div#version_details.padding
+          strong
+            "Version Information"
+          ul
+            li
+              "Forum version:"
+              em#yourVersion
+                "SMF # Alpha(s) #-dev"
+            li
+              "Current SMF version:"
+              em#smfVersion
+                "??"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;activity=version"]
+                "(more detailed)"
+          br
+          "Forum Administrators:"
+          a [href="{boardurl}/index.php?action=profile;u=#"]
+            "{member}"
+          "and"
+          a [href="{boardurl}/index.php?action=profile;u=#"]
+            "{member}"
+  fieldset#group_forum.admin_group.windowbg
+    legend
+      "Main"
+    a [href="{boardurl}/index.php?action=admin;area=credits"]
+      span.large_admin_menu_icon.support
+      "Support and Credits"
+    a [href="{boardurl}/index.php?action=admin;area=news"]
+      span.large_admin_menu_icon.news
+      "News and Newsletters"
+    a [href="{boardurl}/index.php?action=admin;area=packages"]
+      span.large_admin_menu_icon.packages
+      "Package Manager"
+    a [href="{boardurl}/index.php?action=admin;area=adminlogoff"]
+      span.exit.large_admin_menu_icon
+      "End {member} Session"
+  fieldset#group_config.admin_group.windowbg
+    legend
+      "Configuration"
+    a [href="{boardurl}/index.php?action=admin;area=featuresettings"]
+      span.features.large_admin_menu_icon
+      "Features and Options"
+    a [href="{boardurl}/index.php?action=admin;area=antispam"]
+      span.large_admin_menu_icon.security
+      "Anti-Spam"
+    a [href="{boardurl}/index.php?action=admin;area=languages"]
+      span.languages.large_admin_menu_icon
+      "Languages"
+    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#"]
+      span.current_theme.large_admin_menu_icon
+      "Current Theme"
+    a [href="{boardurl}/index.php?action=admin;area=theme"]
+      span.large_admin_menu_icon.themes
+      "Themes and Layout"
+    a [href="{boardurl}/index.php?action=admin;area=modsettings"]
+      span.large_admin_menu_icon.modifications
+      "Modification Settings"
+  fieldset#group_layout.admin_group.windowbg
+    legend
+      "Forum"
+    a [href="{boardurl}/index.php?action=admin;area=manageboards"]
+      span.boards.large_admin_menu_icon
+      "Boards and Categories"
+    a [href="{boardurl}/index.php?action=admin;area=postsettings"]
+      span.large_admin_menu_icon.posts
+      "Posts and Topics"
+    a [href="{boardurl}/index.php?action=admin;area=managecalendar"]
+      span.calendar.inactive.large_admin_menu_icon
+      "Calendar"
+    a [href="{boardurl}/index.php?action=admin;area=managesearch"]
+      span.large_admin_menu_icon.search
+      "Search"
+    a [href="{boardurl}/index.php?action=admin;area=smileys"]
+      span.large_admin_menu_icon.smiley
+      "Smileys and Message Icons"
+    a [href="{boardurl}/index.php?action=admin;area=manageattachments"]
+      span.attachment.large_admin_menu_icon
+      "Attachments and Avatars"
+    a [href="{boardurl}/index.php?action=admin;area=sengines"]
+      span.engines.inactive.large_admin_menu_icon
+      "Search Engines"
+  fieldset#group_members.admin_group.windowbg
+    legend
+      "Members"
+    a [href="{boardurl}/index.php?action=admin;area=viewmembers"]
+      span.large_admin_menu_icon.members
+      "Members"
+    a [href="{boardurl}/index.php?action=admin;area=membergroups"]
+      span.large_admin_menu_icon.membergroups
+      "Membergroups"
+    a [href="{boardurl}/index.php?action=admin;area=permissions"]
+      span.large_admin_menu_icon.permissions
+      "Permissions"
+    a [href="{boardurl}/index.php?action=admin;area=regcenter"]
+      span.large_admin_menu_icon.regcenter
+      "Registration"
+    a [href="{boardurl}/index.php?action=admin;area=warnings"]
+      span.large_admin_menu_icon.warning
+      "Warnings"
+    a [href="{boardurl}/index.php?action=admin;area=ban"]
+      span.ban.large_admin_menu_icon
+      "Ban list"
+    a [href="{boardurl}/index.php?action=admin;area=paidsubscribe"]
+      span.inactive.large_admin_menu_icon.paid
+      "Paid Subscriptions"
+  fieldset#group_maintenance.admin_group.windowbg
+    legend
+      "Maintenance"
+    a [href="{boardurl}/index.php?action=admin;area=serversettings"]
+      span.large_admin_menu_icon.server
+      "Server Settings"
+    a [href="{boardurl}/index.php?action=admin;area=maintain"]
+      span.large_admin_menu_icon.maintain
+      "Forum Maintenance"
+    a [href="{boardurl}/index.php?action=admin;area=scheduledtasks"]
+      span.large_admin_menu_icon.scheduled
+      "Scheduled Tasks"
+    a [href="{boardurl}/index.php?action=admin;area=mailqueue"]
+      span.large_admin_menu_icon.mail
+      "Mail"
+    a [href="{boardurl}/index.php?action=admin;area=reports"]
+      span.large_admin_menu_icon.reports
+      "Reports"
+    a [href="{boardurl}/index.php?action=admin;area=logs"]
+      span.large_admin_menu_icon.logs
+      "Logs"
+  script [src="{boardurl}/index.php?action=viewsmfile;filename=current-version.js"]
+  script [src="{boardurl}/index.php?action=viewsmfile;filename=latest-news.js"]
+  script
+    | var oAdminIndex = new smf_AdminIndex({ bLoadAnnouncements: true, sAnnouncementTemplate: '\n\t\t\t\t\t\t\t\t<dl>\n\t\t\t\t\t\t\t\t\t%content%\n\t\t\t\t\t\t\t\t<' + '/dl>\n\t\t\t\t\t\t\t', sAnnouncementMessageTemplate: '\n\t\t\t\t\t\t\t\t<dt><a hr'+'ef="%href%">%subject%<' + '/a>%time%<' + '/dt>\n\t\t\t\t\t\t\t\t<dd>\n\t\t\t\t\t\t\t\t\t%message%\n\t\t\t\t\t\t\t\t<' + '/dd>\n\t\t\t\t\t\t\t', sAnnouncementContainerId: 'smfAnnouncements', bLoadVersions: true, sSmfVersionContainerId: 'smfVersion', sYourVersionContainerId: 'yourVersion', sVersionOutdatedTemplate: '\n\t\t\t\t\t\t\t\t<span class="alert">%currentVersion%<' + '/span>\n\t\t\t\t\t\t\t', bLoadUpdateNotification: true, sUpdateNotificationContainerId: 'update_section', sUpdateNotificationDefaultTitle: 'Update available', sUpdateNotificationDefaultMessage: 'You’re using an outdated version of SMF, which contains some bugs which have since been fixed.\n\tIt is recommended that you <a hr'+'ef="#" id="update-link" class="bbc_link strong">update your forum<' + '/a> to the latest version as soon as possible. It only takes a minute!', sUpdateNotificationTemplate: '\n\t\t\t\t\t\t\t\t<h# id(s)="update_title">\n\t\t\t\t\t\t\t\t\t%title%\n\t\t\t\t\t\t\t\t<' + '/h#>\n\t\t\t\t\t\t\t\t<div id="update_message" class="smalltext">\n\t\t\t\t\t\t\t\t\t%message%\n\t\t\t\t\t\t\t\t<' + '/div>\n\t\t\t\t\t\t\t', sUpdateNotificationLink: smf_scripturl + '?action=admin;area=packages;pgdownload;auto;package=%package%;{session_var}={session_id}' });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/admin_menu.txt b/tests/Integration/Http/Snapshot/snapshots/admin/admin_menu.txt
new file mode 100644
index 00000000000..e7d9124b520
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/admin_menu.txt
@@ -0,0 +1,434 @@
+status 200
+@ #genericmenu
+nav#genericmenu [aria-label="Administration Center Menu"]
+  a.mobile_generic_menu_1
+    span.menu_icon
+    span.text_menu
+      "Administration Center Menu"
+  div#mobile_generic_menu_#.popup_container
+    div.description.popup_window
+      div.popup_heading
+        "Administration Center Menu"
+        a.hide_popup.main_icons [href="javascript:void(#);"]
+      div.generic_menu
+        ul.dropdown_menu_1.dropmenu
+          li.subsections
+            a.active [href="{boardurl}/index.php?action=admin;area=index;{session_var}={session_id}"]
+              "Main"
+            ul
+              li
+                a.admin_menu_icon.administration.chosen [href="{boardurl}/index.php?action=admin;area=index;{session_var}={session_id}"]
+                  span.administration.main_icons
+                  "Administration Center"
+              li
+                a.admin_menu_icon.support [href="{boardurl}/index.php?action=admin;area=credits;{session_var}={session_id}"]
+                  span.main_icons.support
+                  "Support and Credits"
+              li.subsections
+                a.admin_menu_icon.news [href="{boardurl}/index.php?action=admin;area=news;{session_var}={session_id}"]
+                  span.main_icons.news
+                  "News and Newsletters"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=news;sa=editnews;{session_var}={session_id}"]
+                      "News"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=news;sa=mailingmembers;{session_var}={session_id}"]
+                      "Newsletters"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=news;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.packages [href="{boardurl}/index.php?action=admin;area=packages;{session_var}={session_id}"]
+                  span.main_icons.packages
+                  "Package Manager"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=packages;sa=browse;{session_var}={session_id}"]
+                      "Browse Packages"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=packages;sa=packageget;get;{session_var}={session_id}"]
+                      "Add Packages"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=packages;sa=perms;{session_var}={session_id}"]
+                      "File Permissions"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=packages;sa=options;{session_var}={session_id}"]
+                      "Options"
+              li
+                a.admin_menu_icon.exit [href="{boardurl}/index.php?action=admin;area=adminlogoff;{session_var}={session_id}"]
+                  span.exit.main_icons
+                  "End {member} Session"
+          li.subsections
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}"]
+              "Configuration"
+            ul
+              li.subsections
+                a.admin_menu_icon.features [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}"]
+                  span.features.main_icons
+                  "Features and Options"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                      "General"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                      "Bulletin Board Code & Markdown"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                      "Layout"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                      "Signatures"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                      "Profile Fields"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                      "Likes"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                      "Mentions"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                      "Notifications"
+              li
+                a.admin_menu_icon.security [href="{boardurl}/index.php?action=admin;area=antispam;{session_var}={session_id}"]
+                  span.main_icons.security
+                  "Anti-Spam"
+              li.subsections
+                a.admin_menu_icon.languages [href="{boardurl}/index.php?action=admin;area=languages;{session_var}={session_id}"]
+                  span.languages.main_icons
+                  "Languages"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}"]
+                      "Edit Languages"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}"]
+                      "Add Language"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li
+                a.admin_menu_icon.current_theme [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#;{session_var}={session_id}"]
+                  span.current_theme.main_icons
+                  "Current Theme"
+              li.subsections
+                a.admin_menu_icon.themes [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}"]
+                  span.main_icons.themes
+                  "Themes and Layout"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                      "Manage and Install"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                      "Theme Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                      "Member Options"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                      "Modify Themes"
+              li.subsections
+                a.admin_menu_icon.modifications [href="{boardurl}/index.php?action=admin;area=modsettings;{session_var}={session_id}"]
+                  span.main_icons.modifications
+                  "Modification Settings"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=modsettings;sa=general;{session_var}={session_id}"]
+                      "Miscellaneous"
+          li.subsections
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}"]
+              "Forum"
+            ul
+              li.subsections
+                a.admin_menu_icon.boards [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}"]
+                  span.boards.main_icons
+                  "Boards and Categories"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                      "Modify Boards"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                      "Create new category"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.posts [href="{boardurl}/index.php?action=admin;area=postsettings;{session_var}={session_id}"]
+                  span.main_icons.posts
+                  "Posts and Topics"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}"]
+                      "Post Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}"]
+                      "Censored Words"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}"]
+                      "Topic Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}"]
+                      "Drafts"
+              li
+                a.admin_menu_icon.calendar [href="{boardurl}/index.php?action=admin;area=managecalendar;{session_var}={session_id}"]
+                  span.calendar.main_icons
+                  "Calendar"
+              li.subsections
+                a.admin_menu_icon.search [href="{boardurl}/index.php?action=admin;area=managesearch;{session_var}={session_id}"]
+                  span.main_icons.search
+                  "Search"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=weights;{session_var}={session_id}"]
+                      "Weights"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=method;{session_var}={session_id}"]
+                      "Search Method"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.smiley [href="{boardurl}/index.php?action=admin;area=smileys;{session_var}={session_id}"]
+                  span.main_icons.smiley
+                  "Smileys and Message Icons"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}"]
+                      "Smiley Sets"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.attachment [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}"]
+                  span.attachment.main_icons
+                  "Attachments and Avatars"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                      "Browse Files"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                      "Attachment Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                      "Avatar Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                      "Attachment Directories"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                      "File Maintenance"
+              li
+                a.admin_menu_icon.engines [href="{boardurl}/index.php?action=admin;area=sengines;{session_var}={session_id}"]
+                  span.engines.main_icons
+                  "Search Engines"
+          li.subsections
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;{session_var}={session_id}"]
+              "Members"
+            ul
+              li.subsections
+                a.admin_menu_icon.members [href="{boardurl}/index.php?action=admin;area=viewmembers;{session_var}={session_id}"]
+                  span.main_icons.members
+                  "Members"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=all;{session_var}={session_id}"]
+                      "View all Members"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=search;{session_var}={session_id}"]
+                      "Search for Members"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.membergroups [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}"]
+                  span.main_icons.membergroups
+                  "Membergroups"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                      "Edit membergroups"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                      "Add membergroup"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.permissions [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}"]
+                  span.main_icons.permissions
+                  "Permissions"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                      "General permissions"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                      "Board permissions"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                      "Edit profiles"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                      "Post moderation"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.regcenter [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}"]
+                  span.main_icons.regcenter
+                  "Registration"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                      "Register new member"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                      "Registration Agreement"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                      "Privacy Policy"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                      "Set reserved names"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li
+                a.admin_menu_icon.warning [href="{boardurl}/index.php?action=admin;area=warnings;{session_var}={session_id}"]
+                  span.main_icons.warning
+                  "Warnings"
+              li.subsections
+                a.admin_menu_icon.ban [href="{boardurl}/index.php?action=admin;area=ban;{session_var}={session_id}"]
+                  span.ban.main_icons
+                  "Ban list"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;{session_var}={session_id}"]
+                      "Ban list"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=ban;sa=add;{session_var}={session_id}"]
+                      "Add new ban"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;{session_var}={session_id}"]
+                      "Browse Ban Triggers"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;{session_var}={session_id}"]
+                      "Ban Log"
+              li
+                a.admin_menu_icon.paid [href="{boardurl}/index.php?action=admin;area=paidsubscribe;{session_var}={session_id}"]
+                  span.main_icons.paid
+                  "Paid Subscriptions"
+          li.subsections
+            a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}"]
+              "Maintenance"
+            ul
+              li.subsections
+                a.admin_menu_icon.server [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}"]
+                  span.main_icons.server
+                  "Server Settings"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                      "General"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                      "Database"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                      "Cookies and Sessions"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                      "Security"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                      "Caching"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                      "Data Export"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                      "Load Balancing"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                      "PHP Info"
+              li.subsections
+                a.admin_menu_icon.maintain [href="{boardurl}/index.php?action=admin;area=maintain;{session_var}={session_id}"]
+                  span.main_icons.maintain
+                  "Forum Maintenance"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}"]
+                      "Routine"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}"]
+                      "Database"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}"]
+                      "Members"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}"]
+                      "Topics"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=maintain;sa=hooks;{session_var}={session_id}"]
+                      "Integration Hooks"
+              li.subsections
+                a.admin_menu_icon.scheduled [href="{boardurl}/index.php?action=admin;area=scheduledtasks;{session_var}={session_id}"]
+                  span.main_icons.scheduled
+                  "Scheduled Tasks"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasks;{session_var}={session_id}"]
+                      "Scheduled Tasks"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasklog;{session_var}={session_id}"]
+                      "Task Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+              li.subsections
+                a.admin_menu_icon.mail [href="{boardurl}/index.php?action=admin;area=mailqueue;{session_var}={session_id}"]
+                  span.mail.main_icons
+                  "Mail"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=browse;{session_var}={session_id}"]
+                      "Browse Queue"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=settings;{session_var}={session_id}"]
+                      "Settings"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;{session_var}={session_id}"]
+                      "Send Test"
+              li
+                a.admin_menu_icon.reports [href="{boardurl}/index.php?action=admin;area=reports;{session_var}={session_id}"]
+                  span.main_icons.reports
+                  "Reports"
+              li.subsections
+                a.admin_menu_icon.logs [href="{boardurl}/index.php?action=admin;area=logs;{session_var}={session_id}"]
+                  span.logs.main_icons
+                  "Logs"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=errorlog;desc;{session_var}={session_id}"]
+                      "Error Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;{session_var}={session_id}"]
+                      "Administration Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;{session_var}={session_id}"]
+                      "Moderation Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=banlog;{session_var}={session_id}"]
+                      "Ban Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=tasklog;{session_var}={session_id}"]
+                      "Task Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}"]
+                      "Log Settings"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/antispam.txt b/tests/Integration/Http/Snapshot/snapshots/admin/antispam.txt
new file mode 100644
index 00000000000..76cabd27e7f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/antispam.txt
@@ -0,0 +1,251 @@
+status 200
+@ title
+title
+  "Anti-Spam"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=antispam;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Anti-Spam"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Anti-Spam"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This section allows you to setup verification checks to ensure the user is a human (and not a bot), and tweak how and where these apply."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=antispam;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Anti-Spam Verification"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_reg_verification
+          span
+            label [for="reg_verification"]
+              "Require verification on registration page"
+        dd
+          input#reg_verification [checked name="reg_verification" type="checkbox" value="#"]
+        dt
+          a#setting_search_enable_captcha
+          span
+            label [for="search_enable_captcha"]
+              "Require verification on all guest searches"
+        dd
+          input#search_enable_captcha [name="search_enable_captcha" type="checkbox" value="#"]
+        dt
+          a#setting_guests_require_captcha
+          span
+            label [for="guests_require_captcha"]
+              "Guests must pass verification when making a post"
+            br
+            span.smalltext
+              "(Automatically set if you specify a minimum post count below)"
+        dd
+          input#guests_require_captcha [name="guests_require_captcha" type="checkbox" value="#"]
+        dt
+          a#setting_posts_require_captcha_help [href="{boardurl}/index.php?action=helpadmin;help=posts_require_captcha" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_posts_require_captcha
+          span
+            label [for="posts_require_captcha"]
+              "Post count under which users must pass verification to make a post"
+            br
+            span.smalltext
+              "(# for(s) no limit, moderators are exempt)"
+        dd
+          input#posts_require_captcha [min="-#" name="posts_require_captcha" onchange="if (this.value > #){ document.getElementById('guests_require_captcha').checked = true; document.getElementById('guests_require_captcha').disabled = true;} else {document.getElementById('guests_require_captcha').disabled = false;}" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_max_pm_recipients_help [href="{boardurl}/index.php?action=helpadmin;help=max_pm_recipients" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_max_pm_recipients
+          span
+            label [for="max_pm_recipients"]
+              "Maximum number of recipients allowed in a personal message"
+            br
+            span.smalltext
+              "(# for(s) no limit, admins are exempt)"
+        dd
+          input#max_pm_recipients [min="#" name="max_pm_recipients" size="#" type="number" value="#"]
+        dt
+          a#setting_pm_posts_verification_help [href="{boardurl}/index.php?action=helpadmin;help=pm_posts_verification" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_pm_posts_verification
+          span
+            label [for="pm_posts_verification"]
+              "Post count under which users must pass verification when sending personal messages"
+            br
+            span.smalltext
+              "(# for(s) no limit, admins are exempt)"
+        dd
+          input#pm_posts_verification [min="#" name="pm_posts_verification" size="#" type="number" value="#"]
+        dt
+          a#setting_pm_posts_per_hour_help [href="{boardurl}/index.php?action=helpadmin;help=pm_posts_per_hour" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_pm_posts_per_hour
+          span
+            label [for="pm_posts_per_hour"]
+              "Number of personal messages a user may send in an hour"
+            br
+            span.smalltext
+              "(# for(s) no limit, moderators are exempt)"
+        dd
+          input#pm_posts_per_hour [min="#" name="pm_posts_per_hour" size="#" type="number" value="#"]
+    div.cat_bar
+      h3.catbg
+        "Configure Verification methods"
+    div.information.noup
+      span.smalltext
+        "Below you can set which anti-spam features you wish to have enabled whenever a user needs to verify they are a human. Note that the user will have to pass"
+        em
+          "all"
+        "verification so if you enable both a verification image and a question/answer test they need to complete both to proceed."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_visual_verification_type
+          span
+            label [for="visual_verification_type"]
+              "Visual verification image to display"
+            br
+            span.smalltext
+              "The more complex the image the harder it is for bots to bypass"
+        dd
+          select#visual_verification_type [name="visual_verification_type" onchange="refreshImages();" size="#"]
+            option [value="#"]
+              "None"
+            option [value="#"]
+              "Very Simple - Plain text on image"
+            option [value="#"]
+              "Simple - Overlapping colored letters, no noise"
+            option [selected value="#"]
+              "Medium - Overlapping colored letters, with noise/lines"
+            option [value="#"]
+              "High - Angled letters, considerable noise/lines"
+            option [value="#"]
+              "Extreme - Angled letters, noise, lines and blocks"
+          br
+          img#verification_image [alt="Sample" src="{boardurl}/index.php?action=verificationcode;rand={hash};type=#"]
+          br
+    div.cat_bar
+      h3.catbg
+        "reCAPTCHA Verification System"
+    div.information.noup
+      "Configure the reCAPTCHA Verification System. Don’t have a key for reCAPTCHA?"
+      a [href="https://www.google.com/recaptcha/admin"]
+        "Get your reCAPTCHA key here"
+      "."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_recaptcha_enabled
+          span
+            label [for="recaptcha_enabled"]
+              "Use reCAPTCHA Verification System"
+            br
+            span.smalltext
+              "This augments the built-in visual verification"
+        dd
+          input#recaptcha_enabled [name="recaptcha_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_recaptcha_site_key
+          span
+            label [for="recaptcha_site_key"]
+              "Site Key"
+            br
+            span.smalltext
+              "This will be set in the HTML code your site serves to users."
+        dd
+          input#recaptcha_site_key [name="recaptcha_site_key" type="text" value]
+        dt
+          a#setting_recaptcha_secret_key
+          span
+            label [for="recaptcha_secret_key"]
+              "Secret Key"
+            br
+            span.smalltext
+              "This is for communication between your site and Google. Be sure to keep it a secret."
+        dd
+          input#recaptcha_secret_key [name="recaptcha_secret_key" type="text" value]
+        dt
+          a#setting_recaptcha_theme
+          span
+            label [for="recaptcha_theme"]
+              "reCAPTCHA Theme"
+        dd
+          select#recaptcha_theme [name="recaptcha_theme" size="#"]
+            option [value="light"]
+              "Light"
+            option [value="dark"]
+              "Dark"
+    div.cat_bar
+      h3.catbg
+        "Verification Questions"
+    div.information.noup
+      span.smalltext
+        "If you want users to answer verification questions in order to stop spam bots, you should setup a number of questions in the table below. You should choose questions which relate to the subject of your forum. Genuine users will be able to answer these questions, while spam bots will not. Answers are not case sensitive. You may use BBC in the questions for formatting. To remove a question simply delete the contents of that line."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_qa_verification_number
+          span
+            label [for="qa_verification_number"]
+              "Number of verification questions user must answer"
+            br
+            span.smalltext
+              "(# to(s) disable; questions are set below)"
+        dd
+          input#qa_verification_number [min="#" name="qa_verification_number" size="#" type="number" value="#"]
+        dt#qa_dt_en_US.qa_link
+          a [href="javascript:void(#);"]
+            "[ English (US) ]"
+        fieldset#qa_fs_en_US.qa_fieldset
+          legend
+            a [href="javascript:void(#);"]
+              "English (US)"
+          dl.settings
+            dt
+              strong
+                "Question"
+            dd
+              strong
+                "Answer"
+            dt.qa_add_question
+              a [href="javascript:void(#);"]
+                "[ Add another question ]"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | function refreshImages() { var imageType = document.getElementById('visual_verification_type').value; document.getElementById('verification_image').src = '{boardurl}/index.php?action=verificationcode;rand={hash};type=' + imageType; }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments.txt
new file mode 100644
index 00000000000..1db395304b0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments.txt
@@ -0,0 +1,368 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachment Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;save;sa=attachments" method="post"]
+    div.cat_bar
+      h3.catbg
+        a.help [href="{boardurl}/index.php?action=helpadmin;help=attachment_manager_settings" onclick="return reqOverlayDiv(this.href);"]
+          span.help.main_icons [title="Help"]
+        "Attachment Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_attachmentEnable_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentEnable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentEnable
+          span
+            label [for="attachmentEnable"]
+              "Attachments mode"
+        dd
+          select#attachmentEnable [name="attachmentEnable" size="#"]
+            option [value="#"]
+              "Disable attachments"
+            option [selected value="#"]
+              "Enable all attachments"
+            option [value="#"]
+              "Disable new attachments"
+      hr
+      dl.settings
+        dt
+          a#setting_automanage_attachments_help [href="{boardurl}/index.php?action=helpadmin;help=automanage_attachments" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_automanage_attachments
+          span
+            label [for="automanage_attachments"]
+              "Choose the method for the management of the attachment directories"
+        dd
+          select#automanage_attachments [name="automanage_attachments" size="#"]
+            option [value="#"]
+              "(Manual) SMF default behavior"
+            option [value="#"]
+              "(Auto) When either directory space limit is reached"
+            option [value="#"]
+              "(Auto) Subdivide by years"
+            option [value="#"]
+              "(Auto) Subdivide by years and months"
+            option [value="#"]
+              "(Auto) # random(s) directories"
+        dt
+          a#setting_use_subdirectories_for_attachments_help [href="{boardurl}/index.php?action=helpadmin;help=use_subdirectories_for_attachments" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_use_subdirectories_for_attachments
+          span
+            label [for="use_subdirectories_for_attachments"]
+              "Create new directories within a base directory"
+        dd
+          input#use_subdirectories_for_attachments [checked name="use_subdirectories_for_attachments" type="checkbox" value="#"]
+        dt
+          a#setting_basedirectory_for_attachments
+          span
+            label [for="basedirectory_for_attachments"]
+              "Set a base directory for attachments"
+        dd
+          input#basedirectory_for_attachments [name="basedirectory_for_attachments" size="#" type="text" value="{boarddir}/attachments"]
+        dt
+          a#setting_attachmentUploadDir_path
+          span
+            label [for="attachmentUploadDir_path"]
+              "Attachments directory"
+            br
+            span.smalltext
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths"]
+                "[Manage attachment directories]"
+        dd
+          div#attachmentUploadDir_path
+            "{boarddir}/attachments"
+        dt
+          a#setting_attachmentDirFileLimit_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentDirFileLimit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentDirFileLimit
+          span
+            label [for="attachmentDirFileLimit"]
+              "Maximum number of files per directory"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#attachmentDirFileLimit [min="#" name="attachmentDirFileLimit" size="#" type="number" value="#"]
+        dt
+          a#setting_attachmentDirSizeLimit_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentDirSizeLimit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentDirSizeLimit
+          span
+            label [for="attachmentDirSizeLimit"]
+              "Max attachment directory space"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#attachmentDirSizeLimit [min="#" name="attachmentDirSizeLimit" size="#" type="number" value="#"]
+          "KB"
+        dt
+          a#setting_dont_show_attach_under_post_help [href="{boardurl}/index.php?action=helpadmin;help=dont_show_attach_under_post" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_dont_show_attach_under_post
+          span
+            label [for="dont_show_attach_under_post"]
+              "Do not show attachments under the post if they are already embedded in it."
+            br
+            span.smalltext
+              "Enable this if you do not want attachments to appear twice. Attachments embedded in the post still count towards attachment limits and can still be treated like normal attachments."
+        dd
+          input#dont_show_attach_under_post [name="dont_show_attach_under_post" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_attachmentPostLimit_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentPostLimit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentPostLimit
+          span
+            label [for="attachmentPostLimit"]
+              "Max attachment size per post"
+            br
+            span.smalltext
+              "Maximum allowed by php.ini: # KB(s)"
+        dd
+          input#attachmentPostLimit [max="#" min="#" name="attachmentPostLimit" size="#" type="number" value="#"]
+          "KB"
+        dt
+          a#setting_attachmentSizeLimit_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentSizeLimit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentSizeLimit
+          span
+            label [for="attachmentSizeLimit"]
+              "Max size per attachment"
+            br
+            span.smalltext
+              "Maximum allowed by php.ini: # KB(s)"
+        dd
+          input#attachmentSizeLimit [max="#" min="#" name="attachmentSizeLimit" size="#" type="number" value="#"]
+          "KB"
+        dt
+          a#setting_attachmentNumPerPostLimit_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentNumPerPostLimit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentNumPerPostLimit
+          span
+            label [for="attachmentNumPerPostLimit"]
+              "Max number of attachments per post"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#attachmentNumPerPostLimit [min="#" name="attachmentNumPerPostLimit" size="#" type="number" value="#"]
+    div.cat_bar
+      h3.catbg
+        "Attachment security settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_attachmentCheckExtensions_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentCheckExtensions" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentCheckExtensions
+          span
+            label [for="attachmentCheckExtensions"]
+              "Check attachment’s extension"
+        dd
+          input#attachmentCheckExtensions [name="attachmentCheckExtensions" type="checkbox" value="#"]
+        dt
+          a#setting_attachmentExtensions_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentExtensions" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentExtensions
+          span
+            label [for="attachmentExtensions"]
+              "Allowed attachment extensions"
+        dd
+          input#attachmentExtensions [name="attachmentExtensions" size="#" type="text" value="doc,gif,jpg,mpg,pdf,png,txt,zip"]
+      hr
+      dl.settings
+        dt
+          a#setting_attachment_image_reencode_help [href="{boardurl}/index.php?action=helpadmin;help=attachment_image_reencode" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachment_image_reencode
+          span
+            label [for="attachment_image_reencode"]
+              "Re-encode potentially dangerous image attachments"
+        dd
+          input#attachment_image_reencode [checked name="attachment_image_reencode" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dd.alert
+          "The extensive security checks can result in a large number of rejected attachments."
+        dt
+          a#setting_attachment_image_paranoid_help [href="{boardurl}/index.php?action=helpadmin;help=attachment_image_paranoid" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachment_image_paranoid
+          span
+            label [for="attachment_image_paranoid"]
+              "Perform extensive security checks on uploaded image attachments"
+        dd
+          input#attachment_image_paranoid [name="attachment_image_paranoid" type="checkbox" value="#"]
+    div.cat_bar
+      h3.catbg
+        "Thumbnail Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_attachmentShowImages_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentShowImages" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentShowImages
+          span
+            label [for="attachmentShowImages"]
+              "Display image attachments as pictures under post"
+        dd
+          input#attachmentShowImages [checked name="attachmentShowImages" type="checkbox" value="#"]
+        dt
+          a#setting_attachmentThumbnails_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentThumbnails" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentThumbnails
+          span
+            label [for="attachmentThumbnails"]
+              "Resize images when showing under posts"
+        dd
+          input#attachmentThumbnails [checked name="attachmentThumbnails" type="checkbox" value="#"]
+        dt
+          a#setting_attachment_thumb_png
+          span
+            label [for="attachment_thumb_png"]
+              "Save thumbnails as PNG"
+        dd
+          input#attachment_thumb_png [checked name="attachment_thumb_png" type="checkbox" value="#"]
+        dt
+          a#setting_attachment_thumb_memory_help [href="{boardurl}/index.php?action=helpadmin;help=attachment_thumb_memory" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachment_thumb_memory
+          span
+            label [for="attachment_thumb_memory"]
+              "Adaptive thumbnail memory"
+        dd
+          input#attachment_thumb_memory [name="attachment_thumb_memory" type="checkbox" value="#"]
+        dd.alert
+          "If disabled, memory is limited to # MB(s)"
+        dt
+          a#setting_attachmentThumbWidth_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentThumbWidth" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentThumbWidth
+          span
+            label [for="attachmentThumbWidth"]
+              "Maximum width of thumbnails"
+        dd
+          input#attachmentThumbWidth [name="attachmentThumbWidth" size="#" type="text" value="#"]
+        dt
+          a#setting_attachmentThumbHeight_help [href="{boardurl}/index.php?action=helpadmin;help=attachmentThumbHeight" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_attachmentThumbHeight
+          span
+            label [for="attachmentThumbHeight"]
+              "Maximum height of thumbnails"
+        dd
+          input#attachmentThumbHeight [name="attachmentThumbHeight" size="#" type="text" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_max_image_width_help [href="{boardurl}/index.php?action=helpadmin;help=max_image_width" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_max_image_width
+          span
+            label [for="max_image_width"]
+              "Max display width of posted or attached images"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#max_image_width [min="#" name="max_image_width" size="#" type="number" value="#"]
+        dt
+          a#setting_max_image_height_help [href="{boardurl}/index.php?action=helpadmin;help=max_image_height" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_max_image_height
+          span
+            label [for="max_image_height"]
+              "Max display height of posted or attached images"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#max_image_height [min="#" name="max_image_height" size="#" type="number" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | var storing_type = document.getElementById('automanage_attachments'); var base_dir = document.getElementById('use_subdirectories_for_attachments'); storing_type.addEventListener("change", toggleSubDir, false); base_dir.addEventListener("change", toggleSubDir, false); toggleSubDir();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_avatars.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_avatars.txt
new file mode 100644
index 00000000000..e4a5d0b65b3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_avatars.txt
@@ -0,0 +1,390 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Avatar Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;save;sa=avatars" method="post"]
+    div.cat_bar
+      h3.catbg
+        a.help [href="{boardurl}/index.php?action=helpadmin;help=avatar_server_stored" onclick="return reqOverlayDiv(this.href);"]
+          span.help.main_icons [title="Help"]
+        "Server-stored avatars"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_profile_server_avatar
+          span
+            label
+              "Membergroups allowed to select a server stored avatar"
+        dd
+          fieldset#profile_server_avatar
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('profile_server_avatar').style.display = 'none';document.getElementById('profile_server_avatar_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [checked name="profile_server_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [checked name="profile_server_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'profile_server_avatar[');" type="checkbox"]
+                span
+                  "Select all"
+          a#profile_server_avatar_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('profile_server_avatar').style.display = 'block'; document.getElementById('profile_server_avatar_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("profile_server_avatar").style.display = "none"; document.getElementById("profile_server_avatar_groups_link").style.display = "";
+        dt
+          a#setting_avatar_directory
+          span
+            label [for="avatar_directory"]
+              "Avatars directory"
+        dd
+          input#avatar_directory [name="avatar_directory" size="#" type="text" value="{boarddir}/avatars"]
+        dt
+          a#setting_avatar_url
+          span
+            label [for="avatar_url"]
+              "Avatars URL"
+        dd
+          input#avatar_url [name="avatar_url" size="#" type="text" value="{boardurl}/avatars"]
+    div.cat_bar
+      h3.catbg
+        a.help [href="{boardurl}/index.php?action=helpadmin;help=avatar_external" onclick="return reqOverlayDiv(this.href);"]
+          span.help.main_icons [title="Help"]
+        "External avatars"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_profile_remote_avatar
+          span
+            label
+              "Membergroups allowed to select an external URL"
+        dd
+          fieldset#profile_remote_avatar
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('profile_remote_avatar').style.display = 'none';document.getElementById('profile_remote_avatar_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [checked name="profile_remote_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [checked name="profile_remote_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'profile_remote_avatar[');" type="checkbox"]
+                span
+                  "Select all"
+          a#profile_remote_avatar_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('profile_remote_avatar').style.display = 'block'; document.getElementById('profile_remote_avatar_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("profile_remote_avatar").style.display = "none"; document.getElementById("profile_remote_avatar_groups_link").style.display = "";
+        dt
+          a#setting_avatar_download_external_help [href="{boardurl}/index.php?action=helpadmin;help=avatar_download_external" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_avatar_download_external
+          span
+            label [for="avatar_download_external"]
+              "Download avatar at given URL"
+        dd
+          input#avatar_download_external [name="avatar_download_external" onchange="fUpdateStatus();" type="checkbox" value="#"]
+        dt
+          a#setting_avatar_max_width_external
+          span
+            label [for="avatar_max_width_external"]
+              "Maximum width of external avatar"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#avatar_max_width_external [name="avatar_max_width_external" size="#" type="text" value="#"]
+        dt
+          a#setting_avatar_max_height_external
+          span
+            label [for="avatar_max_height_external"]
+              "Maximum height of external avatar"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#avatar_max_height_external [name="avatar_max_height_external" size="#" type="text" value="#"]
+        dt
+          a#setting_avatar_action_too_large_help [href="{boardurl}/index.php?action=helpadmin;help=avatar_action_too_large" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_avatar_action_too_large
+          span
+            label [for="avatar_action_too_large"]
+              "If the avatar is too large..."
+        dd
+          select#avatar_action_too_large [name="avatar_action_too_large" size="#"]
+            option [value="option_refuse"]
+              "Refuse it"
+            option [selected value="option_css_resize"]
+              "Resize it in the users’ browser"
+            option [value="option_download_and_resize"]
+              "Download and resize it on the server"
+    div.cat_bar
+      h3.catbg
+        a.help [href="{boardurl}/index.php?action=helpadmin;help=avatar_upload" onclick="return reqOverlayDiv(this.href);"]
+          span.help.main_icons [title="Help"]
+        "Uploadable avatars"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_profile_upload_avatar
+          span
+            label
+              "Membergroups allowed to upload an avatar to the server"
+        dd
+          fieldset#profile_upload_avatar
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('profile_upload_avatar').style.display = 'none';document.getElementById('profile_upload_avatar_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [checked name="profile_upload_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [checked name="profile_upload_avatar[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'profile_upload_avatar[');" type="checkbox"]
+                span
+                  "Select all"
+          a#profile_upload_avatar_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('profile_upload_avatar').style.display = 'block'; document.getElementById('profile_upload_avatar_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("profile_upload_avatar").style.display = "none"; document.getElementById("profile_upload_avatar_groups_link").style.display = "";
+        dt
+          a#setting_avatar_max_width_upload
+          span
+            label [for="avatar_max_width_upload"]
+              "Maximum width of uploaded avatar"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#avatar_max_width_upload [name="avatar_max_width_upload" size="#" type="text" value="#"]
+        dt
+          a#setting_avatar_max_height_upload
+          span
+            label [for="avatar_max_height_upload"]
+              "Maximum height of uploaded avatar"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#avatar_max_height_upload [name="avatar_max_height_upload" size="#" type="text" value="#"]
+        dt
+          a#setting_avatar_resize_upload
+          span
+            label [for="avatar_resize_upload"]
+              "Resize oversized large avatars"
+            br
+            span.smalltext
+              "(requires GD module or ImageMagick with IMagick extension)"
+        dd
+          input#avatar_resize_upload [checked name="avatar_resize_upload" type="checkbox" value="#"]
+        dt
+          a#setting_avatar_download_png_help [href="{boardurl}/index.php?action=helpadmin;help=avatar_download_png" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_avatar_download_png
+          span
+            label [for="avatar_download_png"]
+              "Use PNG for resized avatars"
+        dd
+          input#avatar_download_png [checked name="avatar_download_png" type="checkbox" value="#"]
+        dt
+          a#setting_avatar_reencode_help [href="{boardurl}/index.php?action=helpadmin;help=avatar_reencode" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_avatar_reencode
+          span
+            label [for="avatar_reencode"]
+              "Re-encode potentially dangerous avatars"
+        dd
+          input#avatar_reencode [checked name="avatar_reencode" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dd.alert
+          "The extensive security checks can result in a large number of rejected avatars."
+        dt
+          a#setting_avatar_paranoid_help [href="{boardurl}/index.php?action=helpadmin;help=avatar_paranoid" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_avatar_paranoid
+          span
+            label [for="avatar_paranoid"]
+              "Perform extensive security checks on uploaded avatars"
+        dd
+          input#avatar_paranoid [name="avatar_paranoid" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_custom_avatar_dir
+          span
+            label [for="custom_avatar_dir"]
+              "Upload directory"
+            br
+            span.smalltext
+              "This should be a valid and writable directory, different from the server-stored directory."
+        dd
+          input#custom_avatar_dir [name="custom_avatar_dir" size="#" type="text" value="{boarddir}/custom_avatar"]
+        dt
+          a#setting_custom_avatar_url
+          span
+            label [for="custom_avatar_url"]
+              "Upload URL"
+        dd
+          input#custom_avatar_url [name="custom_avatar_url" size="#" type="text" value="{boardurl}/custom_avatar"]
+    div.cat_bar
+      h3.catbg
+        "Gravatars (Globally Recognized Avatars)"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_gravatarEnabled
+          span
+            label [for="gravatarEnabled"]
+              "Enable Gravatars for forum users?"
+        dd
+          input#gravatarEnabled [checked name="gravatarEnabled" type="checkbox" value="#"]
+        dt
+          a#setting_gravatarOverride
+          span
+            label [for="gravatarOverride"]
+              "Force Gravatars to be used instead of normal avatars?"
+        dd
+          input#gravatarOverride [name="gravatarOverride" type="checkbox" value="#"]
+        dt
+          a#setting_gravatarAllowExtraEmail
+          span
+            label [for="gravatarAllowExtraEmail"]
+              "Allow storing an extra email address for Gravatars?"
+        dd
+          input#gravatarAllowExtraEmail [checked name="gravatarAllowExtraEmail" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_gravatarMaxRating
+          span
+            label [for="gravatarMaxRating"]
+              "Maximum allowed rating?"
+        dd
+          select#gravatarMaxRating [name="gravatarMaxRating" size="#"]
+            option [value="G"]
+              "G rated (Generally acceptable)"
+            option [selected value="PG"]
+              "PG rated (Parental Guidance)"
+            option [value="R"]
+              "R rated (Restricted)"
+            option [value="X"]
+              "X rated (Explicit)"
+        dt
+          a#setting_gravatarDefault
+          span
+            label [for="gravatarDefault"]
+              "Default image to show when an email address has no matching Gravatar"
+        dd
+          select#gravatarDefault [name="gravatarDefault" size="#"]
+            option [value="mm"]
+              "A simple, cartoon-style silhouetted outline of a person"
+            option [value="identicon"]
+              "A geometric pattern based on an email hash"
+            option [value="monsterid"]
+              "A generated \"monster\" with different colors, faces, etc"
+            option [value="wavatar"]
+              "Generated faces with differing features and backgrounds"
+            option [value="retro"]
+              "Awesome generated, #-bit arcade-style pixelated faces"
+            option [value="blank"]
+              "A transparent PNG image"
+      input.button [onclick="return (document.getElementById('custom_avatar_dir').value == '' || document.getElementById('custom_avatar_url').value == '') ? confirm('The custom avatars directory you have specified may be empty or invalid. Please ensure these settings are correct.') : true;" type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | var fUpdateStatus = function () { document.getElementById("avatar_max_width_external").disabled = document.getElementById("avatar_download_external").checked; document.getElementById("avatar_max_height_external").disabled = document.getElementById("avatar_download_external").checked; document.getElementById("avatar_action_too_large").disabled = document.getElementById("avatar_download_external").checked; } addLoadEvent(fUpdateStatus);
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse.txt
new file mode 100644
index 00000000000..0e31dcb088d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse.txt
@@ -0,0 +1,128 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Files"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=remove" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Browse files:"
+        img [alt=">" src="{boardurl}/Themes/default/images/selected.png"]
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse"]
+          "Attachments"
+        "|"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars"]
+          "Avatars"
+        "|"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs"]
+          "Thumbnails"
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    table#file_list.table_grid
+      thead
+        tr.title_bar
+          th#header_file_list_name.name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;sort=name;desc" rel="nofollow"]
+              "Attachment name"
+              span.main_icons.sort_up
+          th#header_file_list_filesize.filesize [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;sort=filesize" rel="nofollow"]
+              "File size"
+          th#header_file_list_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;sort=member" rel="nofollow"]
+              "Posted by"
+          th#header_file_list_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;sort=date" rel="nofollow"]
+              "Date"
+          th#header_file_list_downloads.downloads [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;sort=downloads" rel="nofollow"]
+              "Downloads"
+          th#header_file_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no attachments."
+    div.flow_auto
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    input [name="type" type="hidden" value="attachments"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="name"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_avatars.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_avatars.txt
new file mode 100644
index 00000000000..4915e679ad6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_avatars.txt
@@ -0,0 +1,128 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Files"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=remove;avatars" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Browse files:"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse"]
+          "Attachments"
+        "|"
+        img [alt=">" src="{boardurl}/Themes/default/images/selected.png"]
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars"]
+          "Avatars"
+        "|"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs"]
+          "Thumbnails"
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    table#file_list.table_grid
+      thead
+        tr.title_bar
+          th#header_file_list_name.name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars;sort=name;desc" rel="nofollow"]
+              "Attachment name"
+              span.main_icons.sort_up
+          th#header_file_list_filesize.filesize [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars;sort=filesize" rel="nofollow"]
+              "File size"
+          th#header_file_list_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars;sort=member" rel="nofollow"]
+              "Member"
+          th#header_file_list_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars;sort=date" rel="nofollow"]
+              "Last active"
+          th#header_file_list_downloads.downloads [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars;sort=downloads" rel="nofollow"]
+              "Downloads"
+          th#header_file_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no avatars."
+    div.flow_auto
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    input [name="type" type="hidden" value="avatars"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="name"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_thumbs.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_thumbs.txt
new file mode 100644
index 00000000000..b030e591590
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_browse_thumbs.txt
@@ -0,0 +1,128 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Files"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=remove;thumbs" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Browse files:"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse"]
+          "Attachments"
+        "|"
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;avatars"]
+          "Avatars"
+        "|"
+        img [alt=">" src="{boardurl}/Themes/default/images/selected.png"]
+        a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs"]
+          "Thumbnails"
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    table#file_list.table_grid
+      thead
+        tr.title_bar
+          th#header_file_list_name.name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs;sort=name;desc" rel="nofollow"]
+              "Attachment name"
+              span.main_icons.sort_up
+          th#header_file_list_filesize.filesize [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs;sort=filesize" rel="nofollow"]
+              "File size"
+          th#header_file_list_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs;sort=member" rel="nofollow"]
+              "Posted by"
+          th#header_file_list_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs;sort=date" rel="nofollow"]
+              "Date"
+          th#header_file_list_downloads.downloads [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;thumbs;sort=downloads" rel="nofollow"]
+              "Downloads"
+          th#header_file_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no thumbnails."
+    div.flow_auto
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected attachments?" name="remove_submit" type="submit" value="Remove selected"]
+    input [name="type" type="hidden" value="thumbs"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="name"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_maintenance.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_maintenance.txt
new file mode 100644
index 00000000000..84b8613c67c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_maintenance.txt
@@ -0,0 +1,225 @@
+status 200
+@ title
+title
+  "Attachments and Avatars"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "File Maintenance"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_attachments
+    div.cat_bar
+      h3.catbg
+        "File attachment statistics"
+    div.windowbg
+      dl.settings
+        dt
+          strong
+            "Total attachments"
+        dd
+          "#"
+        dt
+          strong
+            "Total avatars"
+        dd
+          "#"
+        dt
+          strong
+            "Total size of all attachment directories"
+        dd
+          "# KB(s)"
+        dt
+          strong
+            "Current attachment directory"
+        dd.word_break
+          "{boarddir}/attachments"
+        dt
+          strong
+            "Total size of current attachment directory"
+        dd
+          "# KB(s)"
+        dt
+          strong
+            "Total space available"
+        dd
+          "# KB(s)"
+        dt
+          strong
+            "Total files in current attachment directory"
+        dd
+          "#"
+        dt
+          strong
+            "Total files remaining"
+        dd
+          "#"
+    div.cat_bar
+      h3.catbg
+        "Attachment integrity check"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=repair;{session_var}={session_id}" method="post"]
+        p
+          "This function will check the integrity and sizes of attachments and filenames listed in the database and, if necessary, fix errors it encounters."
+        input.button [name="repair" type="submit" value="Run check now"]
+    div.cat_bar
+      h3.catbg
+        "Attachment Pruning"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments" method="post" onsubmit="return confirm('Are you sure you want to delete these attachments?\\nThis cannot be undone!');"]
+        dl.settings
+          dt
+            "Remove attachments older than"
+          dd
+            input [name="age" size="#" type="number" value="#"]
+            "days"
+          dt
+            "Message to add to post"
+          dd
+            input [name="notice" size="#" type="text" value="[attachment deleted by admin]"]
+          input.button [name="remove" type="submit" value="Remove"]
+          input [name="type" type="hidden" value="attachments"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="sa" type="hidden" value="byage"]
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments" method="post" onsubmit="return confirm('Are you sure you want to delete these attachments?\\nThis cannot be undone!');"]
+        dl.settings
+          dt
+            "Remove attachments larger than"
+          dd
+            input#size [name="size" size="#" type="number" value="#"]
+            "KB"
+          dt
+            "Message to add to post"
+          dd
+            input [name="notice" size="#" type="text" value="[attachment deleted by admin]"]
+          input.button [name="remove" type="submit" value="Remove"]
+          input [name="type" type="hidden" value="attachments"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="sa" type="hidden" value="bysize"]
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments" method="post" onsubmit="return confirm('Are you sure you want to delete these attachments?\\nThis cannot be undone!');"]
+        dl.settings
+          dt
+            "Remove avatars from members not active for more than"
+          dd
+            input [name="age" size="#" type="number" value="#"]
+            "days"
+          input.button [name="remove" type="submit" value="Remove"]
+          input [name="type" type="hidden" value="avatars"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="sa" type="hidden" value="byage"]
+  div#transfer.cat_bar
+    h3.catbg
+      "Transfer Attachments"
+  div.windowbg
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=transfer" method="post"]
+      p
+        "Transfer files between directories."
+      dl.settings
+        dt
+          "Transfer files from"
+        dd
+          select [name="from"]
+            option [value="#"]
+              "Select directory"
+            option [value="#"]
+              "{boarddir}/attachments"
+        dt
+          "Automatically by space or file count"
+        dd
+          select [name="auto"]
+            option [value="#"]
+              "Select base directory"
+            option [value="-#"]
+              "Forum root directory."
+            option [disabled value="#"]
+              "No base directories available."
+        dt
+          "Or to a specific directory."
+        dd
+          select [name="to"]
+            option [value="#"]
+              "Select directory"
+            option [value="#"]
+              "{boarddir}/attachments"
+        dt
+          "Empty the source directory"
+        dd
+          input [checked name="empty_it" type="checkbox"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input.button [name="transfer" onclick="start_progress()" type="submit" value="Transfer"]
+      div#progress_msg
+      div#show_progress.padding
+    script
+      | function start_progress() { setTimeout(show_msg, #); } function show_msg() { $('#progress_msg').html('<div><img src="{boardurl}/Themes/default/images/loading_sm.gif" alt="Loading..." width="#" height="#"> Please wait. Transfer in progress.<\/div>'); show_progress(); } function show_progress() { $('#show_progress').on("load", "progress.php"); setTimeout(show_progress, #); }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/attachments_paths.txt b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_paths.txt
new file mode 100644
index 00000000000..fc7900ea0d3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/attachments_paths.txt
@@ -0,0 +1,126 @@
+status 200
+@ title
+title
+  "Manage attachment paths"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments and Avatars"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Attachment Directories"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_files" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Attachments and Avatars"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can administer the attached files on your system. You can delete attachments by size and by date from your system. Statistics on attachments are also displayed below."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Attachments and Avatars Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Attachments and Avatars Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=browse;{session_var}={session_id}"]
+                "Browse Files"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachments;{session_var}={session_id}"]
+                "Attachment Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=avatars;{session_var}={session_id}"]
+                "Avatar Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}"]
+                "Attachment Directories"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageattachments;sa=maintenance;{session_var}={session_id}"]
+                "File Maintenance"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageattachments;sa=attachpaths;{session_var}={session_id}" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Attachment directory paths"
+    div.additional_row.information
+      "Create new directories or change the current directory below."
+      br
+      "To create a new directory within the forum directory structure, use just the directory name."
+      br
+      "To remove a directory, blank the path input field. Only empty directories can be removed. To see if a directory is empty, check for files or sub-directories in brackets next to the file count."
+      br
+      "To rename a directory, simply change its name in the input field. Only directories without sub-directories may be renamed."
+    table#attach_paths.table_grid
+      thead
+        tr.title_bar
+          th#header_attach_paths_current_dir.centercol.current_dir [scope="col"]
+            "Current"
+          th#header_attach_paths_path.path [scope="col"]
+            "Path"
+          th#header_attach_paths_current_size.current_size [scope="col"]
+            "Size (KB)"
+          th#header_attach_paths_num_files.num_files [scope="col"]
+            "Files"
+          th#header_attach_paths_status.centercol.status [scope="col"]
+            "Status"
+      tbody
+        tr#list_attach_paths_#.windowbg
+          td.centercol.current_dir [style="width: #%;"]
+            input [checked name="current_dir" type="radio" value="#"]
+          td.path [style="width: #%;"]
+            input [name="dirs[#]" type="hidden" value="{boarddir}/attachments"]
+            input [name="dirs[#]" size="#" style="width: #%" type="text" value="{boarddir}/attachments"]
+          td.current_size [style="width: #%;"]
+            "#"
+          td.num_files [style="width: #%;"]
+            "#"
+          td.centercol.status [style="width: #%;"]
+            "Unused"
+    div.flow_auto
+      div.additional_row
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input.button [name="save" type="submit" value="Save"]
+        input.button [name="new_path" type="submit" value="Add Path"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/bans.txt b/tests/Integration/Http/Snapshot/snapshots/admin/bans.txt
new file mode 100644
index 00000000000..30501c37712
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/bans.txt
@@ -0,0 +1,76 @@
+status 200
+@ title
+title
+  "Ban list"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban list"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban list"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=ban;sa=list" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Ban list"
+    div.additional_row
+      input.button [name="removeBans" type="submit" value="Remove selected"]
+    table#ban_list.table_grid
+      thead
+        tr.title_bar
+          th#header_ban_list_name.name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=name" rel="nofollow"]
+              "Ban name"
+          th#header_ban_list_notes.notes [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=notes" rel="nofollow"]
+              "Notes"
+          th#header_ban_list_reason.reason [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=reason" rel="nofollow"]
+              "Reason"
+          th#header_ban_list_added.added [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=added" rel="nofollow"]
+              "Added"
+              span.main_icons.sort_down
+          th#header_ban_list_expires.expires [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=expires" rel="nofollow"]
+              "Expires"
+          th#header_ban_list_num_triggers.num_triggers [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=list;sort=num_triggers" rel="nofollow"]
+              "Triggers"
+          th#header_ban_list_actions.actions.centercol [scope="col"]
+            "Actions"
+          th#header_ban_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no bans in effect."
+    div.additional_row
+      input.button [name="removeBans" type="submit" value="Remove selected"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | var removeBans = $("input[name='removeBans']"); removeBans.on( "click", function(e) { var removeItems = $("input[name='remove[]']:checked").length; if (removeItems == #) { e.preventDefault(); return alert("Please select at least one item in the list"); } return confirm("Are you sure you want to remove the selected bans?"); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/bans_add.txt b/tests/Integration/Http/Snapshot/snapshots/admin/bans_add.txt
new file mode 100644
index 00000000000..8507f8c91bf
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/bans_add.txt
@@ -0,0 +1,149 @@
+status 200
+@ title
+title
+  "Ban list"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban list"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=add;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Add new ban"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div#manage_bans
+    form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=ban;sa=edit" method="post" onsubmit="return confirmBan(this);"]
+      div.cat_bar
+        h3.catbg
+          "Add new ban"
+      div.information.noup
+        strong
+          "Note"
+        ": after creating the above ban, you can add additional entries that trigger the ban, like IP addresses, hostnames, and email addresses."
+      div.noup.windowbg
+        dl.settings
+          dt#ban_name_label
+            strong
+              "Ban name:"
+          dd
+            input#ban_name [maxlength="#" name="ban_name" size="#" type="text" value]
+          dt
+            strong
+              label [for="reason"]
+                "Reason"
+            br
+            span.smalltext
+              "Reason for ban, to be displayed to banned member."
+          dd
+            textarea#reason [cols="#" name="reason" rows="#"]
+          dt
+            strong
+              label [for="ban_notes"]
+                "Notes"
+            br
+            span.smalltext
+              "Notes that may assist other staff members."
+          dd
+            textarea#ban_notes [cols="#" name="notes" rows="#"]
+        fieldset.ban_settings.floatleft
+          legend
+            "Expiration"
+          input#never_expires [checked name="expiration" onclick="fUpdateStatus();" type="radio" value="never"]
+          label [for="never_expires"]
+            "Never"
+          br
+          input#expires_one_day [name="expiration" onclick="fUpdateStatus();" type="radio" value="one_day"]
+          label [for="expires_one_day"]
+            "Ban will expire after"
+          input#expire_date [name="expire_date" size="#" type="number" value="#"]
+          "days"
+          br
+          input#already_expired [name="expiration" onclick="fUpdateStatus();" type="radio" value="expired"]
+          label [for="already_expired"]
+            "Expired / disabled"
+        fieldset.ban_settings.floatright
+          legend
+            "Restriction"
+          input#full_ban [checked name="full_ban" onclick="fUpdateStatus();" type="radio" value="#"]
+          label [for="full_ban"]
+            "Full ban"
+          br
+          input#partial_ban [name="full_ban" onclick="fUpdateStatus();" type="radio" value="#"]
+          label [for="partial_ban"]
+            "Partial ban"
+          br
+          input#cannot_post.ban_restriction [name="cannot_post" type="checkbox" value="#"]
+          label [for="cannot_post"]
+            "Cannot post"
+          "("
+          a [href="{boardurl}/index.php?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);"]
+            "?"
+          ")"
+          br
+          input#cannot_register.ban_restriction [name="cannot_register" type="checkbox" value="#"]
+          label [for="cannot_register"]
+            "Cannot register"
+          br
+          input#cannot_login.ban_restriction [name="cannot_login" type="checkbox" value="#"]
+          label [for="cannot_login"]
+            "Cannot login"
+          br
+        br.clear_right
+        fieldset
+          legend
+            input [onclick="invertAll(this, this.form, 'ban_suggestion');" type="checkbox"]
+            "Triggers"
+          dl.settings
+            dt
+              input#main_ip_check [name="ban_suggestions[]" type="checkbox" value="main_ip"]
+              label [for="main_ip_check"]
+                "Ban on IP (e.g. #-#.*)"
+            dd
+              input [name="main_ip" onfocus="document.getElementById('main_ip_check').checked = true;" size="#" type="text" value]
+            dt
+              input#hostname_check [name="ban_suggestions[]" type="checkbox" value="hostname"]
+              label [for="hostname_check"]
+                "Ban on Hostname (e.g. *.mil)"
+            dd
+              input [name="hostname" onfocus="document.getElementById('hostname_check').checked = true;" size="#" type="text" value]
+            dt
+              input#email_check [name="ban_suggestions[]" type="checkbox" value="email"]
+              label [for="email_check"]
+                "Ban on Email Address (e.g. *@badsite.com)"
+            dd
+              input [name="email" onfocus="document.getElementById('email_check').checked = true;" size="#" type="text" value]
+            dt
+              input#user_check [name="ban_suggestions[]" type="checkbox" value="user"]
+              label [for="user_check"]
+                "Ban on Username"
+            dd
+              input#user [name="user" size="#" type="text" value]
+        input.button [name="add_ban" type="submit" value="Add"]
+        input [name="old_expire" type="hidden" value="#"]
+        input [name="bg" type="hidden" value="#"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | var fUpdateStatus = function () { document.getElementById("expire_date").disabled = !document.getElementById("expires_one_day").checked; document.getElementById("cannot_post").disabled = document.getElementById("full_ban").checked; document.getElementById("cannot_register").disabled = document.getElementById("full_ban").checked; document.getElementById("cannot_login").disabled = document.getElementById("full_ban").checked; } addLoadEvent(fUpdateStatus); var oAddMemberSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'user', sControlId: 'user', sSearchType: 'member', sTextDeleteItem: 'Delete Item', }); function confirmBan(aForm) { if (aForm.ban_name.value == '') { alert('The name of the ban was left empty'); return false; } if (aForm.partial_ban.checked && !(aForm.cannot_post.checked || aForm.cannot_register.checked || aForm.cannot_login.checked)) { alert('No restriction selected.'); return false; } }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/bans_browse.txt b/tests/Integration/Http/Snapshot/snapshots/admin/bans_browse.txt
new file mode 100644
index 00000000000..c2fe44dc75b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/bans_browse.txt
@@ -0,0 +1,75 @@
+status 200
+@ title
+title
+  "Ban list"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban list"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Ban Triggers"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=ip" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Browse Ban Triggers"
+    div.additional_row
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=ip"]
+        img [alt=">" src="{boardurl}/Themes/default/images/selected.png"]
+        "IP"
+      "|"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=hostname"]
+        "Hostname"
+      "|"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=email"]
+        "Email"
+      "|"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=member"]
+        "Username"
+    table#ban_trigger_list.table_grid
+      thead
+        tr.title_bar
+          th#header_ban_trigger_list_banned_entity.banned_entity [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=ip;sort=banned_entity;desc" rel="nofollow"]
+              "Banned entity"
+              span.main_icons.sort_up
+          th#header_ban_trigger_list_ban_name.ban_name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=ip;sort=ban_name" rel="nofollow"]
+              "Ban name"
+          th#header_ban_trigger_list_hits.hits [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=browse;entity=ip;sort=hits" rel="nofollow"]
+              "Hits"
+          th#header_ban_trigger_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no ban triggers."
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to remove the selected ban triggers?" name="remove_triggers" type="submit" value="Remove selected ban triggers"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="banned_entity"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/bans_log.txt b/tests/Integration/Http/Snapshot/snapshots/admin/bans_log.txt
new file mode 100644
index 00000000000..21df84c8be7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/bans_log.txt
@@ -0,0 +1,69 @@
+status 200
+@ title
+title
+  "Ban Log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban list"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Ban Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=ban;sa=log" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Ban Log"
+    div.flow_hidden.information
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to delete all selected ban log entries?" name="removeSelected" type="submit" value="Remove selected"]
+        input.button.you_sure [data-confirm="Are you sure you want to delete all ban log entries?" name="removeAll" type="submit" value="Clear log"]
+    table#ban_log.table_grid
+      thead
+        tr.title_bar
+          th#header_ban_log_ip.ip [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;sort=ip" rel="nofollow"]
+              "IP"
+          th#header_ban_log_email.email [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;sort=email" rel="nofollow"]
+              "Email address"
+          th#header_ban_log_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;sort=member" rel="nofollow"]
+              "Member"
+          th#header_ban_log_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=ban;sa=log;sort=date;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+          th#header_ban_log_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      snapshot-ignored [selector="table.table_grid tbody"]
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to delete all selected ban log entries?" name="removeSelected" type="submit" value="Remove selected"]
+      input.button.you_sure [data-confirm="Are you sure you want to delete all ban log entries?" name="removeAll" type="submit" value="Clear log"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="sort" type="hidden" value="date"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/board_index.txt b/tests/Integration/Http/Snapshot/snapshots/admin/board_index.txt
new file mode 100644
index 00000000000..3b74d3b22e2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/board_index.txt
@@ -0,0 +1,95 @@
+status 200
+@ title
+title
+  "{forum_name} - Index"
+@ #category_#
+div#category_#.cat_bar
+  h3.catbg
+    a#c#
+    a [href="{boardurl}/index.php?action=unread;c=#" title="Click to see the new posts in Snapshot fixtures"]
+      "Snapshot fixtures"
+  span#category_#_upshrink.toggle_up [data-collapsed="#" style="display: none;" title="Hide Category"]
+  div.desc
+    "Content for the template snapshot tests, version #."
+@ #category_#_boards
+div#category_#_boards
+  div#board_#.up_contain
+    div.board_icon
+      a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "Topics, replies and a poll for the snapshot tests."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+      p
+        strong
+          "Last post:"
+        "{date}"
+        span.postby
+          a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+            "{subject}"
+          "by"
+          a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+            "{member}"
+    div#board_#_children.children
+      p
+        strong#child_list_#
+          "Sub-Boards"
+        span
+          a [href="{boardurl}/index.php?board=#" title="No New Posts (# topic(s), # post(s))"]
+            "{board}"
+  div#board_#.up_contain
+    div.board_icon
+      a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "A board with nothing in it."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+@ #info_center
+div#info_center.roundframe
+  div.title_bar
+    h3.titlebg
+      a#upshrink_link [href="#"]
+        "{forum_name} - Info Center"
+    span#upshrink_ic.toggle_up [style="display: none;" title="Hide Info Center"]
+  div#upshrink_stats
+    div.sub_bar
+      h4.subbg
+        a [href="{boardurl}/index.php?action=stats" title="[More Stats]"]
+          span.main_icons.stats
+          "Forum Stats"
+    p.inline
+      "# post(s) in # topic(s) by # member(s) - Latest Member:"
+      strong
+        a [href="{boardurl}/index.php?action=profile;u=#"]
+          "{member}"
+      br
+      "Latest Post:"
+      strong
+        "\""
+        a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+          "{subject}"
+        "\""
+      "({date})"
+      br
+      a [href="{boardurl}/index.php?action=recent"]
+        "View the most recent posts on the forum."
+    div.sub_bar
+      h4.subbg
+        a [href="{boardurl}/index.php?action=who"]
+          span.main_icons.people
+          "Users Online"
+    snapshot-ignored [selector="#upshrink_stats > p:nth-of-type(#)"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/chrome.txt b/tests/Integration/Http/Snapshot/snapshots/admin/chrome.txt
new file mode 100644
index 00000000000..35bed6648bf
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/chrome.txt
@@ -0,0 +1,185 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  link [href="https://use.fontawesome.com/releases/v#/css/all.css" rel="stylesheet"]
+  style
+    | img.avatar { max-width: #px !important; max-height: #px !important; }
+  noscript
+    link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  script
+    | var smf_theme_url = "{boardurl}/Themes/default"; var smf_default_theme_url = "{boardurl}/Themes/default"; var smf_images_url = "{boardurl}/Themes/default/images"; var smf_smileys_url = "{boardurl}/Smileys"; var smf_smiley_sets = "fugue,alienine"; var smf_smiley_sets_default = "fugue"; var smf_avatars_url = "{boardurl}/avatars"; var smf_scripturl = "{boardurl}/index.php"; var smf_charset = "UTF-#"; var smf_session_id = "{session_id}"; var smf_session_var = "{session_var}"; var smf_member_id = #; var ajax_notification_text = 'Loading...'; var help_popup_heading_text = 'A little lost? Let me explain:'; var banned_text = 'Sorry admin, you are banned from using this forum!'; var smf_txt_expand = 'Expand'; var smf_txt_shrink = 'Shrink'; var smf_collapseAlt = 'Hide Category'; var smf_expandAlt = 'Show Category'; var smf_quote_expand = false; var allow_xhjr_credentials = false;
+  script [src="https://ajax.googleapis.com/ajax/libs/jquery/#/jquery.min.js"]
+  script [src="{boardurl}/Themes/default/scripts/minified_{hash}.js?smf#alpha#dev_#"]
+  script
+    | var new_alert_title = "{forum_name}"; var alert_timeout = #; var smf_you_sure ='Are you sure you want to do this?';
+  title
+    "{forum_name} - Index"
+  meta [content="width=device-width, initial-scale=#" name="viewport"]
+  meta [content="{forum_name}" property="og:site_name"]
+  meta [content="{forum_name} - Index" property="og:title"]
+  meta [content="{boardurl}/index.php" property="og:url"]
+  meta [content="{forum_name} - Index" property="og:description"]
+  meta [content="{forum_name} - Index" name="description"]
+  meta [content="##EA#" name="theme-color"]
+  link [href="{boardurl}/index.php" rel="canonical"]
+  link [href="{boardurl}/index.php?action=help" rel="help"]
+  link [href="{boardurl}/index.php" rel="contents"]
+  link [href="{boardurl}/index.php?action=search" rel="search"]
+  link [href="{boardurl}/index.php?action=feed;type=rss#" rel="alternate" title="{forum_name} - RSS" type="application/rss+xml"]
+  link [href="{boardurl}/index.php?action=feed;type=atom" rel="alternate" title="{forum_name} - Atom" type="application/atom+xml"]
+@ body
+body#smf.action_home
+  div#footerfix
+    div#top_section
+      div.content_wrapper.inner_wrap
+        ul#top_info.floatleft
+          li
+            a#profile_menu_top [href="{boardurl}/index.php?action=profile"]
+              img.avatar [alt src="{boardurl}/avatars/default.png"]
+              span.textmenu
+                "{member}"
+            div#profile_menu.top_menu
+          li
+            a#pm_menu_top [href="{boardurl}/index.php?action=pm"]
+              span.inbox.main_icons
+              span.textmenu
+                "My Messages"
+            div#pm_menu.scrollable.top_menu
+          li
+            a#alerts_menu_top [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+              span.alerts.main_icons
+              span.textmenu
+                "Alerts"
+            div#alerts_menu.scrollable.top_menu
+          li#nojs_logout
+            a [href="{boardurl}/index.php?action=logout;{session_var}={session_id}"]
+              "Log out"
+            script
+              | document.getElementById("nojs_logout").style.display = "none";
+        form#search_form.floatright [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post"]
+          input [name="search" type="search" value]
+          select [name="search_selection"]
+            option [selected value="all"]
+              "Entire forum"
+            option [value="members"]
+              "Members"
+          input.button [name="search#" type="submit" value="Search"]
+          input [name="advanced" type="hidden" value="#"]
+    header#header.content_wrapper
+      h1.forumtitle
+        a#top [href="{boardurl}/index.php"]
+          "{forum_name}"
+      img#smflogo [alt="Simple Machines Forum" src="{boardurl}/Themes/default/images/smflogo.svg" title="Simple Machines Forum"]
+    nav#main_menu [aria-label="Main Menu"]
+      div.content_wrapper
+        a.mobile_user_menu
+          span.menu_icon
+          span.text_menu
+            "Main Menu"
+        div#mobile_user_menu.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Main Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            ul.dropmenu.menu_nav
+              li.button_home
+                a.active [href="{boardurl}/index.php"]
+                  span.home.main_icons
+                  span.textmenu
+                    "Home"
+              li.button_search
+                a [href="{boardurl}/index.php?action=search"]
+                  span.main_icons.search
+                  span.textmenu
+                    "Search"
+              li.button_admin.subsections
+                a [href="{boardurl}/index.php?action=admin"]
+                  span.admin.main_icons
+                  span.textmenu
+                    "Admin"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=featuresettings"]
+                      "Features and Options"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=packages"]
+                      "Package Manager"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=logs;sa=errorlog;desc"]
+                      "Error Log"
+                  li
+                    a [href="{boardurl}/index.php?action=admin;area=permissions"]
+                      "Permissions"
+              li.button_moderate.subsections
+                a [href="{boardurl}/index.php?action=moderate"]
+                  span.main_icons.moderate
+                  span.textmenu
+                    "Moderate"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=modlog"]
+                      "Moderation Log"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+                      "Reported Posts"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+                      "Reported Members"
+              li.button_mlist.subsections
+                a [href="{boardurl}/index.php?action=mlist"]
+                  span.main_icons.mlist
+                  span.textmenu
+                    "Members"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=mlist"]
+                      "View the memberlist"
+                  li
+                    a [href="{boardurl}/index.php?action=mlist;sa=search"]
+                      "Search for Members"
+    div#wrapper.content_wrapper
+      div#inner_wrap
+        div.user
+          time [datetime="{date}"]
+            "{date}"
+          ul.unread_links
+            li
+              a [href="{boardurl}/index.php?action=unread" title="Show unread posts since last visit."]
+                "Unread Posts"
+            li
+              a [href="{boardurl}/index.php?action=unreadreplies" title="Show new replies to your posts."]
+                "Updated Topics"
+        div.news
+          h2
+            "News:"
+          p
+            "SMF - Just Installed!"
+      nav.navigate_section [aria-label="Breadcrumb"]
+        ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+          li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+            a [href="{boardurl}/index.php" itemprop="item"]
+              span [itemprop="name"]
+                "{forum_name}"
+            meta [content="#" itemprop="position"]
+      div#content_section
+        snapshot-ignored [selector="#main_content_section"]
+  footer#footer
+    div.content_wrapper
+      ul
+        li.copyright
+          a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+            "SMF # Alpha(s) #-dev © #"
+          ","
+          a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+            "Simple Machines"
+        li.helplinks
+          a [href="{boardurl}/index.php?action=help"]
+            "Help"
+          a [href="{boardurl}/index.php?action=agreement"]
+            "Terms and Rules"
+          a [href="#top_section"]
+            "Go Up ▲"
+  script
+    | window.addEventListener("DOMContentLoaded", function() { function triggerCron() { $.get('{boardurl}' + "/cron.php?ts=#"); } window.setTimeout(triggerCron, #); var user_menus = new smc_PopupMenu(); user_menus.add("profile", "{boardurl}/index.php?action=profile;area=popup"); user_menus.add("alerts", "{boardurl}/index.php?action=profile;area=alerts_popup;u=#"); user_menus.add("pm", "{boardurl}/index.php?action=pm;sa=popup"); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/display.txt b/tests/Integration/Http/Snapshot/snapshots/admin/display.txt
new file mode 100644
index 00000000000..d02273cced2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/display.txt
@@ -0,0 +1,747 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+          "Add poll"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                    li.email
+                      a [href="mailto:{email}" rel="nofollow"]
+                        span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#"]
+                    span
+                      "Show IP address"
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "(?)"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "The first post, with"
+                  strong
+                    "bold"
+                  ","
+                  em
+                    "italic"
+                  ","
+                  u
+                    "underlined"
+                  "and"
+                  s
+                    "struck"
+                  "text."
+                  br
+                  a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+                    "A link"
+                  "and"
+                  a.bbc_email [href="mailto:{email}"]
+                    "{email}"
+                  "."
+                  br
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote"
+                    "An unattributed quote."
+                  div.codeheader
+                    "Code"
+                  pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+                    code
+                      "echo \"code\";"
+                  ul.bbc_list
+                    li
+                      "One"
+                    li
+                      "Two"
+                  span.bbc_color [style="color: red;"]
+                    "Red"
+                  span.bbc_size [style="font-size: #pt;"]
+                    "Sized"
+                  div.centertext
+                    "Centred"
+                  table.bbc_table
+                    thead
+                      tr
+                        th
+                          "A"
+                        th
+                          "B"
+                    tbody
+                  span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+                    button [tabindex="#" title="Show or hide spoiler content" type="button"]
+                    span
+                      "Hidden"
+                  hr.bbc_hr
+                  "Smileys:"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+                  img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove topic"
+                      li
+                        a [href="{boardurl}/index.php?action=splittopics;topic=#;at=#"]
+                          span.main_icons.split_button
+                          "Split Topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#;msg=#"]
+                          span.main_icons.warn_button
+                          "Issue Warning"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                "Snapshot Guest"
+              ul.user_info
+                li.membergroup
+                  "Guest"
+                li.email
+                  a [href="mailto:{email}" rel="nofollow"]
+                    span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=trackip;searchip=#"]
+                    span
+                      "Show IP address"
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "(?)"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from a guest."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Remove this post?" href="{boardurl}/index.php?action=deletemsg;topic=#;msg=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove"
+                      li
+                        a [href="{boardurl}/index.php?action=splittopics;topic=#;at=#"]
+                          span.main_icons.split_button
+                          "Split Topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                    li.email
+                      a [href="mailto:{email}" rel="nofollow"]
+                        span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#"]
+                    span
+                      "Show IP address"
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "(?)"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote from: {member}"
+                    "The quoted text."
+                  "A reply from an administrator."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Remove this post?" href="{boardurl}/index.php?action=deletemsg;topic=#;msg=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove"
+                      li
+                        a [href="{boardurl}/index.php?action=splittopics;topic=#;at=#"]
+                          span.main_icons.split_button
+                          "Split Topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#;msg=#"]
+                          span.main_icons.warn_button
+                          "Issue Warning"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                    li.email
+                      a [href="mailto:{email}" rel="nofollow"]
+                        span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#"]
+                    span
+                      "Show IP address"
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "(?)"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from another member, with a smiley"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Remove this post?" href="{boardurl}/index.php?action=deletemsg;topic=#;msg=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove"
+                      li
+                        a [href="{boardurl}/index.php?action=splittopics;topic=#;at=#"]
+                          span.main_icons.split_button
+                          "Split Topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#;msg=#"]
+                          span.main_icons.warn_button
+                          "Issue Warning"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+          "Add poll"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+      div#moderationbuttons_strip.buttonlist.floatbottom
+        a.button.button_strip_move [href="{boardurl}/index.php?action=movetopic;current_board=#;topic=#"]
+          "Move Topic"
+        a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+          "Remove topic"
+        a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=lock;{session_var}={session_id}"]
+          "Lock topic"
+        a.button.button_strip_sticky [href="{boardurl}/index.php?action=sticky;topic=#;sa=sticky;{session_var}={session_id}"]
+          "Set topic sticky"
+        a.button.button_strip_merge [href="{boardurl}/index.php?action=mergetopics;board=#;from=#"]
+          "Merge Topics"
+    div#display_jump_to
+    a#quickreply_anchor
+    div#quickreply.tborder
+      div.cat_bar
+        h3.catbg
+          "Quick Reply"
+      div#quickreply_options
+        div.roundframe
+          p.alert.smalltext
+            "Warning: this topic has not been posted in for at least {duration}."
+            br
+            "Unless you are sure you want to reply, please consider starting a new topic."
+          form#postmodify [accept-charset="UTF-#" action="{boardurl}/index.php?board=#;action=post#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+            input [name="topic" type="hidden" value="#"]
+            input [name="subject" type="hidden" value="{subject}"]
+            input [name="icon" type="hidden" value="xx"]
+            input [name="from_qr" type="hidden" value="#"]
+            input [name="notify" type="hidden" value="#"]
+            input [name="not_approved" type="hidden" value]
+            input [name="goback" type="hidden" value="#"]
+            input [name="last_msg" type="hidden" value="#"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            textarea#quickReply.editor [cols="#" name="quickReply" style="width: #%; height: #px;"]
+            input#quickReply_mode [name="quickReply_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("quickReply"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+    br.clear
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickReply({ bDefaultCollapsed: false, iTopicId: #, iStart: #, sScriptUrl: smf_scripturl, sImagesUrl: smf_images_url, sContainerId: "quickreply_options", sImageId: "quickReplyExpand", sClassCollapsed: "toggle_up", sClassExpanded: "toggle_down", sJumpAnchor: "quickreply_anchor", bIsFull: true }); }); var oEditorID = "quickReply";
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+            "Reply"
+          a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+            "Add poll"
+          a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+            "Mark unread"
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Not Following"
+                  br
+                  span
+                    "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts but only @mentions by other members."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this topic."
+    div#mobile_moderation.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Moderation"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div#moderationbuttons_mobile
+          div#moderationbuttons_strip_mobile.buttonlist.floatbottom
+            a.button.button_strip_move [href="{boardurl}/index.php?action=movetopic;current_board=#;topic=#"]
+              "Move Topic"
+            a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+              "Remove topic"
+            a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=lock;{session_var}={session_id}"]
+              "Lock topic"
+            a.button.button_strip_sticky [href="{boardurl}/index.php?action=sticky;topic=#;sa=sticky;{session_var}={session_id}"]
+              "Set topic sticky"
+            a.button.button_strip_merge [href="{boardurl}/index.php?action=mergetopics;board=#;from=#"]
+              "Merge Topics"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/display_poll.txt b/tests/Integration/Http/Snapshot/snapshots/admin/display_poll.txt
new file mode 100644
index 00000000000..d2a676c2f3c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/display_poll.txt
@@ -0,0 +1,443 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+        span.lock.main_icons
+        span.main_icons.sticky
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div#poll
+      div.cat_bar
+        h3.catbg
+          span.main_icons.poll
+          "Which colour?"
+      div.windowbg
+        div#poll_options
+          form [accept-charset="UTF-#" action="{boardurl}/index.php?action=vote;topic=#" method="post"]
+            ul.options
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Red"
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Green"
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Blue"
+            div.submitbutton
+              input.button [type="submit" value="Submit Vote"]
+              input [name="{session_var}" type="hidden" value="{session_id}"]
+    div#pollmoderation
+      div.buttonlist
+        a.button.button_strip_results [href="{boardurl}/index.php?topic=#;viewresults"]
+          "View results"
+        a.button.button_strip_lock [href="{boardurl}/index.php?action=lockvoting;topic=#;{session_var}={session_id}"]
+          "Lock Voting"
+        a.button.button_strip_edit [href="{boardurl}/index.php?action=editpoll;topic=#"]
+          "Edit Poll"
+        a.button.button_strip_remove_poll.you_sure [data-confirm="Are you sure you want to remove this poll from the topic?" href="{boardurl}/index.php?action=removepoll;topic=#;{session_var}={session_id}"]
+          "Remove Poll"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                    li.email
+                      a [href="mailto:{email}" rel="nofollow"]
+                        span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#"]
+                    span
+                      "Show IP address"
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "(?)"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A sticky, locked topic with a poll."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#;msg=#"]
+                          span.main_icons.warn_button
+                          "Issue Warning"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+      div#moderationbuttons_strip.buttonlist.floatbottom
+        a.button.button_strip_move [href="{boardurl}/index.php?action=movetopic;current_board=#;topic=#"]
+          "Move Topic"
+        a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+          "Remove topic"
+        a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=unlock;{session_var}={session_id}"]
+          "Unlock topic"
+        a.button.button_strip_sticky [href="{boardurl}/index.php?action=sticky;topic=#;sa=nonsticky;{session_var}={session_id}"]
+          "Set topic non-sticky"
+        a.button.button_strip_merge [href="{boardurl}/index.php?action=mergetopics;board=#;from=#"]
+          "Merge Topics"
+    div#display_jump_to
+    a#quickreply_anchor
+    div#quickreply.tborder
+      div.cat_bar
+        h3.catbg
+          "Quick Reply"
+      div#quickreply_options
+        div.roundframe
+          p.alert.smalltext
+            "Warning! This topic is currently locked, only admins and moderators can reply."
+          form#postmodify [accept-charset="UTF-#" action="{boardurl}/index.php?board=#;action=post#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+            input [name="topic" type="hidden" value="#"]
+            input [name="subject" type="hidden" value="Re: {subject}"]
+            input [name="icon" type="hidden" value="xx"]
+            input [name="from_qr" type="hidden" value="#"]
+            input [name="notify" type="hidden" value="#"]
+            input [name="not_approved" type="hidden" value]
+            input [name="goback" type="hidden" value="#"]
+            input [name="last_msg" type="hidden" value="#"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            textarea#quickReply.editor [cols="#" name="quickReply" style="width: #%; height: #px;"]
+            input#quickReply_mode [name="quickReply_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("quickReply"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+    br.clear
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickReply({ bDefaultCollapsed: false, iTopicId: #, iStart: #, sScriptUrl: smf_scripturl, sImagesUrl: smf_images_url, sContainerId: "quickreply_options", sImageId: "quickReplyExpand", sClassCollapsed: "toggle_up", sClassExpanded: "toggle_down", sJumpAnchor: "quickreply_anchor", bIsFull: true }); }); var oEditorID = "quickReply";
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+            "Reply"
+          a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+            "Mark unread"
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Not Following"
+                  br
+                  span
+                    "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts but only @mentions by other members."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this topic."
+    div#mobile_moderation.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Moderation"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div#moderationbuttons_mobile
+          div#moderationbuttons_strip_mobile.buttonlist.floatbottom
+            a.button.button_strip_move [href="{boardurl}/index.php?action=movetopic;current_board=#;topic=#"]
+              "Move Topic"
+            a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+              "Remove topic"
+            a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=unlock;{session_var}={session_id}"]
+              "Unlock topic"
+            a.button.button_strip_sticky [href="{boardurl}/index.php?action=sticky;topic=#;sa=nonsticky;{session_var}={session_id}"]
+              "Set topic non-sticky"
+            a.button.button_strip_merge [href="{boardurl}/index.php?action=mergetopics;board=#;from=#"]
+              "Merge Topics"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_alerts.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_alerts.txt
new file mode 100644
index 00000000000..51cd910930d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_alerts.txt
@@ -0,0 +1,335 @@
+status 200
+@ title
+title
+  "Notification Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Notifications"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to set the default notification options for users."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Notification Preferences"
+  p.information
+    "This page allows you to set the default notification options for users."
+  form#notify_options.flow_auto [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}" method="post"]
+    div.cat_bar
+      h3.catbg
+        "General Settings"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="notify_announcements"]
+            "Receive forum newsletters, announcements and important notifications by email."
+          br
+          span.alert.smalltext
+            "Enabling this default option violates the rules of the"
+            a.bbc_link [href="https://ec.europa.eu/info/law/law-topic/data-protection/eu-data-protection-rules_en" rel="noopener" target="_blank"]
+              "GDPR"
+            "and many other countries’ privacy and anti-spam laws."
+        dd
+          input [name="notify_announcements" type="hidden" value="#"]
+          input#notify_announcements [name="notify_announcements" type="checkbox" value="#"]
+        dt
+          label [for="notify_alert_timeout"]
+            "Timeout for Alert desktop notifications (in seconds)"
+        dd
+          input#notify_alert_timeout [max="#" min="#" name="opt_alert_timeout" size="#" type="number" value="#"]
+    div.cat_bar
+      h3.catbg
+        "Alert Preferences"
+    table.table_grid
+      tbody
+        tr.title_bar
+          th
+            "Boards and Topics"
+          th
+            "Receive alert"
+          th
+            "Receive email"
+        tr.windowbg
+        tr.windowbg
+          td [colspan="#"]
+            input#opt_msg_auto_notify [name="opt_msg_auto_notify" type="checkbox"]
+            label [for="opt_msg_auto_notify"]
+              "Follow topics I create and reply to"
+        tr.windowbg
+          td [colspan="#"]
+            input#opt_msg_receive_body [name="opt_msg_receive_body" type="checkbox"]
+            label [for="opt_msg_receive_body"]
+              "Receive message body in e-mails"
+        tr.windowbg
+          td [colspan="#"]
+            label [for="opt_msg_notify_pref"]
+              "How frequently to tell me:"
+            select#opt_msg_notify_pref [name="opt_msg_notify_pref"]
+              option [value="#"]
+                "Never"
+              option [selected value="#"]
+                "Immediately"
+              option [value="#"]
+                "Immediately (but only for the first unread message)"
+              option [value="#"]
+                "Send me a daily summary"
+              option [value="#"]
+                "Send me a weekly summary"
+        tr.windowbg
+          td [colspan="#"]
+            label [for="opt_msg_notify_type"]
+              "Notify me of:"
+            select#opt_msg_notify_type [name="opt_msg_notify_type"]
+              option [selected value="#"]
+                "Replies and moderation"
+              option [value="#"]
+                "Moderation only if I started the topic and am following it"
+              option [value="#"]
+                "Only replies"
+              option [value="#"]
+                "Nothing at all"
+        tr.windowbg
+          td
+            "When a topic I follow receives a reply, I normally want to know via..."
+          td.centercol
+            input [checked name="alert_topic_notify" type="checkbox"]
+          td.centercol
+            input [name="email_topic_notify" type="checkbox"]
+        tr.windowbg
+          td
+            "When a new topic is created in a board I follow, I normally want to know via..."
+          td.centercol
+            input [checked name="alert_board_notify" type="checkbox"]
+          td.centercol
+            input [name="email_board_notify" type="checkbox"]
+        tr.title_bar
+          th
+            "Posts"
+          th
+            "Receive alert"
+          th
+            "Receive email"
+        tr.windowbg
+        tr.windowbg
+          td
+            "When one of my posts is quoted"
+          td.centercol
+            input [checked name="alert_msg_quote" type="checkbox"]
+          td.centercol
+            input [name="email_msg_quote" type="checkbox"]
+        tr.windowbg
+          td
+            "When a reply is made to my unapproved topic"
+          td.centercol
+            input [checked name="alert_unapproved_reply" type="checkbox"]
+          td.centercol
+            input [checked name="email_unapproved_reply" type="checkbox"]
+        tr.title_bar
+          th
+            "Personal Messages"
+          th
+            "Receive alert"
+          th
+            "Receive email"
+        tr.windowbg
+        tr.windowbg
+          td [colspan="#"]
+            label [for="opt_pm_notify"]
+              "If enabled, notify me of personal messages from:"
+            select#opt_pm_notify [name="opt_pm_notify"]
+              option [selected value="#"]
+                "All members"
+              option [value="#"]
+                "Buddies Only"
+        tr.windowbg
+          td
+            "When I receive a new personal message"
+            a.floatright.help [href="{boardurl}/index.php?action=helpadmin;help=alert_pm_new" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.centercol
+            input [disabled type="checkbox"]
+          td.centercol
+            input [name="email_pm_new" type="checkbox"]
+        tr.windowbg
+          td
+            "When I receive a reply to a personal message"
+            a.floatright.help [href="{boardurl}/index.php?action=helpadmin;help=alert_pm_new" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.centercol
+            input [disabled type="checkbox"]
+          td.centercol
+            input [name="email_pm_reply" type="checkbox"]
+        tr.title_bar
+          th
+            "Moderation"
+          th
+            "Receive alert"
+          th
+            "Receive email"
+        tr.windowbg
+        tr.windowbg
+          td
+            "When an unapproved attachment is created"
+          td.centercol
+            input [checked name="alert_unapproved_attachment" type="checkbox"]
+          td.centercol
+            input [name="email_unapproved_attachment" type="checkbox"]
+        tr.windowbg
+          td
+            "When an unapproved topic is created"
+          td.centercol
+            input [checked name="alert_unapproved_post" type="checkbox"]
+          td.centercol
+            input [name="email_unapproved_post" type="checkbox"]
+        tr.windowbg
+          td
+            "When a post is reported"
+          td.centercol
+            input [checked name="alert_msg_report" type="checkbox"]
+          td.centercol
+            input [name="email_msg_report" type="checkbox"]
+        tr.windowbg
+          td
+            "When a post report I’ve replied to receives another reply"
+          td.centercol
+            input [checked name="alert_msg_report_reply" type="checkbox"]
+          td.centercol
+            input [name="email_msg_report_reply" type="checkbox"]
+        tr.windowbg
+          td
+            "When another member’s profile is reported"
+          td.centercol
+            input [checked name="alert_member_report" type="checkbox"]
+          td.centercol
+            input [checked name="email_member_report" type="checkbox"]
+        tr.windowbg
+          td
+            "When a member report I’ve replied to receives another reply"
+          td.centercol
+            input [checked name="alert_member_report_reply" type="checkbox"]
+          td.centercol
+            input [checked name="email_member_report_reply" type="checkbox"]
+        tr.title_bar
+          th
+            "Members"
+          th
+            "Receive alert"
+          th
+            "Receive email"
+        tr.windowbg
+        tr.windowbg
+          td
+            "When a new person registers"
+          td.centercol
+            input [checked name="alert_member_register" type="checkbox"]
+          td.centercol
+            input [name="email_member_register" type="checkbox"]
+        tr.windowbg
+          td
+            "When other members receive a warning"
+          td.centercol
+            input [checked name="alert_warn_any" type="checkbox"]
+          td.centercol
+            input [name="email_warn_any" type="checkbox"]
+        tr.windowbg
+          td
+            "When other members add me as their buddy"
+          td.centercol
+            input [checked name="alert_buddy_request" type="checkbox"]
+          td.centercol
+            input [disabled type="checkbox"]
+        tr.windowbg
+          td
+            "When it is my birthday"
+          td.centercol
+            input [name="alert_birthday" type="checkbox"]
+          td.centercol
+            input [checked name="email_birthday" type="checkbox"]
+    br
+    div
+      input#notify_submit.button [name="notify_submit" type="submit" value="Save settings"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
+      input [name="u" type="hidden" value="#"]
+      input [name="sa" type="hidden" value="alerts"]
+  br
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_basic.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_basic.txt
new file mode 100644
index 00000000000..ecadb60a3e1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_basic.txt
@@ -0,0 +1,417 @@
+status 200
+@ title
+title
+  "Features and Options"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the settings of features and basic options in your forum. Please see the"
+    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#;{session_var}={session_id}"]
+      "theme settings"
+    "for more options. Click the help icons for more information about a setting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=basic" method="post"]
+    div.cat_bar
+      h3.catbg
+        "General"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_pollMode_help [href="{boardurl}/index.php?action=helpadmin;help=pollMode" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_pollMode
+          span
+            label [for="pollMode"]
+              "Poll mode"
+        dd
+          select#pollMode [name="pollMode" size="#"]
+            option [value="#"]
+              "Disable polls"
+            option [selected value="#"]
+              "Enable polls"
+            option [value="#"]
+              "Show existing polls as topics"
+      hr
+      dl.settings
+        dt
+          a#setting_allow_guestAccess_help [href="{boardurl}/index.php?action=helpadmin;help=allow_guestAccess" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_allow_guestAccess
+          span
+            label [for="allow_guestAccess"]
+              "Allow guests to browse the forum"
+        dd
+          input#allow_guestAccess [checked name="allow_guestAccess" type="checkbox" value="#"]
+        dt
+          a#setting_enable_buddylist
+          span
+            label [for="enable_buddylist"]
+              "Enable buddy/ignore lists"
+        dd
+          input#enable_buddylist [checked name="enable_buddylist" type="checkbox" value="#"]
+        dt
+          a#setting_allow_hideOnline_help [href="{boardurl}/index.php?action=helpadmin;help=allow_hideOnline" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_allow_hideOnline
+          span
+            label [for="allow_hideOnline"]
+              "Allow non-administrators to hide their online status"
+        dd
+          input#allow_hideOnline [checked name="allow_hideOnline" type="checkbox" value="#"]
+        dt
+          a#setting_titlesEnable_help [href="{boardurl}/index.php?action=helpadmin;help=titlesEnable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_titlesEnable
+          span
+            label [for="titlesEnable"]
+              "Enable custom titles"
+        dd
+          input#titlesEnable [checked name="titlesEnable" type="checkbox" value="#"]
+        dt
+          a#setting_default_personal_text_help [href="{boardurl}/index.php?action=helpadmin;help=default_personal_text" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_default_personal_text
+          span
+            label [for="default_personal_text"]
+              "Default personal text"
+            br
+            span.smalltext
+              "Personal text to assign to newly registered members."
+        dd
+          input#default_personal_text [name="default_personal_text" type="text" value]
+        dt
+          a#setting_topic_move_any_help [href="{boardurl}/index.php?action=helpadmin;help=topic_move_any" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_topic_move_any
+          span
+            label [for="topic_move_any"]
+              "Allow moving of topics to read-only boards"
+        dd
+          input#topic_move_any [name="topic_move_any" type="checkbox" value="#"]
+        dt
+          a#setting_defaultMaxListItems
+          span
+            label [for="defaultMaxListItems"]
+              "Maximum number of items per page in lists"
+        dd
+          input#defaultMaxListItems [max="#" min="#" name="defaultMaxListItems" size="#" step="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_jquery_source_help [href="{boardurl}/index.php?action=helpadmin;help=jquery_source" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_jquery_source
+          span
+            label [for="jquery_source"]
+              "Source for the jQuery Library"
+        dd
+          select#jquery_source [name="jquery_source" onchange="if (this.value == 'custom'){document.getElementById('jquery_custom').disabled = false; } else {document.getElementById('jquery_custom').disabled = true;}" size="#"]
+            option [value="cdn"]
+              "Google CDN"
+            option [value="cloudflare_cdn"]
+              "Cloudflare CDN"
+            option [value="jquery_cdn"]
+              "jQuery CDN"
+            option [value="microsoft_cdn"]
+              "Microsoft CDN"
+            option [value="local"]
+              "Local"
+            option [value="custom"]
+              "Custom URL to the jQuery Library"
+        dt
+          a#setting_jquery_custom
+          span [style="color: ##;"]
+            label [for="jquery_custom"]
+              "Custom URL to the jQuery Library"
+        dd
+          input#jquery_custom [disabled name="jquery_custom" size="#" type="text" value]
+        dt
+          a#setting_fontawesome_source_help [href="{boardurl}/index.php?action=helpadmin;help=fontawesome_source" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_fontawesome_source
+          span
+            label [for="fontawesome_source"]
+              "Source for the FontAwesome Library"
+        dd
+          select#fontawesome_source [name="fontawesome_source" onchange="if (this.value == 'custom'){document.getElementById('fontawesome_custom').disabled = false; } else {document.getElementById('fontawesome_custom').disabled = true;}" size="#"]
+            option [value="cdn"]
+              "Cloudflare CDN"
+            option [value="fontawesome_cdn"]
+              "FontAwesome CDN"
+            option [value="local"]
+              "Local"
+            option [value="custom"]
+              "Custom URL to the FontAwesome Library"
+        dt
+          a#setting_fontawesome_custom
+          span [style="color: ##;"]
+            label [for="fontawesome_custom"]
+              "Custom URL to the FontAwesome Library"
+        dd
+          input#fontawesome_custom [disabled name="fontawesome_custom" size="#" type="text" value]
+      hr
+      dl.settings
+        dt
+          a#setting_minimize_files_help [href="{boardurl}/index.php?action=helpadmin;help=minimize_files" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_minimize_files
+          span
+            label [for="minimize_files"]
+              "Minimize CSS and JavaScript files"
+        dd
+          input#minimize_files [checked name="minimize_files" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_queryless_urls_help [href="{boardurl}/index.php?action=helpadmin;help=queryless_urls" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_queryless_urls
+          span
+            label [for="queryless_urls"]
+              "Use friendly URLs"
+            br
+            span.smalltext
+              strong
+                "Supported on Apache, Lighttpd, and LiteSpeed only"
+        dd
+          input#queryless_urls [name="queryless_urls" type="checkbox" value="#"]
+        dt
+          a#setting_hide_index_php_help [href="{boardurl}/index.php?action=helpadmin;help=hide_index_php" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_hide_index_php
+          span
+            label [for="hide_index_php"]
+              "Hide index.php in URLs"
+        dd
+          input#hide_index_php [name="hide_index_php" type="checkbox" value="#"]
+        dt
+          a#setting_use_ascii_slugs_help [href="{boardurl}/index.php?action=helpadmin;help=use_ascii_slugs" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_use_ascii_slugs
+          span
+            label [for="use_ascii_slugs"]
+              "Transliterate non-ASCII characters in friendly URLs."
+        dd
+          input#use_ascii_slugs [name="use_ascii_slugs" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_time_format_help [href="{boardurl}/index.php?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_time_format
+          span
+            label [for="time_format"]
+              "Default time format"
+        dd
+          input#time_format [name="time_format" type="text" value="%b %d, %Y, %I:%M %p"]
+        dt
+          a#setting_default_timezone_help [href="{boardurl}/index.php?action=helpadmin;help=default_timezone" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_default_timezone
+          span
+            label [for="default_timezone"]
+              "Forum default timezone"
+        dd
+          snapshot-ignored [selector="#default_timezone"]
+        dt
+          a#setting_timezone_priority_countries_help [href="{boardurl}/index.php?action=helpadmin;help=timezone_priority_countries" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_timezone_priority_countries
+          span
+            label [for="timezone_priority_countries"]
+              "Show time zones from these countries first"
+            br
+            span.smalltext
+              "A comma separated list of two character ISO country codes."
+        dd
+          input#timezone_priority_countries [name="timezone_priority_countries" type="text" value]
+      hr
+      dl.settings
+        dt
+          a#setting_who_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=who_enabled" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_who_enabled
+          span
+            label [for="who_enabled"]
+              "Enable who’s online list"
+        dd
+          input#who_enabled [checked name="who_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_lastActive_help [href="{boardurl}/index.php?action=helpadmin;help=lastActive" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_lastActive
+          span
+            label [for="lastActive"]
+              "User online time threshold"
+        dd
+          input#lastActive [min="#" name="lastActive" size="#" type="number" value="#"]
+          "minutes"
+      hr
+      dl.settings
+        dt
+          a#setting_trackStats_help [href="{boardurl}/index.php?action=helpadmin;help=trackStats" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_trackStats
+          span
+            label [for="trackStats"]
+              "Track statistics"
+        dd
+          input#trackStats [checked name="trackStats" type="checkbox" value="#"]
+        dt
+          a#setting_hitStats
+          span
+            label [for="hitStats"]
+              "Track daily page views (statistics tracking must be enabled)"
+        dd
+          input#hitStats [name="hitStats" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_no_guest_logging_help [href="{boardurl}/index.php?action=helpadmin;help=no_guest_logging" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_no_guest_logging
+          span
+            label [for="no_guest_logging"]
+              "Do not include guests or bots in Users Online stats"
+        dd
+          input#no_guest_logging [name="no_guest_logging" type="checkbox" value="#"]
+        dt
+          a#setting_no_guest_views_help [href="{boardurl}/index.php?action=helpadmin;help=no_guest_views" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_no_guest_views
+          span
+            label [for="no_guest_views"]
+              "Disable counting views for guests and bots"
+        dd
+          input#no_guest_views [name="no_guest_views" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_disallow_sendBody_help [href="{boardurl}/index.php?action=helpadmin;help=disallow_sendBody" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_disallow_sendBody
+          span
+            label [for="disallow_sendBody"]
+              "Do not allow post text in notifications"
+        dd
+          input#disallow_sendBody [name="disallow_sendBody" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_enable_ajax_alerts_help [href="{boardurl}/index.php?action=helpadmin;help=enable_ajax_alerts" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enable_ajax_alerts
+          span
+            label [for="enable_ajax_alerts"]
+              "Allow AJAX desktop notifications for alerts"
+        dd
+          input#enable_ajax_alerts [checked name="enable_ajax_alerts" type="checkbox" value="#"]
+        dt
+          a#setting_alerts_auto_purge_help [href="{boardurl}/index.php?action=helpadmin;help=alerts_auto_purge" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_alerts_auto_purge
+          span
+            label [for="alerts_auto_purge"]
+              "Automatically delete read alerts"
+        dd
+          select#alerts_auto_purge [name="alerts_auto_purge" size="#"]
+            option [value="#"]
+              "Never"
+            option [value="#"]
+              "After {duration}"
+            option [selected value="#"]
+              "After {duration}"
+            option [value="#"]
+              "After {duration}"
+        dt
+          a#setting_alerts_per_page
+          span
+            label [for="alerts_per_page"]
+              "Alerts Per Page"
+        dd
+          input#alerts_per_page [max="#" min="#" name="alerts_per_page" size="#" step="#" type="number" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_bbc.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_bbc.txt
new file mode 100644
index 00000000000..a2bcec56377
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_bbc.txt
@@ -0,0 +1,588 @@
+status 200
+@ title
+title
+  "Bulletin Board Code settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Bulletin Board Code & Markdown"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Bulletin board code and Markdown can be used to add markup to forum messages. For example, to highlight the word \"house\" you can type [b]house[/b] (using BBC) or **house** (using Markdown). All bulletin board code tags are surrounded by square brackets (\"[\" and \"]\")."
+    a [href="https://commonmark.org/help/" target="_blank"]
+      "Markdown syntax"
+    "is a little more complicated, but not too hard."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=bbc" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Bulletin Board Code settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enableBBC_help [href="{boardurl}/index.php?action=helpadmin;help=enableBBC" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableBBC
+          span
+            label [for="enableBBC"]
+              "Enable bulletin board code (BBC)"
+        dd
+          input#enableBBC [checked name="enableBBC" onchange="toggleBBCDisabled('disabledBBC', !this.checked); toggleBBCDisabled('legacyBBC', !this.checked);" type="checkbox" value="#"]
+        dt
+          a#setting_enablePostHTML_help [href="{boardurl}/index.php?action=helpadmin;help=enablePostHTML" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enablePostHTML
+          span
+            label [for="enablePostHTML"]
+              "Enable"
+              em
+                "basic"
+              "HTML in posts"
+        dd
+          input#enablePostHTML [name="enablePostHTML" type="checkbox" value="#"]
+        dt
+          a#setting_autoLinkUrls
+          span
+            label [for="autoLinkUrls"]
+              "Automatically link posted URLs"
+        dd
+          input#autoLinkUrls [checked name="autoLinkUrls" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_disabledBBC
+          span
+            label [for="disabledBBC"]
+              "Enabled BBC tags"
+        dd
+          fieldset#disabledBBC
+            legend
+              "Select the tags which are allowed to be used"
+            ul
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_abbr [checked name="disabledBBC_enabledTags[]" type="checkbox" value="abbr"]
+                label [for="tag_disabledBBC_abbr"]
+                  "abbr"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_anchor [checked name="disabledBBC_enabledTags[]" type="checkbox" value="anchor"]
+                label [for="tag_disabledBBC_anchor"]
+                  "anchor"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_attach [checked name="disabledBBC_enabledTags[]" type="checkbox" value="attach"]
+                label [for="tag_disabledBBC_attach"]
+                  "attach"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_b [checked name="disabledBBC_enabledTags[]" type="checkbox" value="b"]
+                label [for="tag_disabledBBC_b"]
+                  "b"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_br [checked name="disabledBBC_enabledTags[]" type="checkbox" value="br"]
+                label [for="tag_disabledBBC_br"]
+                  "br"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_center [checked name="disabledBBC_enabledTags[]" type="checkbox" value="center"]
+                label [for="tag_disabledBBC_center"]
+                  "center"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_code [checked name="disabledBBC_enabledTags[]" type="checkbox" value="code"]
+                label [for="tag_disabledBBC_code"]
+                  "code"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_color [checked name="disabledBBC_enabledTags[]" type="checkbox" value="color"]
+                label [for="tag_disabledBBC_color"]
+                  "color"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_details [checked name="disabledBBC_enabledTags[]" type="checkbox" value="details"]
+                label [for="tag_disabledBBC_details"]
+                  "details"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_email [checked name="disabledBBC_enabledTags[]" type="checkbox" value="email"]
+                label [for="tag_disabledBBC_email"]
+                  "email"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_float [checked name="disabledBBC_enabledTags[]" type="checkbox" value="float"]
+                label [for="tag_disabledBBC_float"]
+                  "float"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_font [checked name="disabledBBC_enabledTags[]" type="checkbox" value="font"]
+                label [for="tag_disabledBBC_font"]
+                  "font"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_h# [checked name="disabledBBC_enabledTags[]" type="checkbox" value="h#"]
+                label [for="tag_disabledBBC_h#"]
+                  "h#"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_html [checked name="disabledBBC_enabledTags[]" type="checkbox" value="html"]
+                label [for="tag_disabledBBC_html"]
+                  "html"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_hr [checked name="disabledBBC_enabledTags[]" type="checkbox" value="hr"]
+                label [for="tag_disabledBBC_hr"]
+                  "hr"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_i [checked name="disabledBBC_enabledTags[]" type="checkbox" value="i"]
+                label [for="tag_disabledBBC_i"]
+                  "i"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_img [checked name="disabledBBC_enabledTags[]" type="checkbox" value="img"]
+                label [for="tag_disabledBBC_img"]
+                  "img"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_iurl [checked name="disabledBBC_enabledTags[]" type="checkbox" value="iurl"]
+                label [for="tag_disabledBBC_iurl"]
+                  "iurl"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_justify [checked name="disabledBBC_enabledTags[]" type="checkbox" value="justify"]
+                label [for="tag_disabledBBC_justify"]
+                  "justify"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_list [checked name="disabledBBC_enabledTags[]" type="checkbox" value="list"]
+                label [for="tag_disabledBBC_list"]
+                  "list"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_ltr [checked name="disabledBBC_enabledTags[]" type="checkbox" value="ltr"]
+                label [for="tag_disabledBBC_ltr"]
+                  "ltr"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_me [checked name="disabledBBC_enabledTags[]" type="checkbox" value="me"]
+                label [for="tag_disabledBBC_me"]
+                  "me"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_member [checked name="disabledBBC_enabledTags[]" type="checkbox" value="member"]
+                label [for="tag_disabledBBC_member"]
+                  "member"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_nobbc [checked name="disabledBBC_enabledTags[]" type="checkbox" value="nobbc"]
+                label [for="tag_disabledBBC_nobbc"]
+                  "nobbc"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_nolink [checked name="disabledBBC_enabledTags[]" type="checkbox" value="nolink"]
+                label [for="tag_disabledBBC_nolink"]
+                  "nolink"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_php [checked name="disabledBBC_enabledTags[]" type="checkbox" value="php"]
+                label [for="tag_disabledBBC_php"]
+                  "php"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_pre [checked name="disabledBBC_enabledTags[]" type="checkbox" value="pre"]
+                label [for="tag_disabledBBC_pre"]
+                  "pre"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_quote [checked name="disabledBBC_enabledTags[]" type="checkbox" value="quote"]
+                label [for="tag_disabledBBC_quote"]
+                  "quote"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_right [checked name="disabledBBC_enabledTags[]" type="checkbox" value="right"]
+                label [for="tag_disabledBBC_right"]
+                  "right"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_rtl [checked name="disabledBBC_enabledTags[]" type="checkbox" value="rtl"]
+                label [for="tag_disabledBBC_rtl"]
+                  "rtl"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_s [checked name="disabledBBC_enabledTags[]" type="checkbox" value="s"]
+                label [for="tag_disabledBBC_s"]
+                  "s"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_size [checked name="disabledBBC_enabledTags[]" type="checkbox" value="size"]
+                label [for="tag_disabledBBC_size"]
+                  "size"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_spoiler [checked name="disabledBBC_enabledTags[]" type="checkbox" value="spoiler"]
+                label [for="tag_disabledBBC_spoiler"]
+                  "spoiler"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_sub [checked name="disabledBBC_enabledTags[]" type="checkbox" value="sub"]
+                label [for="tag_disabledBBC_sub"]
+                  "sub"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_sup [checked name="disabledBBC_enabledTags[]" type="checkbox" value="sup"]
+                label [for="tag_disabledBBC_sup"]
+                  "sup"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_table [checked name="disabledBBC_enabledTags[]" type="checkbox" value="table"]
+                label [for="tag_disabledBBC_table"]
+                  "table"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_time [checked name="disabledBBC_enabledTags[]" type="checkbox" value="time"]
+                label [for="tag_disabledBBC_time"]
+                  "time"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_tt [checked name="disabledBBC_enabledTags[]" type="checkbox" value="tt"]
+                label [for="tag_disabledBBC_tt"]
+                  "tt"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_u [checked name="disabledBBC_enabledTags[]" type="checkbox" value="u"]
+                label [for="tag_disabledBBC_u"]
+                  "u"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_url [checked name="disabledBBC_enabledTags[]" type="checkbox" value="url"]
+                label [for="tag_disabledBBC_url"]
+                  "url"
+              li.floatleft.list_bbc
+                input#tag_disabledBBC_youtube [checked name="disabledBBC_enabledTags[]" type="checkbox" value="youtube"]
+                label [for="tag_disabledBBC_youtube"]
+                  "youtube"
+            input#bbc_disabledBBC_select_all [onclick="invertAll(this, this.form, 'disabledBBC_enabledTags');" type="checkbox"]
+            label [for="bbc_disabledBBC_select_all"]
+              em
+                "Select all tags"
+        dt
+          a#setting_legacyBBC_help [href="{boardurl}/index.php?action=helpadmin;help=legacy_bbc" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_legacyBBC
+          span
+            label [for="legacyBBC"]
+              "Legacy BBC tags"
+        dd
+          fieldset#legacyBBC
+            legend
+              "Select the tags which are allowed to be used"
+            ul
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_acronym [name="legacyBBC_enabledTags[]" type="checkbox" value="acronym"]
+                label [for="tag_legacyBBC_acronym"]
+                  "acronym"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_bdo [name="legacyBBC_enabledTags[]" type="checkbox" value="bdo"]
+                label [for="tag_legacyBBC_bdo"]
+                  "bdo"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_black [name="legacyBBC_enabledTags[]" type="checkbox" value="black"]
+                label [for="tag_legacyBBC_black"]
+                  "black"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_blue [name="legacyBBC_enabledTags[]" type="checkbox" value="blue"]
+                label [for="tag_legacyBBC_blue"]
+                  "blue"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_flash [name="legacyBBC_enabledTags[]" type="checkbox" value="flash"]
+                label [for="tag_legacyBBC_flash"]
+                  "flash"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_ftp [name="legacyBBC_enabledTags[]" type="checkbox" value="ftp"]
+                label [for="tag_legacyBBC_ftp"]
+                  "ftp"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_glow [name="legacyBBC_enabledTags[]" type="checkbox" value="glow"]
+                label [for="tag_legacyBBC_glow"]
+                  "glow"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_green [name="legacyBBC_enabledTags[]" type="checkbox" value="green"]
+                label [for="tag_legacyBBC_green"]
+                  "green"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_move [name="legacyBBC_enabledTags[]" type="checkbox" value="move"]
+                label [for="tag_legacyBBC_move"]
+                  "move"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_red [name="legacyBBC_enabledTags[]" type="checkbox" value="red"]
+                label [for="tag_legacyBBC_red"]
+                  "red"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_shadow [name="legacyBBC_enabledTags[]" type="checkbox" value="shadow"]
+                label [for="tag_legacyBBC_shadow"]
+                  "shadow"
+              li.floatleft.list_bbc
+                input#tag_legacyBBC_white [name="legacyBBC_enabledTags[]" type="checkbox" value="white"]
+                label [for="tag_legacyBBC_white"]
+                  "white"
+            input#bbc_legacyBBC_select_all [onclick="invertAll(this, this.form, 'legacyBBC_enabledTags');" type="checkbox"]
+            label [for="bbc_legacyBBC_select_all"]
+              em
+                "Select all tags"
+        dt
+          a#setting_restricted_bbc_help [href="{boardurl}/index.php?action=helpadmin;help=restricted_bbc" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_restricted_bbc
+          span
+            label [for="restricted_bbc"]
+              "Restricted BBC tags"
+        dd
+          fieldset#restricted_bbc
+            legend
+              "Select the tags that require permission to use"
+            ul
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_abbr [name="restricted_bbc_enabledTags[]" type="checkbox" value="abbr"]
+                label [for="tag_restricted_bbc_abbr"]
+                  "abbr"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_anchor [name="restricted_bbc_enabledTags[]" type="checkbox" value="anchor"]
+                label [for="tag_restricted_bbc_anchor"]
+                  "anchor"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_attach [name="restricted_bbc_enabledTags[]" type="checkbox" value="attach"]
+                label [for="tag_restricted_bbc_attach"]
+                  "attach"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_b [name="restricted_bbc_enabledTags[]" type="checkbox" value="b"]
+                label [for="tag_restricted_bbc_b"]
+                  "b"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_br [name="restricted_bbc_enabledTags[]" type="checkbox" value="br"]
+                label [for="tag_restricted_bbc_br"]
+                  "br"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_center [name="restricted_bbc_enabledTags[]" type="checkbox" value="center"]
+                label [for="tag_restricted_bbc_center"]
+                  "center"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_code [name="restricted_bbc_enabledTags[]" type="checkbox" value="code"]
+                label [for="tag_restricted_bbc_code"]
+                  "code"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_color [name="restricted_bbc_enabledTags[]" type="checkbox" value="color"]
+                label [for="tag_restricted_bbc_color"]
+                  "color"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_details [name="restricted_bbc_enabledTags[]" type="checkbox" value="details"]
+                label [for="tag_restricted_bbc_details"]
+                  "details"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_email [name="restricted_bbc_enabledTags[]" type="checkbox" value="email"]
+                label [for="tag_restricted_bbc_email"]
+                  "email"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_float [name="restricted_bbc_enabledTags[]" type="checkbox" value="float"]
+                label [for="tag_restricted_bbc_float"]
+                  "float"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_font [name="restricted_bbc_enabledTags[]" type="checkbox" value="font"]
+                label [for="tag_restricted_bbc_font"]
+                  "font"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_h# [name="restricted_bbc_enabledTags[]" type="checkbox" value="h#"]
+                label [for="tag_restricted_bbc_h#"]
+                  "h#"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_html [checked disabled name="restricted_bbc_enabledTags[]" type="checkbox" value="html"]
+                label [for="tag_restricted_bbc_html"]
+                  "html"
+                a.help.main_icons [href="{boardurl}/index.php?action=helpadmin;help=tag_html" onclick="return reqOverlayDiv(this.href);"]
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_hr [name="restricted_bbc_enabledTags[]" type="checkbox" value="hr"]
+                label [for="tag_restricted_bbc_hr"]
+                  "hr"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_i [name="restricted_bbc_enabledTags[]" type="checkbox" value="i"]
+                label [for="tag_restricted_bbc_i"]
+                  "i"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_img [name="restricted_bbc_enabledTags[]" type="checkbox" value="img"]
+                label [for="tag_restricted_bbc_img"]
+                  "img"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_iurl [name="restricted_bbc_enabledTags[]" type="checkbox" value="iurl"]
+                label [for="tag_restricted_bbc_iurl"]
+                  "iurl"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_justify [name="restricted_bbc_enabledTags[]" type="checkbox" value="justify"]
+                label [for="tag_restricted_bbc_justify"]
+                  "justify"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_list [name="restricted_bbc_enabledTags[]" type="checkbox" value="list"]
+                label [for="tag_restricted_bbc_list"]
+                  "list"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_ltr [name="restricted_bbc_enabledTags[]" type="checkbox" value="ltr"]
+                label [for="tag_restricted_bbc_ltr"]
+                  "ltr"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_me [name="restricted_bbc_enabledTags[]" type="checkbox" value="me"]
+                label [for="tag_restricted_bbc_me"]
+                  "me"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_member [name="restricted_bbc_enabledTags[]" type="checkbox" value="member"]
+                label [for="tag_restricted_bbc_member"]
+                  "member"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_nobbc [name="restricted_bbc_enabledTags[]" type="checkbox" value="nobbc"]
+                label [for="tag_restricted_bbc_nobbc"]
+                  "nobbc"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_nolink [name="restricted_bbc_enabledTags[]" type="checkbox" value="nolink"]
+                label [for="tag_restricted_bbc_nolink"]
+                  "nolink"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_php [name="restricted_bbc_enabledTags[]" type="checkbox" value="php"]
+                label [for="tag_restricted_bbc_php"]
+                  "php"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_pre [name="restricted_bbc_enabledTags[]" type="checkbox" value="pre"]
+                label [for="tag_restricted_bbc_pre"]
+                  "pre"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_quote [name="restricted_bbc_enabledTags[]" type="checkbox" value="quote"]
+                label [for="tag_restricted_bbc_quote"]
+                  "quote"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_right [name="restricted_bbc_enabledTags[]" type="checkbox" value="right"]
+                label [for="tag_restricted_bbc_right"]
+                  "right"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_rtl [name="restricted_bbc_enabledTags[]" type="checkbox" value="rtl"]
+                label [for="tag_restricted_bbc_rtl"]
+                  "rtl"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_s [name="restricted_bbc_enabledTags[]" type="checkbox" value="s"]
+                label [for="tag_restricted_bbc_s"]
+                  "s"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_size [name="restricted_bbc_enabledTags[]" type="checkbox" value="size"]
+                label [for="tag_restricted_bbc_size"]
+                  "size"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_spoiler [name="restricted_bbc_enabledTags[]" type="checkbox" value="spoiler"]
+                label [for="tag_restricted_bbc_spoiler"]
+                  "spoiler"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_sub [name="restricted_bbc_enabledTags[]" type="checkbox" value="sub"]
+                label [for="tag_restricted_bbc_sub"]
+                  "sub"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_sup [name="restricted_bbc_enabledTags[]" type="checkbox" value="sup"]
+                label [for="tag_restricted_bbc_sup"]
+                  "sup"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_table [name="restricted_bbc_enabledTags[]" type="checkbox" value="table"]
+                label [for="tag_restricted_bbc_table"]
+                  "table"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_time [name="restricted_bbc_enabledTags[]" type="checkbox" value="time"]
+                label [for="tag_restricted_bbc_time"]
+                  "time"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_tt [name="restricted_bbc_enabledTags[]" type="checkbox" value="tt"]
+                label [for="tag_restricted_bbc_tt"]
+                  "tt"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_u [name="restricted_bbc_enabledTags[]" type="checkbox" value="u"]
+                label [for="tag_restricted_bbc_u"]
+                  "u"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_url [name="restricted_bbc_enabledTags[]" type="checkbox" value="url"]
+                label [for="tag_restricted_bbc_url"]
+                  "url"
+              li.floatleft.list_bbc
+                input#tag_restricted_bbc_youtube [name="restricted_bbc_enabledTags[]" type="checkbox" value="youtube"]
+                label [for="tag_restricted_bbc_youtube"]
+                  "youtube"
+            input#bbc_restricted_bbc_select_all [onclick="invertAll(this, this.form, 'restricted_bbc_enabledTags');" type="checkbox"]
+            label [for="bbc_restricted_bbc_select_all"]
+              em
+                "Select all tags"
+    div.cat_bar
+      h3.catbg
+        "Markdown settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enableMarkdown_help [href="{boardurl}/index.php?action=helpadmin;help=enableMarkdown" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableMarkdown
+          span
+            label [for="enableMarkdown"]
+              "Enable Markdown"
+        dd
+          input#enableMarkdown [name="enableMarkdown" onchange="document.getElementById('collapse_blank_lines').disabled = !this.checked; document.getElementById('collapse_single_breaks').disabled = !this.checked;" type="checkbox" value="#"]
+        dt
+          a#setting_collapse_blank_lines_help [href="{boardurl}/index.php?action=helpadmin;help=collapse_blank_lines" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_collapse_blank_lines
+          span [style="color: ##;"]
+            label [for="collapse_blank_lines"]
+              "Collapse extra blank lines"
+        dd
+          input#collapse_blank_lines [checked disabled name="collapse_blank_lines" type="checkbox" value="#"]
+        dt
+          a#setting_collapse_single_breaks_help [href="{boardurl}/index.php?action=helpadmin;help=collapse_single_breaks" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_collapse_single_breaks
+          span [style="color: ##;"]
+            label [for="collapse_single_breaks"]
+              "Clean up line breaks inside paragraphs"
+        dd
+          input#collapse_single_breaks [checked disabled name="collapse_single_breaks" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_layout.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_layout.txt
new file mode 100644
index 00000000000..3237f12bdd0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_layout.txt
@@ -0,0 +1,172 @@
+status 200
+@ title
+title
+  "Features and Options"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Layout"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the settings of features and basic options in your forum. Please see the"
+    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#;{session_var}={session_id}"]
+      "theme settings"
+    "for more options. Click the help icons for more information about a setting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=layout" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Layout"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_compactTopicPagesEnable_help [href="{boardurl}/index.php?action=helpadmin;help=compactTopicPagesEnable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_compactTopicPagesEnable
+          span
+            label [for="compactTopicPagesEnable"]
+              "Limit number of displayed page links"
+        dd
+          input#compactTopicPagesEnable [checked name="compactTopicPagesEnable" type="checkbox" value="#"]
+        dt
+          a#setting_compactTopicPagesContiguous
+          span
+            label [for="compactTopicPagesContiguous"]
+              "Contiguous pages to display"
+            br
+            span.smalltext
+              "\"#\" to display:"
+              strong
+                "# ... # [#] # ... #"
+              br
+              "\"#\" to display:"
+              strong
+                "# ... # # [#] # # ... #"
+        dd
+          input#compactTopicPagesContiguous [min="#" name="compactTopicPagesContiguous" size="#" type="number" value="#"]
+        dt
+          a#setting_defaultMaxMembers
+          span
+            label [for="defaultMaxMembers"]
+              "Members per page in member list"
+        dd
+          input#defaultMaxMembers [min="#" name="defaultMaxMembers" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_todayMod_help [href="{boardurl}/index.php?action=helpadmin;help=todayMod" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_todayMod
+          span
+            label [for="todayMod"]
+              "Enable shorthand date display"
+        dd
+          select#todayMod [name="todayMod" size="#"]
+            option [value="#"]
+              "Disabled"
+            option [selected value="#"]
+              "Only Today"
+            option [value="#"]
+              "Yesterday, Today, & Tomorrow"
+        dt
+          a#setting_onlineEnable_help [href="{boardurl}/index.php?action=helpadmin;help=onlineEnable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_onlineEnable
+          span
+            label [for="onlineEnable"]
+              "Show online/offline status in posts and PMs"
+        dd
+          input#onlineEnable [name="onlineEnable" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_timeLoadPageEnable_help [href="{boardurl}/index.php?action=helpadmin;help=timeLoadPageEnable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_timeLoadPageEnable
+          span
+            label [for="timeLoadPageEnable"]
+              "Display time taken to create every page"
+        dd
+          input#timeLoadPageEnable [name="timeLoadPageEnable" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_likes.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_likes.txt
new file mode 100644
index 00000000000..3334f625add
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_likes.txt
@@ -0,0 +1,137 @@
+status 200
+@ title
+title
+  "Features and Options"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Likes"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the settings of features and basic options in your forum. Please see the"
+    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#;{session_var}={session_id}"]
+      "theme settings"
+    "for more options. Click the help icons for more information about a setting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=likes" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Likes"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enable_likes
+          span
+            label [for="enable_likes"]
+              "Enable Likes"
+        dd
+          input#enable_likes [name="enable_likes" type="checkbox" value="#"]
+        dt
+          a#setting_likes_like
+          span
+            label
+              "Membergroups allowed to like posts"
+        dd
+          fieldset#likes_like
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('likes_like').style.display = 'none';document.getElementById('likes_like_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="likes_like[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="likes_like[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'likes_like[');" type="checkbox"]
+                span
+                  "Select all"
+          a#likes_like_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('likes_like').style.display = 'block'; document.getElementById('likes_like_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("likes_like").style.display = "none"; document.getElementById("likes_like_groups_link").style.display = "";
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_mentions.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_mentions.txt
new file mode 100644
index 00000000000..e64945137fc
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_mentions.txt
@@ -0,0 +1,141 @@
+status 200
+@ title
+title
+  "Features and Options"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Mentions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the settings of features and basic options in your forum. Please see the"
+    a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#;{session_var}={session_id}"]
+      "theme settings"
+    "for more options. Click the help icons for more information about a setting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=mentions" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Mentions"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enable_mentions
+          span
+            label [for="enable_mentions"]
+              "Enable Mentions"
+        dd
+          input#enable_mentions [name="enable_mentions" type="checkbox" value="#"]
+        dt
+          a#setting_mention
+          span
+            label
+              "Membergroups allowed to mention users"
+        dd
+          fieldset#mention
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('mention').style.display = 'none';document.getElementById('mention_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="mention[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="mention[-#]" type="checkbox" value="on"]
+                span
+                  "Guests"
+              li
+                input [name="mention[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'mention[');" type="checkbox"]
+                span
+                  "Select all"
+          a#mention_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('mention').style.display = 'block'; document.getElementById('mention_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("mention").style.display = "none"; document.getElementById("mention_groups_link").style.display = "";
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_profile.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile.txt
new file mode 100644
index 00000000000..1e3759eb212
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile.txt
@@ -0,0 +1,257 @@
+status 200
+@ title
+title
+  "Custom Profile Fields"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Profile Fields"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can create your own custom profile fields that fit in with your own forum’s requirements"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#standardProfileFields [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile" method="post" name="standardProfileFields"]
+    div.cat_bar
+      h3.catbg
+        "Standard Profile Fields"
+    table#standard_profile_fields.table_grid
+      thead
+        tr.title_bar
+          th#header_standard_profile_fields_field.field [scope="col"]
+            "Field"
+          th#header_standard_profile_fields_active.active.centercol [scope="col"]
+            "Active"
+          th#header_standard_profile_fields_show_on_registration.centercol.show_on_registration [scope="col"]
+            "Show on Registration"
+      tbody
+        tr#list_standard_profile_fields_#.windowbg
+          td.field [style="width: #%;"]
+            "Website"
+          td.active.centercol [style="width: #%;"]
+            input#active_website [checked name="active[]" onclick="document.getElementById('reg_website').disabled = !this.checked;" type="checkbox" value="website"]
+          td.centercol.show_on_registration [style="width: #%;"]
+            input#reg_website [name="reg[]" type="checkbox" value="website"]
+        tr#list_standard_profile_fields_#.windowbg
+          td.field [style="width: #%;"]
+            "Personal text"
+          td.active.centercol [style="width: #%;"]
+            input#active_personal_text [checked name="active[]" onclick="document.getElementById('reg_personal_text').disabled = !this.checked;" type="checkbox" value="personal_text"]
+          td.centercol.show_on_registration [style="width: #%;"]
+            input#reg_personal_text [name="reg[]" type="checkbox" value="personal_text"]
+        tr#list_standard_profile_fields_#.windowbg
+          td.field [style="width: #%;"]
+            "Timezone"
+          td.active.centercol [style="width: #%;"]
+            input#active_timezone [checked name="active[]" onclick="document.getElementById('reg_timezone').disabled = !this.checked;" type="checkbox" value="timezone"]
+          td.centercol.show_on_registration [style="width: #%;"]
+            input#reg_timezone [name="reg[]" type="checkbox" value="timezone"]
+        tr#list_standard_profile_fields_#.windowbg
+          td.field [style="width: #%;"]
+            "Posts"
+          td.active.centercol [style="width: #%;"]
+            input#active_posts [checked name="active[]" type="checkbox" value="posts"]
+          td.centercol.show_on_registration [style="width: #%;"]
+            input#reg_posts [disabled name="reg[]" type="checkbox" value="posts"]
+        tr#list_standard_profile_fields_#.windowbg
+          td.field [style="width: #%;"]
+            "Warning status"
+          td.active.centercol [style="width: #%;"]
+            input#active_warning_status [checked name="active[]" type="checkbox" value="warning_status"]
+          td.centercol.show_on_registration [style="width: #%;"]
+            input#reg_warning_status [disabled name="reg[]" type="checkbox" value="warning_status"]
+    div.flow_auto
+      div.additional_row
+        input.button [name="save" type="submit" value="Save"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | var iNumChecks = document.forms.standardProfileFields.length; for (var i = #; i < iNumChecks; i++) if (document.forms.standardProfileFields[i].id.indexOf('reg_') == #) document.forms.standardProfileFields[i].disabled = document.forms.standardProfileFields[i].disabled || !document.getElementById('active_' + document.forms.standardProfileFields[i].id.substr(#)).checked;
+  br
+  form#customProfileFields [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit" method="post" name="customProfileFields"]
+    div.cat_bar
+      h3.catbg
+        "Custom Profile Fields"
+    table#custom_profile_fields.table_grid
+      thead
+        tr.title_bar
+          th#header_custom_profile_fields_field_order.field_order [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;sort=field_order;desc" rel="nofollow"]
+              "Field Order"
+              span.main_icons.sort_up
+          th#header_custom_profile_fields_field_name.field_name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;sort=field_name" rel="nofollow"]
+              "Field Name"
+          th#header_custom_profile_fields_field_type.field_type [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;sort=field_type" rel="nofollow"]
+              "Field Type"
+          th#header_custom_profile_fields_active.active [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;sort=active" rel="nofollow"]
+              "Active"
+          th#header_custom_profile_fields_placement.placement [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;sort=placement" rel="nofollow"]
+              "Placement"
+          th#header_custom_profile_fields_show_on_registration.show_on_registration [scope="col"]
+      tbody
+        tr#list_custom_profile_fields_#.windowbg
+          td.field_order [style="width: #%;"]
+            p.bold_text.centertext
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=down"]
+                span.toggle_down [title="Move Down"]
+          td.field_name [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "ICQ"
+            div.smalltext
+              "This is your ICQ number."
+          td.field_type [style="width: #%;"]
+            "Text"
+          td.active [style="width: #%;"]
+            "Yes"
+          td.placement [style="width: #%;"]
+            "With Icons"
+          td.show_on_registration [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Modify"
+        tr#list_custom_profile_fields_#.windowbg
+          td.field_order [style="width: #%;"]
+            p.bold_text.centertext
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=up"]
+                span.toggle_up [title="Move Up"]
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=down"]
+                span.toggle_down [title="Move Down"]
+          td.field_name [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Skype"
+            div.smalltext
+              "Your Skype username"
+          td.field_type [style="width: #%;"]
+            "Text"
+          td.active [style="width: #%;"]
+            "Yes"
+          td.placement [style="width: #%;"]
+            "With Icons"
+          td.show_on_registration [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Modify"
+        tr#list_custom_profile_fields_#.windowbg
+          td.field_order [style="width: #%;"]
+            p.bold_text.centertext
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=up"]
+                span.toggle_up [title="Move Up"]
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=down"]
+                span.toggle_down [title="Move Down"]
+          td.field_name [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Location"
+            div.smalltext
+              "Geographic location."
+          td.field_type [style="width: #%;"]
+            "Text"
+          td.active [style="width: #%;"]
+            "Yes"
+          td.placement [style="width: #%;"]
+            "Standard (with title)"
+          td.show_on_registration [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Modify"
+        tr#list_custom_profile_fields_#.windowbg
+          td.field_order [style="width: #%;"]
+            p.bold_text.centertext
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;move=up"]
+                span.toggle_up [title="Move Up"]
+          td.field_name [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Gender"
+            div.smalltext
+              "Your gender."
+          td.field_type [style="width: #%;"]
+            "Radio Button"
+          td.active [style="width: #%;"]
+            "Yes"
+          td.placement [style="width: #%;"]
+            "With Icons"
+          td.show_on_registration [style="width: #%;"]
+            a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#"]
+              "Modify"
+    div.flow_auto
+      div.additional_row
+        input.button [name="new" type="submit" value="New Field"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_edit.txt
new file mode 100644
index 00000000000..0f0caf77d18
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_edit.txt
@@ -0,0 +1,349 @@
+status 200
+@ title
+title
+  "Edit Profile field"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can create your own custom profile fields that fit in with your own forum’s requirements"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | var startOptID = #;
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;{session_var}={session_id}" method="post"]
+    div#section_header.cat_bar
+      h3.catbg
+        "Edit Profile field"
+    div.windowbg
+      fieldset
+        legend
+          "Display Settings"
+        dl.settings
+          dt
+            a#field_name_help.help [href="{boardurl}/index.php?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="field_name"]
+                "Name"
+            br
+            span.smalltext
+              "You can use translatable tokens in this field."
+          dd
+            input#field_name [maxlength="#" name="field_name" size="#" type="text" value="{icq}"]
+          dt
+            a#field_desc_help.help [href="{boardurl}/index.php?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="field_desc"]
+                "Description"
+            br
+            span.smalltext
+              "You can use translatable tokens in this field."
+          dd
+            textarea#field_desc [cols="#" name="field_desc" rows="#"]
+              "{icq_desc}"
+          dt
+            strong
+              label [for="profile_area"]
+                "Profile Section"
+            br
+            span.smalltext
+              "Section of profile the users will be able to edit this in."
+          dd
+            select#profile_area [name="profile_area"]
+              option [value="none"]
+                "None"
+              option [value="account"]
+                "Account Settings"
+              option [selected value="forumprofile"]
+                "Forum Profile"
+              option [value="theme"]
+                "Look and Layout"
+          dt
+            a#field_reg_require.help [href="{boardurl}/index.php?action=helpadmin;help=field_reg_require" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="reg"]
+                "Show on Registration"
+          dd
+            select#reg [name="reg"]
+              option [selected value="#"]
+                "No"
+              option [value="#"]
+                "Yes"
+              option [value="#"]
+                "Yes, and require entry"
+          dt
+            strong
+              label [for="display"]
+                "Show on Topic View"
+          dd
+            input#display [checked name="display" type="checkbox"]
+          dt
+            strong
+              label [for="mlist"]
+                "Show on memberlist"
+          dd
+            input#show_mlist [name="mlist" type="checkbox"]
+          dt
+            strong
+              label [for="placement"]
+                "Choose Placement"
+          dd
+            select#placement [name="placement"]
+              option [value="#"]
+                "Standard (with title)"
+              option [selected value="#"]
+                "With Icons"
+              option [value="#"]
+                "Above Signature"
+              option [value="#"]
+                "Below Signature"
+              option [value="#"]
+                "Below Avatar"
+              option [value="#"]
+                "Above Username"
+              option [value="#"]
+                "Bottom poster info"
+              option [value="#"]
+                "Before Username"
+              option [value="#"]
+                "After Username"
+          dt
+            a#field_show_enclosed.help [href="{boardurl}/index.php?action=helpadmin;help=field_show_enclosed" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="enclose"]
+                "Show Enclosed Within Text (Optional)"
+            br
+            span.smalltext
+              "We"
+              strong
+                "strongly"
+              "recommend to use an input mask to validate the input supplied by the user."
+          dd
+            textarea#enclose [cols="#" name="enclose" rows="#"]
+              "<a class=\"icq\" href=\"//www.icq.com/people/{INPUT}\" target=\"_blank\" rel=\"noopener\" title=\"ICQ - {INPUT}\"><img src=\"{DEFAULT_IMAGES_URL}/icq.png\" alt=\"ICQ - {INPUT}\"></a>"
+      fieldset
+        legend
+          "Input Settings"
+        dl.settings
+          dt
+            strong
+              label [for="field_type"]
+                "Field Type"
+          dd
+            select#field_type [name="field_type" onchange="updateInputBoxes();"]
+              option [selected value="text"]
+                "Text"
+              option [value="textarea"]
+                "Large Text"
+              option [value="select"]
+                "Select Box"
+              option [value="radio"]
+                "Radio Button"
+              option [value="check"]
+                "Checkbox"
+          dt#max_length_dt
+            strong
+              label [for="max_length_dd"]
+                "Maximum Length"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+          dd
+            input#max_length_dd [maxlength="#" name="max_length" size="#" type="text" value="#"]
+          dt#dimension_dt
+            strong
+              label [for="dimension_dd"]
+                "Dimensions"
+          dd#dimension_dd
+            strong
+              "Rows"
+            input [maxlength="#" name="rows" size="#" type="text" value="#"]
+            strong
+              "Columns"
+            input [maxlength="#" name="cols" size="#" type="text" value="#"]
+          dt#bbc_dt
+            strong
+              label [for="bbc_dd"]
+                "Allow BBC"
+          dd
+            input#bbc_dd [name="bbc" type="checkbox"]
+          dt#options_dt
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=customoptions" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="options_dd"]
+                "Options"
+            br
+            span.smalltext
+              "Leave option box blank to remove. Radio button selects default option."
+            br
+            span
+              "You can use translatable tokens in this field."
+          dd#options_dd
+            input [checked name="default_select" type="radio" value="#"]
+            input [name="select_option[#]" type="text" value]
+            br
+            input [checked name="default_select" type="radio" value="#"]
+            input [name="select_option[#]" type="text" value]
+            span#addopt
+            "["
+            a [href onclick="addOption(); return false;"]
+              "More"
+            "]"
+          dt#default_dt
+            strong
+              label [for="default_dd"]
+                "Default State"
+          dd
+            input#default_dd [name="default_check" type="checkbox"]
+      fieldset
+        legend
+          "Advanced Settings"
+        dl.settings
+          dt#mask_dt
+            a#custom_mask.help [href="{boardurl}/index.php?action=helpadmin;help=custom_mask" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="mask"]
+                "Input Mask"
+            br
+            span.smalltext
+              "For text fields an input mask can be selected to validate the data."
+          dd
+            select#mask [name="mask" onchange="updateInputBoxes();"]
+              option [value="nohtml"]
+                "No HTML"
+              option [value="email"]
+                "Valid Email"
+              option [value="number"]
+                "Numeric"
+              option [selected value="regex"]
+                "Regex (Advanced)"
+            br
+            span#regex_div
+              input [name="regex" size="#" type="text" value="~[#-#][#-#]{#}~i"]
+          dt
+            strong
+              label [for="private"]
+                "Privacy"
+            br
+            span.smalltext
+              "Who can see and edit this field."
+          dd
+            select#private [name="private" onchange="updateInputBoxes();"]
+              option [selected value="#"]
+                "Users can see this field; owner can edit it"
+              option [value="#"]
+                "Users can see this field; only admins can edit it"
+              option [value="#"]
+                "Users cannot see this field; owner and admins can edit it."
+              option [value="#"]
+                "This field is only visible to admins"
+          dt#can_search_dt
+            strong
+              label [for="can_search_dd"]
+                "Searchable"
+            br
+            span.smalltext
+              "Can this field be searched from the members list."
+          dd
+            input#can_search_dd [name="can_search" type="checkbox"]
+          dt
+            strong
+              label [for="can_search_check"]
+                "Active"
+            br
+            span.smalltext
+              "If not selected this field will not be shown to anyone."
+          dd
+            input#can_search_check [checked name="active" type="checkbox"]
+      input.button [name="save" type="submit" value="Save"]
+      input.button.you_sure [data-confirm="Are you sure you wish to delete this field - all related user data will be lost!" name="delete" type="submit" value="Delete"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | updateInputBoxes();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_new.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_new.txt
new file mode 100644
index 00000000000..d4c49181650
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_profile_field_new.txt
@@ -0,0 +1,346 @@
+status 200
+@ title
+title
+  "Add Profile field"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can create your own custom profile fields that fit in with your own forum’s requirements"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | var startOptID = #;
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;sa=profileedit;fid=#;{session_var}={session_id}" method="post"]
+    div#section_header.cat_bar
+      h3.catbg
+        "Add Profile field"
+    div.windowbg
+      fieldset
+        legend
+          "Display Settings"
+        dl.settings
+          dt
+            a#field_name_help.help [href="{boardurl}/index.php?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="field_name"]
+                "Name"
+            br
+            span.smalltext
+              "You can use translatable tokens in this field."
+          dd
+            input#field_name [maxlength="#" name="field_name" size="#" type="text" value]
+          dt
+            a#field_desc_help.help [href="{boardurl}/index.php?action=helpadmin;help=translatable_fields" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="field_desc"]
+                "Description"
+            br
+            span.smalltext
+              "You can use translatable tokens in this field."
+          dd
+            textarea#field_desc [cols="#" name="field_desc" rows="#"]
+          dt
+            strong
+              label [for="profile_area"]
+                "Profile Section"
+            br
+            span.smalltext
+              "Section of profile the users will be able to edit this in."
+          dd
+            select#profile_area [name="profile_area"]
+              option [value="none"]
+                "None"
+              option [value="account"]
+                "Account Settings"
+              option [selected value="forumprofile"]
+                "Forum Profile"
+              option [value="theme"]
+                "Look and Layout"
+          dt
+            a#field_reg_require.help [href="{boardurl}/index.php?action=helpadmin;help=field_reg_require" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="reg"]
+                "Show on Registration"
+          dd
+            select#reg [name="reg"]
+              option [selected value="#"]
+                "No"
+              option [value="#"]
+                "Yes"
+              option [value="#"]
+                "Yes, and require entry"
+          dt
+            strong
+              label [for="display"]
+                "Show on Topic View"
+          dd
+            input#display [name="display" type="checkbox"]
+          dt
+            strong
+              label [for="mlist"]
+                "Show on memberlist"
+          dd
+            input#show_mlist [name="mlist" type="checkbox"]
+          dt
+            strong
+              label [for="placement"]
+                "Choose Placement"
+          dd
+            select#placement [name="placement"]
+              option [selected value="#"]
+                "Standard (with title)"
+              option [value="#"]
+                "With Icons"
+              option [value="#"]
+                "Above Signature"
+              option [value="#"]
+                "Below Signature"
+              option [value="#"]
+                "Below Avatar"
+              option [value="#"]
+                "Above Username"
+              option [value="#"]
+                "Bottom poster info"
+              option [value="#"]
+                "Before Username"
+              option [value="#"]
+                "After Username"
+          dt
+            a#field_show_enclosed.help [href="{boardurl}/index.php?action=helpadmin;help=field_show_enclosed" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="enclose"]
+                "Show Enclosed Within Text (Optional)"
+            br
+            span.smalltext
+              "We"
+              strong
+                "strongly"
+              "recommend to use an input mask to validate the input supplied by the user."
+          dd
+            textarea#enclose [cols="#" name="enclose" rows="#"]
+      fieldset
+        legend
+          "Input Settings"
+        dl.settings
+          dt
+            strong
+              label [for="field_type"]
+                "Field Type"
+          dd
+            select#field_type [name="field_type" onchange="updateInputBoxes();"]
+              option [selected value="text"]
+                "Text"
+              option [value="textarea"]
+                "Large Text"
+              option [value="select"]
+                "Select Box"
+              option [value="radio"]
+                "Radio Button"
+              option [value="check"]
+                "Checkbox"
+          dt#max_length_dt
+            strong
+              label [for="max_length_dd"]
+                "Maximum Length"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+          dd
+            input#max_length_dd [maxlength="#" name="max_length" size="#" type="text" value="#"]
+          dt#dimension_dt
+            strong
+              label [for="dimension_dd"]
+                "Dimensions"
+          dd#dimension_dd
+            strong
+              "Rows"
+            input [maxlength="#" name="rows" size="#" type="text" value="#"]
+            strong
+              "Columns"
+            input [maxlength="#" name="cols" size="#" type="text" value="#"]
+          dt#bbc_dt
+            strong
+              label [for="bbc_dd"]
+                "Allow BBC"
+          dd
+            input#bbc_dd [name="bbc" type="checkbox"]
+          dt#options_dt
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=customoptions" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="options_dd"]
+                "Options"
+            br
+            span.smalltext
+              "Leave option box blank to remove. Radio button selects default option."
+            br
+            span
+              "You can use translatable tokens in this field."
+          dd#options_dd
+            input [checked name="default_select" type="radio" value="#"]
+            input [name="select_option[#]" type="text" value]
+            br
+            input [checked name="default_select" type="radio" value="#"]
+            input [name="select_option[#]" type="text" value]
+            span#addopt
+            "["
+            a [href onclick="addOption(); return false;"]
+              "More"
+            "]"
+          dt#default_dt
+            strong
+              label [for="default_dd"]
+                "Default State"
+          dd
+            input#default_dd [name="default_check" type="checkbox"]
+      fieldset
+        legend
+          "Advanced Settings"
+        dl.settings
+          dt#mask_dt
+            a#custom_mask.help [href="{boardurl}/index.php?action=helpadmin;help=custom_mask" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+            strong
+              label [for="mask"]
+                "Input Mask"
+            br
+            span.smalltext
+              "For text fields an input mask can be selected to validate the data."
+          dd
+            select#mask [name="mask" onchange="updateInputBoxes();"]
+              option [selected value="nohtml"]
+                "No HTML"
+              option [value="email"]
+                "Valid Email"
+              option [value="number"]
+                "Numeric"
+              option [value="regex"]
+                "Regex (Advanced)"
+            br
+            span#regex_div
+              input [name="regex" size="#" type="text" value]
+          dt
+            strong
+              label [for="private"]
+                "Privacy"
+            br
+            span.smalltext
+              "Who can see and edit this field."
+          dd
+            select#private [name="private" onchange="updateInputBoxes();"]
+              option [selected value="#"]
+                "Users can see this field; owner can edit it"
+              option [value="#"]
+                "Users can see this field; only admins can edit it"
+              option [value="#"]
+                "Users cannot see this field; owner and admins can edit it."
+              option [value="#"]
+                "This field is only visible to admins"
+          dt#can_search_dt
+            strong
+              label [for="can_search_dd"]
+                "Searchable"
+            br
+            span.smalltext
+              "Can this field be searched from the members list."
+          dd
+            input#can_search_dd [name="can_search" type="checkbox"]
+          dt
+            strong
+              label [for="can_search_check"]
+                "Active"
+            br
+            span.smalltext
+              "If not selected this field will not be shown to anyone."
+          dd
+            input#can_search_check [checked name="active" type="checkbox"]
+      input.button [name="save" type="submit" value="Save"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | updateInputBoxes();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/features_sig.txt b/tests/Integration/Http/Snapshot/snapshots/admin/features_sig.txt
new file mode 100644
index 00000000000..5b79c47a44c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/features_sig.txt
@@ -0,0 +1,375 @@
+status 200
+@ title
+title
+  "Signature Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Features and Options"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Signatures"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=featuresettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Features and Options"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Use the settings on this page to decide how member signatures should be treated in SMF."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Features and Options Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Features and Options Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=basic;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=bbc;{session_var}={session_id}"]
+                "Bulletin Board Code & Markdown"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=layout;{session_var}={session_id}"]
+                "Layout"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;{session_var}={session_id}"]
+                "Signatures"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=profile;{session_var}={session_id}"]
+                "Profile Fields"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=likes;{session_var}={session_id}"]
+                "Likes"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=mentions;{session_var}={session_id}"]
+                "Mentions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=alerts;{session_var}={session_id}"]
+                "Notifications"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=featuresettings;save;sa=sig" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Signature Settings"
+    div.information.noup
+      div.centertext
+        "Note that settings are not applied to existing signatures by default."
+        a [href="{boardurl}/index.php?action=admin;area=featuresettings;sa=sig;apply;{session_var}={sessions_id}"]
+          "Apply changes now"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_signature_enable
+          span
+            label [for="signature_enable"]
+              "Enable signatures"
+        dd
+          input#signature_enable [checked name="signature_enable" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_signature_max_length
+          span
+            label [for="signature_max_length"]
+              "Maximum allowed characters"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_length [min="#" name="signature_max_length" size="#" type="number" value="#"]
+        dt
+          a#setting_signature_max_lines
+          span
+            label [for="signature_max_lines"]
+              "Maximum amount of lines"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_lines [min="#" name="signature_max_lines" size="#" type="number" value="#"]
+        dt
+          a#setting_signature_max_font_size
+          span
+            label [for="signature_max_font_size"]
+              "Maximum font size allowed in signatures (pixels)"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_font_size [min="#" name="signature_max_font_size" size="#" type="number" value="#"]
+        dt
+          a#setting_signature_allow_smileys
+          span
+            label [for="signature_allow_smileys"]
+              "Allow smileys in signatures"
+        dd
+          input#signature_allow_smileys [checked name="signature_allow_smileys" onclick="document.getElementById('signature_max_smileys').disabled = !this.checked;" type="checkbox" value="#"]
+        dt
+          a#setting_signature_max_smileys
+          span
+            label [for="signature_max_smileys"]
+              "Maximum smiley count"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_smileys [min="#" name="signature_max_smileys" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_signature_max_images
+          span
+            label [for="signature_max_images"]
+              "Maximum image count"
+            br
+            span.smalltext
+              "(# for(s) no max - excludes smileys)"
+        dd
+          input#signature_max_images [min="#" name="signature_max_images" size="#" type="number" value="#"]
+        dt
+          a#setting_signature_max_image_width
+          span
+            label [for="signature_max_image_width"]
+              "Maximum width of signature images (pixels)"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_image_width [min="#" name="signature_max_image_width" size="#" type="number" value="#"]
+        dt
+          a#setting_signature_max_image_height
+          span
+            label [for="signature_max_image_height"]
+              "Maximum height of signature images (pixels)"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#signature_max_image_height [min="#" name="signature_max_image_height" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_signature_bbc
+          span
+            label [for="signature_bbc"]
+              "Enabled BBC tags"
+        dd
+          fieldset#signature_bbc
+            legend
+              "Select the tags which are allowed to be used"
+            ul
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_abbr [checked name="signature_bbc_enabledTags[]" type="checkbox" value="abbr"]
+                label [for="tag_signature_bbc_abbr"]
+                  "abbr"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_anchor [checked name="signature_bbc_enabledTags[]" type="checkbox" value="anchor"]
+                label [for="tag_signature_bbc_anchor"]
+                  "anchor"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_attach [checked name="signature_bbc_enabledTags[]" type="checkbox" value="attach"]
+                label [for="tag_signature_bbc_attach"]
+                  "attach"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_b [checked name="signature_bbc_enabledTags[]" type="checkbox" value="b"]
+                label [for="tag_signature_bbc_b"]
+                  "b"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_br [checked name="signature_bbc_enabledTags[]" type="checkbox" value="br"]
+                label [for="tag_signature_bbc_br"]
+                  "br"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_center [checked name="signature_bbc_enabledTags[]" type="checkbox" value="center"]
+                label [for="tag_signature_bbc_center"]
+                  "center"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_code [checked name="signature_bbc_enabledTags[]" type="checkbox" value="code"]
+                label [for="tag_signature_bbc_code"]
+                  "code"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_color [checked name="signature_bbc_enabledTags[]" type="checkbox" value="color"]
+                label [for="tag_signature_bbc_color"]
+                  "color"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_details [checked name="signature_bbc_enabledTags[]" type="checkbox" value="details"]
+                label [for="tag_signature_bbc_details"]
+                  "details"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_email [checked name="signature_bbc_enabledTags[]" type="checkbox" value="email"]
+                label [for="tag_signature_bbc_email"]
+                  "email"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_float [checked name="signature_bbc_enabledTags[]" type="checkbox" value="float"]
+                label [for="tag_signature_bbc_float"]
+                  "float"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_font [checked name="signature_bbc_enabledTags[]" type="checkbox" value="font"]
+                label [for="tag_signature_bbc_font"]
+                  "font"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_h# [checked name="signature_bbc_enabledTags[]" type="checkbox" value="h#"]
+                label [for="tag_signature_bbc_h#"]
+                  "h#"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_html [checked name="signature_bbc_enabledTags[]" type="checkbox" value="html"]
+                label [for="tag_signature_bbc_html"]
+                  "html"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_hr [checked name="signature_bbc_enabledTags[]" type="checkbox" value="hr"]
+                label [for="tag_signature_bbc_hr"]
+                  "hr"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_i [checked name="signature_bbc_enabledTags[]" type="checkbox" value="i"]
+                label [for="tag_signature_bbc_i"]
+                  "i"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_img [checked name="signature_bbc_enabledTags[]" type="checkbox" value="img"]
+                label [for="tag_signature_bbc_img"]
+                  "img"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_iurl [checked name="signature_bbc_enabledTags[]" type="checkbox" value="iurl"]
+                label [for="tag_signature_bbc_iurl"]
+                  "iurl"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_justify [checked name="signature_bbc_enabledTags[]" type="checkbox" value="justify"]
+                label [for="tag_signature_bbc_justify"]
+                  "justify"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_list [checked name="signature_bbc_enabledTags[]" type="checkbox" value="list"]
+                label [for="tag_signature_bbc_list"]
+                  "list"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_ltr [checked name="signature_bbc_enabledTags[]" type="checkbox" value="ltr"]
+                label [for="tag_signature_bbc_ltr"]
+                  "ltr"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_me [checked name="signature_bbc_enabledTags[]" type="checkbox" value="me"]
+                label [for="tag_signature_bbc_me"]
+                  "me"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_member [checked name="signature_bbc_enabledTags[]" type="checkbox" value="member"]
+                label [for="tag_signature_bbc_member"]
+                  "member"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_nobbc [checked name="signature_bbc_enabledTags[]" type="checkbox" value="nobbc"]
+                label [for="tag_signature_bbc_nobbc"]
+                  "nobbc"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_nolink [checked name="signature_bbc_enabledTags[]" type="checkbox" value="nolink"]
+                label [for="tag_signature_bbc_nolink"]
+                  "nolink"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_php [checked name="signature_bbc_enabledTags[]" type="checkbox" value="php"]
+                label [for="tag_signature_bbc_php"]
+                  "php"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_pre [checked name="signature_bbc_enabledTags[]" type="checkbox" value="pre"]
+                label [for="tag_signature_bbc_pre"]
+                  "pre"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_quote [checked name="signature_bbc_enabledTags[]" type="checkbox" value="quote"]
+                label [for="tag_signature_bbc_quote"]
+                  "quote"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_right [checked name="signature_bbc_enabledTags[]" type="checkbox" value="right"]
+                label [for="tag_signature_bbc_right"]
+                  "right"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_rtl [checked name="signature_bbc_enabledTags[]" type="checkbox" value="rtl"]
+                label [for="tag_signature_bbc_rtl"]
+                  "rtl"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_s [checked name="signature_bbc_enabledTags[]" type="checkbox" value="s"]
+                label [for="tag_signature_bbc_s"]
+                  "s"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_size [checked name="signature_bbc_enabledTags[]" type="checkbox" value="size"]
+                label [for="tag_signature_bbc_size"]
+                  "size"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_spoiler [checked name="signature_bbc_enabledTags[]" type="checkbox" value="spoiler"]
+                label [for="tag_signature_bbc_spoiler"]
+                  "spoiler"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_sub [checked name="signature_bbc_enabledTags[]" type="checkbox" value="sub"]
+                label [for="tag_signature_bbc_sub"]
+                  "sub"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_sup [checked name="signature_bbc_enabledTags[]" type="checkbox" value="sup"]
+                label [for="tag_signature_bbc_sup"]
+                  "sup"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_table [checked name="signature_bbc_enabledTags[]" type="checkbox" value="table"]
+                label [for="tag_signature_bbc_table"]
+                  "table"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_time [checked name="signature_bbc_enabledTags[]" type="checkbox" value="time"]
+                label [for="tag_signature_bbc_time"]
+                  "time"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_tt [checked name="signature_bbc_enabledTags[]" type="checkbox" value="tt"]
+                label [for="tag_signature_bbc_tt"]
+                  "tt"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_u [checked name="signature_bbc_enabledTags[]" type="checkbox" value="u"]
+                label [for="tag_signature_bbc_u"]
+                  "u"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_url [checked name="signature_bbc_enabledTags[]" type="checkbox" value="url"]
+                label [for="tag_signature_bbc_url"]
+                  "url"
+              li.floatleft.list_bbc
+                input#tag_signature_bbc_youtube [checked name="signature_bbc_enabledTags[]" type="checkbox" value="youtube"]
+                label [for="tag_signature_bbc_youtube"]
+                  "youtube"
+            input#bbc_signature_bbc_select_all [checked onclick="invertAll(this, this.form, 'signature_bbc_enabledTags');" type="checkbox"]
+            label [for="bbc_signature_bbc_select_all"]
+              em
+                "Select all tags"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | document.getElementById('signature_max_smileys').disabled = !document.getElementById('signature_allow_smileys').checked;
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/index.php b/tests/Integration/Http/Snapshot/snapshots/admin/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/languages.txt b/tests/Integration/Http/Snapshot/snapshots/admin/languages.txt
new file mode 100644
index 00000000000..4728b829b20
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/languages.txt
@@ -0,0 +1,113 @@
+status 200
+@ title
+title
+  "Edit Languages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Languages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Edit Languages"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Languages"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This section allows you to edit languages installed on your forum and download new ones from the Simple Machines website. You may also edit language-related settings here."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Languages Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Languages Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}"]
+                "Edit Languages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}"]
+                "Add Language"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=languages" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Edit Languages"
+    table#language_list.table_grid
+      thead
+        tr.title_bar
+          th#header_language_list_default.centercol.default [scope="col"]
+            "Default"
+          th#header_language_list_name.name [scope="col"]
+            "Language Name"
+          th#header_language_list_character_set.character_set [scope="col"]
+            "Character Set"
+          th#header_language_list_count.count [scope="col"]
+            "Users"
+          th#header_language_list_locale.locale [scope="col"]
+            "Locale"
+          th#header_language_list_editlang.editlang [scope="col"]
+      tbody
+        tr#list_language_list_en_US.windowbg
+          td.centercol.default [style="width: #%;"]
+            input [checked name="def_language" onclick="highlightSelected('list_language_list_en_US');" type="radio" value="en_US"]
+          td.centercol.name
+            a [href="{boardurl}/index.php?action=admin;area=languages;sa=editlang;lid=en_US"]
+              "English (US)"
+          td.centercol.character_set
+            "UTF-#"
+          td.centercol.count
+            "#"
+          td.centercol.locale
+            "en_US"
+          td.centercol.editlang [style="width: #%;"]
+            a.button [href="{boardurl}/index.php?action=admin;area=languages;sa=editlang;lid=en_US"]
+              "Edit"
+    div.additional_row
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input.button [name="set_default" type="submit" value="Save"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/languages_add.txt b/tests/Integration/Http/Snapshot/snapshots/admin/languages_add.txt
new file mode 100644
index 00000000000..e510f3f55ff
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/languages_add.txt
@@ -0,0 +1,87 @@
+status 200
+@ title
+title
+  "Edit Languages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Languages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Add Language"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Languages"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This section allows you to edit languages installed on your forum and download new ones from the Simple Machines website. You may also edit language-related settings here."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Languages Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Languages Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}"]
+                "Edit Languages"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}"]
+                "Add Language"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Add Language"
+    div.windowbg
+      fieldset
+        legend
+          "Download from Simple Machines"
+        label.smalltext
+          "Type name of language to search for or leave blank to search for all."
+        input [name="smf_add" size="#" type="text" value]
+      input.button [name="smf_add_sub" type="submit" value="Search"]
+      br
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/languages_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/languages_edit.txt
new file mode 100644
index 00000000000..4728b829b20
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/languages_edit.txt
@@ -0,0 +1,113 @@
+status 200
+@ title
+title
+  "Edit Languages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Languages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Edit Languages"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Languages"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This section allows you to edit languages installed on your forum and download new ones from the Simple Machines website. You may also edit language-related settings here."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Languages Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Languages Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}"]
+                "Edit Languages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}"]
+                "Add Language"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=languages" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Edit Languages"
+    table#language_list.table_grid
+      thead
+        tr.title_bar
+          th#header_language_list_default.centercol.default [scope="col"]
+            "Default"
+          th#header_language_list_name.name [scope="col"]
+            "Language Name"
+          th#header_language_list_character_set.character_set [scope="col"]
+            "Character Set"
+          th#header_language_list_count.count [scope="col"]
+            "Users"
+          th#header_language_list_locale.locale [scope="col"]
+            "Locale"
+          th#header_language_list_editlang.editlang [scope="col"]
+      tbody
+        tr#list_language_list_en_US.windowbg
+          td.centercol.default [style="width: #%;"]
+            input [checked name="def_language" onclick="highlightSelected('list_language_list_en_US');" type="radio" value="en_US"]
+          td.centercol.name
+            a [href="{boardurl}/index.php?action=admin;area=languages;sa=editlang;lid=en_US"]
+              "English (US)"
+          td.centercol.character_set
+            "UTF-#"
+          td.centercol.count
+            "#"
+          td.centercol.locale
+            "en_US"
+          td.centercol.editlang [style="width: #%;"]
+            a.button [href="{boardurl}/index.php?action=admin;area=languages;sa=editlang;lid=en_US"]
+              "Edit"
+    div.additional_row
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input.button [name="set_default" type="submit" value="Save"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/languages_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/languages_settings.txt
new file mode 100644
index 00000000000..86f4f26bfe1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/languages_settings.txt
@@ -0,0 +1,101 @@
+status 200
+@ title
+title
+  "Edit Languages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Languages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Languages"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This section allows you to edit languages installed on your forum and download new ones from the Simple Machines website. You may also edit language-related settings here."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Languages Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Languages Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=edit;{session_var}={session_id}"]
+                "Edit Languages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=languages;sa=add;{session_var}={session_id}"]
+                "Add Language"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=languages;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=languages;sa=settings;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_language
+          span
+            label [for="language"]
+              "Default forum language"
+        dd
+          select#language [name="language" size="#"]
+            option [selected value="en_US"]
+              "English (US)"
+        dt
+          a#setting_userLanguage_help [href="{boardurl}/index.php?action=helpadmin;help=userLanguage" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_userLanguage
+          span
+            label [for="userLanguage"]
+              "Enable user-selectable language support"
+        dd
+          input#userLanguage [checked name="userLanguage" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/logs_admin.txt b/tests/Integration/Http/Snapshot/snapshots/admin/logs_admin.txt
new file mode 100644
index 00000000000..2c9b1699710
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/logs_admin.txt
@@ -0,0 +1,121 @@
+status 200
+@ title
+title
+  "Administration Log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Logs"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Logs"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Lists administrative tasks that have been performed by admins of your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Logs Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Logs Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=errorlog;desc;{session_var}={session_id}"]
+                "Error Log"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;{session_var}={session_id}"]
+                "Administration Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;{session_var}={session_id}"]
+                "Moderation Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=banlog;{session_var}={session_id}"]
+                "Ban Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=tasklog;{session_var}={session_id}"]
+                "Task Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}"]
+                "Log Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Administration Log"
+    div.flow_hidden.information
+      div.additional_row
+        "Quick Search (By Member)"
+        input [name="search" size="#" type="text" value]
+        input.button [name="is_search" style="float:none" type="submit" value="Go"]
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected log entries?" name="remove" type="submit" value="Delete selected"]
+        input.button.you_sure [data-confirm="Are you sure you want to completely clear the log?" name="removeall" type="submit" value="Clear Log"]
+    table#moderation_log_list.table_grid [style="width:#%"]
+      thead
+        tr.title_bar
+          th#header_moderation_log_list_action.action.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#;sort=action" rel="nofollow"]
+              "Action"
+          th#header_moderation_log_list_time.lefttext.time [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#;sort=time;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+          th#header_moderation_log_list_moderator.lefttext.moderator [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#;sort=moderator" rel="nofollow"]
+              "Member"
+          th#header_moderation_log_list_position.lefttext.position [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#;sort=position" rel="nofollow"]
+              "Position"
+          th#header_moderation_log_list_ip.ip.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;type=#;sort=ip" rel="nofollow"]
+              "IP"
+          th#header_moderation_log_list_delete.centercol.delete [scope="col"]
+            input [name="all" onclick="invertAll(this, this.form);" type="checkbox"]
+      snapshot-ignored [selector="table.table_grid tbody"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="params" type="hidden" value]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="sort" type="hidden" value="time"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/logs_moderation.txt b/tests/Integration/Http/Snapshot/snapshots/admin/logs_moderation.txt
new file mode 100644
index 00000000000..a83333cffd8
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/logs_moderation.txt
@@ -0,0 +1,121 @@
+status 200
+@ title
+title
+  "Moderation Log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Logs"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Logs"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Lists moderation activities that have been performed by moderators on your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Logs Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Logs Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=errorlog;desc;{session_var}={session_id}"]
+                "Error Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;{session_var}={session_id}"]
+                "Administration Log"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;{session_var}={session_id}"]
+                "Moderation Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=banlog;{session_var}={session_id}"]
+                "Ban Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=tasklog;{session_var}={session_id}"]
+                "Task Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}"]
+                "Log Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Moderation Log"
+    div.flow_hidden.information
+      div.additional_row
+        "Quick Search (By Member)"
+        input [name="search" size="#" type="text" value]
+        input.button [name="is_search" style="float:none" type="submit" value="Go"]
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected log entries?" name="remove" type="submit" value="Delete selected"]
+        input.button.you_sure [data-confirm="Are you sure you want to completely clear the log?" name="removeall" type="submit" value="Clear Log"]
+    table#moderation_log_list.table_grid [style="width:#%"]
+      thead
+        tr.title_bar
+          th#header_moderation_log_list_action.action.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#;sort=action" rel="nofollow"]
+              "Action"
+          th#header_moderation_log_list_time.lefttext.time [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#;sort=time;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+          th#header_moderation_log_list_moderator.lefttext.moderator [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#;sort=moderator" rel="nofollow"]
+              "Member"
+          th#header_moderation_log_list_position.lefttext.position [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#;sort=position" rel="nofollow"]
+              "Position"
+          th#header_moderation_log_list_ip.ip.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;type=#;sort=ip" rel="nofollow"]
+              "IP"
+          th#header_moderation_log_list_delete.centercol.delete [scope="col"]
+            input [name="all" onclick="invertAll(this, this.form);" type="checkbox"]
+      snapshot-ignored [selector="table.table_grid tbody"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="params" type="hidden" value]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="sort" type="hidden" value="time"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/logs_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/logs_settings.txt
new file mode 100644
index 00000000000..8dcf443f11e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/logs_settings.txt
@@ -0,0 +1,263 @@
+status 200
+@ title
+title
+  "Log Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Logs"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Log Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Logs"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Use these options to configure how logging works on your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Logs Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Logs Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=errorlog;desc;{session_var}={session_id}"]
+                "Error Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=adminlog;{session_var}={session_id}"]
+                "Administration Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=modlog;{session_var}={session_id}"]
+                "Moderation Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=banlog;{session_var}={session_id}"]
+                "Ban Log"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=tasklog;{session_var}={session_id}"]
+                "Task Log"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}"]
+                "Log Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=logs;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Log Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_modlog_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=modlog" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_modlog_enabled
+          span
+            label [for="modlog_enabled"]
+              "Enable the moderation log"
+        dd
+          input#modlog_enabled [checked name="modlog_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_adminlog_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=adminlog" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_adminlog_enabled
+          span
+            label [for="adminlog_enabled"]
+              "Enable the administration log"
+        dd
+          input#adminlog_enabled [checked name="adminlog_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_userlog_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=userlog" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_userlog_enabled
+          span
+            label [for="userlog_enabled"]
+              "Enable the profile edits log"
+        dd
+          input#userlog_enabled [name="userlog_enabled" type="checkbox" value="#"]
+    div.cat_bar
+      h3#errorlog.catbg
+        "Error Log"
+    div.information.noup
+      "The error log, if enabled, will log every error encountered by users using your forum. This can be an invaluable aid to identifying forum problems."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enableErrorLogging_help [href="{boardurl}/index.php?action=helpadmin;help=enableErrorLogging" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableErrorLogging
+          span
+            label [for="enableErrorLogging"]
+              "Enable error logging"
+        dd
+          input#enableErrorLogging [checked name="enableErrorLogging" type="checkbox" value="#"]
+        dt
+          a#setting_enableErrorQueryLogging_help [href="{boardurl}/index.php?action=helpadmin;help=enableErrorQueryLogging" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableErrorQueryLogging
+          span
+            label [for="enableErrorQueryLogging"]
+              "Include database query in the error log"
+        dd
+          input#enableErrorQueryLogging [name="enableErrorQueryLogging" type="checkbox" value="#"]
+    div.cat_bar
+      h3#markread_title.catbg
+        "Read Logs"
+    div.information.noup
+      "The following options govern how long before automatically marking boards and topics as read and how long before purging this information."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_mark_read_beyond
+          span
+            label [for="mark_read_beyond"]
+              "Automatically mark boards as read for users who have been inactive after this many days"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#mark_read_beyond [max="#" min="#" name="mark_read_beyond" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_mark_read_delete_beyond
+          span
+            label [for="mark_read_delete_beyond"]
+              "Automatically purge information about boards and topics visited after this many days"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#mark_read_delete_beyond [max="#" min="#" name="mark_read_delete_beyond" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_mark_read_max_users
+          span
+            label [for="mark_read_max_users"]
+              "Maximum users to process at a time"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#mark_read_max_users [max="#" min="#" name="mark_read_max_users" size="#" step="#" type="number" value="#"]
+    div.cat_bar
+      h3#pruning_title.catbg
+        "Log Pruning"
+    div.information.noup
+      "The following options are useful for keeping your logs from growing too big, because most of the time older entries are not really of that much use."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_pruningOptions
+          span
+            label [for="pruningOptions"]
+              "Enable pruning of log entries"
+        dd
+          input#pruningOptions [checked name="pruningOptions" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_pruneErrorLog
+          span
+            label [for="pruneErrorLog"]
+              "Remove error log entries older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneErrorLog [min="#" name="pruneErrorLog" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_pruneModLog
+          span
+            label [for="pruneModLog"]
+              "Remove moderation log entries older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneModLog [min="#" name="pruneModLog" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_pruneBanLog
+          span
+            label [for="pruneBanLog"]
+              "Remove ban hit log entries older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneBanLog [min="#" name="pruneBanLog" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_pruneReportLog
+          span
+            label [for="pruneReportLog"]
+              "Remove report to moderator log entries older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneReportLog [min="#" name="pruneReportLog" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_pruneScheduledTaskLog
+          span
+            label [for="pruneScheduledTaskLog"]
+              "Remove scheduled task log entries older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneScheduledTaskLog [min="#" name="pruneScheduledTaskLog" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_pruneSpiderHitLog
+          span
+            label [for="pruneSpiderHitLog"]
+              "Remove search engine hit logs older than"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#pruneSpiderHitLog [min="#" name="pruneSpiderHitLog" size="#" type="number" value="#"]
+          "days"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/mail_queue.txt b/tests/Integration/Http/Snapshot/snapshots/admin/mail_queue.txt
new file mode 100644
index 00000000000..63162461c0e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/mail_queue.txt
@@ -0,0 +1,127 @@
+status 200
+@ title
+title
+  "Mail"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Mail"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Queue"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Mail"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can configure your mail settings, as well as view and administer the current mail queue."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Mail Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Mail Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=browse;{session_var}={session_id}"]
+                "Browse Queue"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=settings;{session_var}={session_id}"]
+                "Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;{session_var}={session_id}"]
+                "Send Test"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_mail
+    div#mailqueue_stats
+      div.cat_bar
+        h3.catbg
+          "Mail queue statistics"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Queue length"
+          dd
+            "#"
+          dt
+            strong
+              "Oldest Mail"
+          dd
+            "N/A"
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=mailqueue" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Browse Queue"
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to do this?" name="delete_redirects" type="submit" value="Remove selected"]
+        a.button.you_sure [data-confirm="Are you sure you wish to send the whole mail queue now? This will override any limits you have set." href="{boardurl}/index.php?action=admin;area=mailqueue;sa=clear;{session_var}={session_id}"]
+          "Send mail queue now"
+      table#mail_queue.table_grid
+        thead
+          tr.title_bar
+            th#header_mail_queue_subject.subject [scope="col"]
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sort=subject" rel="nofollow"]
+                "Subject"
+            th#header_mail_queue_recipient.recipient [scope="col"]
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sort=recipient" rel="nofollow"]
+                "Recipient"
+            th#header_mail_queue_priority.priority [scope="col"]
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sort=priority" rel="nofollow"]
+                "Priority"
+            th#header_mail_queue_age.age [scope="col"]
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sort=age;desc" rel="nofollow"]
+                "Age"
+                span.main_icons.sort_up
+            th#header_mail_queue_check.check [scope="col"]
+              input [onclick="invertAll(this, this.form);" type="checkbox"]
+        tbody
+          tr.windowbg
+            td.centertext [colspan="#"]
+              "The mail queue is currently empty"
+      div.additional_row
+        input.button.you_sure [data-confirm="Are you sure you want to do this?" name="delete_redirects" type="submit" value="Remove selected"]
+        a.button.you_sure [data-confirm="Are you sure you wish to send the whole mail queue now? This will override any limits you have set." href="{boardurl}/index.php?action=admin;area=mailqueue;sa=clear;{session_var}={session_id}"]
+          "Send mail queue now"
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="sort" type="hidden" value="age"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/mail_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/mail_settings.txt
new file mode 100644
index 00000000000..ba94eda3d53
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/mail_settings.txt
@@ -0,0 +1,195 @@
+status 200
+@ title
+title
+  "Mail"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Mail"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Mail"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can configure your mail settings, as well as view and administer the current mail queue."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Mail Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Mail Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=browse;{session_var}={session_id}"]
+                "Browse Queue"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=settings;{session_var}={session_id}"]
+                "Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;{session_var}={session_id}"]
+                "Send Test"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | var bDay = { happy_birthday: { subject: 'Happy birthday from {FORUMNAME}.', body: 'Dear {REALNAME},<br />\n<br />\nWe here at {FORUMNAME} would like to wish you a happy birthday. May this day and the year to follow be full of joy.<br />\n<br />\n{REGARDS}' }, karlbenson#: { subject: 'On your Birthday...', body: 'We could have sent you a birthday card. We could have sent you some flowers or a cake.<br />\n<br />\nBut we didn’t.<br />\n<br />\nWe could have even sent you one of those automatically generated messages to wish you happy birthday where we don’t even have to replace INSERT NAME.<br />\n<br />\nBut we didn’t.<br />\n<br />\nWe wrote this birthday greeting just for you.<br />\n<br />\nWe would like to wish you a very special birthday.<br />\n<br />\n{REGARDS}<br />\n<br />\n//:: This message was automatically generated :://' }, nite#: { subject: 'Happy Birthday!', body: 'Your friends at {FORUMNAME} would like to take a moment of your time to wish you a happy birthday, {REALNAME}. If you have not done so recently, please visit our community in order for others to have the opportunity to pass along their warm regards.<br />\n<br />\nEven though today is your birthday, {REALNAME}, we would like to remind you that your membership in our community has been the best gift to us thus far.<br />\n<br />\nBest Wishes,<br />\nThe Staff of {FORUMNAME}' }, zwaldowski: { subject: 'Birthday Wishes to {REALNAME}', body: 'Dear {REALNAME},<br />\n<br />\nAnother year in your life has passed. We at {FORUMNAME} hope it has been filled with happiness, and wish you luck in the coming one.<br />\n<br />\n{REGARDS}' }, geezmo: { subject: 'Happy birthday, {REALNAME}!', body: 'Do you know who’s having a birthday today, {REALNAME}?<br />\n<br />\nWe know... YOU!<br />\n<br />\nHappy birthday!<br />\n<br />\nYou’re now a year older but we hope you’re a lot happier than last year.<br />\n<br />\nEnjoy your day today, {REALNAME}!<br />\n<br />\n- From your {FORUMNAME} family' }, karlbenson#: { subject: 'Your Birthday Greeting', body: 'We hope your birthday is the best ever; cloudy, sunny or whatever the weather.<br />\nHave lots of birthday cake and fun, and tell us what you have done.<br />\n<br />\nWe hope this message brought you cheer, and make it last, until same time same place, next year.<br />\n<br />\n{REGARDS}' } }; function fetch_birthday_preview() { var index = document.getElementById('birthday_email').value; document.getElementById('birthday_subject').innerHTML = bDay[index].subject; document.getElementById('birthday_body').innerHTML = bDay[index].body; }
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=mailqueue;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_mail_limit
+          span
+            label [for="mail_limit"]
+              "Maximum emails to send per minute"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#mail_limit [min="#" name="mail_limit" size="#" type="number" value="#"]
+        dt
+          a#setting_mail_quantity
+          span
+            label [for="mail_quantity"]
+              "Maximum amount of emails to send per page load"
+        dd
+          input#mail_quantity [min="#" name="mail_quantity" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_birthday_email_help [href="{boardurl}/index.php?action=helpadmin;help=birthday_email" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_birthday_email
+          span
+            label [for="birthday_email"]
+              "Birthday message to use"
+        dd
+          select#birthday_email [name="birthday_email" onchange="fetch_birthday_preview()" size="#"]
+            option [value="happy_birthday"]
+              "happy_birthday"
+            option [value="karlbenson#"]
+              "karlbenson#"
+            option [value="nite#"]
+              "nite#"
+            option [value="zwaldowski"]
+              "zwaldowski"
+            option [value="geezmo"]
+              "geezmo"
+            option [value="karlbenson#"]
+              "karlbenson#"
+        dt
+          a#setting_birthday_subject
+          span [style="color: ##;"]
+            label [for="birthday_subject"]
+              "Email subject"
+        dd
+          div#birthday_subject
+            "Happy birthday from {FORUMNAME}."
+        dt
+          a#setting_birthday_body
+          span [style="color: ##;"]
+            label [for="birthday_body"]
+              "Email body"
+        dd
+          div#birthday_body
+            "Dear {REALNAME},"
+            br
+            "We here at {FORUMNAME} would like to wish you a happy birthday. May this day and the year to follow be full of joy."
+            br
+            "{REGARDS}"
+      hr
+      dl.settings
+        dt
+          a#setting_mail_type_help [href="{boardurl}/index.php?action=helpadmin;help=mail_type" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_mail_type
+          span
+            label [for="mail_type"]
+              "Mail type"
+        dd
+          select#mail_type [name="mail_type" size="#"]
+            option [value="SMTP"]
+              "SMTP"
+            option [value="SMTPTLS"]
+              "SMTPTLS"
+            option [selected value="SendMail"]
+              "SendMail"
+        dt
+          a#setting_smtp_host
+          span
+            label [for="smtp_host"]
+              "SMTP server"
+        dd
+          input#smtp_host [name="smtp_host" type="text" value]
+        dt
+          a#setting_smtp_port
+          span
+            label [for="smtp_port"]
+              "SMTP port"
+        dd
+          input#smtp_port [name="smtp_port" type="text" value="#"]
+        dt
+          a#setting_smtp_username
+          span
+            label [for="smtp_username"]
+              "SMTP username"
+        dd
+          input#smtp_username [name="smtp_username" type="text" value]
+        dt
+          a#setting_smtp_password
+          span
+            label [for="smtp_password"]
+              "SMTP password"
+            br
+            em
+              "(confirm)"
+        dd
+          input [name="smtp_password[#]" onfocus="this.value = ''; this.form.smtp_password.disabled = false;" type="password" value="*#fakepass#*"]
+          br
+          input#smtp_password [disabled name="smtp_password[#]" type="password"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/mail_test.txt b/tests/Integration/Http/Snapshot/snapshots/admin/mail_test.txt
new file mode 100644
index 00000000000..b731dff32f5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/mail_test.txt
@@ -0,0 +1,89 @@
+status 200
+@ title
+title
+  "Mail"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Mail"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Send Test"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Mail"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this page you can configure your mail settings, as well as view and administer the current mail queue."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Mail Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Mail Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=browse;{session_var}={session_id}"]
+                "Browse Queue"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=settings;{session_var}={session_id}"]
+                "Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;{session_var}={session_id}"]
+                "Send Test"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [action="{boardurl}/index.php?action=admin;area=mailqueue;sa=test;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Email Test"
+    div.windowbg
+      dl#post_header
+        dt
+          label#caption_subject [for="subject"]
+            "Subject"
+        dd
+          input#subject [maxlength="#" name="subject" size="#" type="text"]
+      textarea.editor [cols="#" name="message" rows="#"]
+      dl#post_footer
+        dd
+          input.button [type="submit" value="Send message"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/maintain_database.txt b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_database.txt
new file mode 100644
index 00000000000..6407c81ba0b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_database.txt
@@ -0,0 +1,97 @@
+status 200
+@ title
+title
+  "Forum Maintenance"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Maintenance"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Database"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Forum Maintenance"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Optimize tables, make backups, check for errors, and prune boards with these tools."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Forum Maintenance Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Forum Maintenance Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}"]
+                "Routine"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}"]
+                "Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}"]
+                "Topics"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=hooks;{session_var}={session_id}"]
+                "Integration Hooks"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_maintenance
+    form.option_form.windowbg [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=database" method="post"]
+      label
+        input [name="activity" type="radio" value="optimize"]
+        strong
+          "Optimize all tables"
+        p
+          "This task allows you to optimize all tables. This will get rid of overhead, effectively making the tables smaller in size and your forum faster."
+      label
+        input [name="activity" type="radio" value="convertentities"]
+        strong
+          "Convert HTML-entities to UTF-# character(s)"
+        p
+          "This function will convert all characters that are stored in the database as HTML-entities to UTF-# character(s). This is especially useful when you have just converted your forum from a character set like ISO-#-# while(s) non-latin characters were used on the forum. The browser then sends all characters as HTML-entities. For example, the HTML-entity &##; represents the greek letter α (alpha). Converting entities to UTF-# will(s) improve searching and sorting of text and reduce storage size."
+      input.button [type="submit" value="Run task now"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/maintain_members.txt b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_members.txt
new file mode 100644
index 00000000000..14d2e8698c7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_members.txt
@@ -0,0 +1,199 @@
+status 200
+@ title
+title
+  "Forum Maintenance"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Maintenance"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Members"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Forum Maintenance"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Optimize tables, make backups, check for errors, and prune boards with these tools."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Forum Maintenance Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Forum Maintenance Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}"]
+                "Routine"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}"]
+                "Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}"]
+                "Topics"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=hooks;{session_var}={session_id}"]
+                "Integration Hooks"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | var warningMessage = ''; var membersSwap = false; function swapMembers() { membersSwap = !membersSwap; var membersForm = document.getElementById('membersForm'); $("#membersPanel").slideToggle(#); document.getElementById("membersIcon").src = smf_images_url + (membersSwap ? "/selected_open.png" : "/selected.png"); setInnerHTML(document.getElementById("membersText"), membersSwap ? "Selected Groups" : "All Membergroups"); for (var i = #; i < membersForm.length; i++) { if (membersForm.elements[i].type.toLowerCase() == "checkbox") membersForm.elements[i].checked = !membersSwap; } } function checkAttributeValidity() { origText = 'Are you sure you want to attribute all guest posts with %type% of "%find%" to member "%member_to%"?'; valid = true; // Do all the fields! if (!document.getElementById('to').value) valid = false; warningMessage = origText.replace(/%member_to%/, document.getElementById('to').value); if (document.getElementById('type_email').checked) { if (!document.getElementById('from_email').value) valid = false; warningMessage = warningMessage.replace(/%type%/, 'an email address').replace(/%find%/, document.getElementById('from_email').value); } else { if (!document.getElementById('from_name').value) valid = false; warningMessage = warningMessage.replace(/%type%/, 'a username').replace(/%find%/, document.getElementById('from_name').value); } document.getElementById('do_attribute').disabled = valid ? '' : 'disabled'; setTimeout("checkAttributeValidity();", #); return valid; } setTimeout("checkAttributeValidity();", #);
+  div#manage_maintenance
+    div.cat_bar
+      h3.catbg
+        "Reattribute User Posts"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=members;activity=reattribute" method="post"]
+        p
+          strong
+            "Attribute posts made with"
+        dl.settings
+          dt
+            label [for="type_email"]
+              input#type_email [checked name="type" type="radio" value="email"]
+              "Email address of"
+          dd
+            input#from_email [name="from_email" onclick="document.getElementById('type_email').checked = 'checked'; document.getElementById('from_name').value = '';" type="text" value]
+          dt
+            label [for="type_name"]
+              input#type_name [name="type" type="radio" value="name"]
+              "Username of"
+          dd
+            input#from_name [name="from_name" onclick="document.getElementById('type_name').checked = 'checked'; document.getElementById('from_email').value = '';" type="text" value]
+        dl.settings
+          dt
+            label [for="to"]
+              strong
+                "Attribute posts to member"
+          dd
+            input#to [name="to" type="text" value]
+        p.maintain_members
+          input#posts [checked name="posts" type="checkbox"]
+          label [for="posts"]
+            "Add posts to users post count"
+        input#do_attribute.button [onclick="if (!checkAttributeValidity()) return false;\n\t\t\t\treturn confirm(warningMessage);" type="submit" value="Reattribute"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    div.cat_bar
+      h3.catbg
+        a.help [href="{boardurl}/index.php?action=helpadmin;help=maintenance_members" onclick="return reqOverlayDiv(this.href);"]
+          span.help.main_icons [title="Help"]
+        "Remove Inactive Members"
+    div.windowbg
+      form#membersForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=members;activity=purgeinactive" method="post"]
+        div.padding
+          a#membersLink
+          "Remove all members who have not"
+          select [name="del_type"]
+            option [selected value="activated"]
+              "activated their account"
+            option [value="logged"]
+              "logged in"
+          "for"
+          input [name="maxdays" size="#" type="number" value="#"]
+          "days."
+        div.padding
+          label [for="anonymize"]
+            input#anonymize [name="anonymize" type="checkbox" value="#"]
+            "Anonymize personally identifying information when account is deleted"
+        div.padding
+          a [href="#membersLink" onclick="swapMembers();"]
+            img#membersIcon [alt="+" src="{boardurl}/Themes/default/images/selected.png"]
+          a#membersText [href="#membersLink" onclick="swapMembers();" style="font-weight: bold;"]
+            "All Membergroups"
+        div#membersPanel [style="display: none;"]
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Ungrouped Members"
+            span.smalltext
+              "(Members with no assigned groups)"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Administrator"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Global Moderator"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Moderator"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Newbie"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Jr. Member"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Full Member"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Sr. Member"
+          br
+          label [for="groups#"]
+            input#groups# [checked name="groups[#]" type="checkbox"]
+            "Hero Member"
+          br
+        input.button.you_sure [data-confirm="Are you sure you really want to delete these member accounts?-n-This cannot be undone!" type="submit" value="Remove now"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    div.cat_bar
+      h3.catbg
+        "Recount User Posts"
+    div.windowbg
+      form#membersRecountForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=members;activity=recountposts" method="post"]
+        p
+          "Run this maintenance task to update your users total post count. It will recount all (countable) posts made by each user and then update their profile post count totals"
+        input.button [type="submit" value="Run task now"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | var oAttributeMemberSuggest = new smc_AutoSuggest({ sSelf: 'oAttributeMemberSuggest', sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'attributeMember', sControlId: 'to', sSearchType: 'member', sTextDeleteItem: 'Delete Item', bItemList: false });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/maintain_routine.txt b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_routine.txt
new file mode 100644
index 00000000000..86cf6f4fa98
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_routine.txt
@@ -0,0 +1,121 @@
+status 200
+@ title
+title
+  "Forum Maintenance"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Maintenance"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Routine"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Forum Maintenance"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Optimize tables, make backups, check for errors, and prune boards with these tools."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Forum Maintenance Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Forum Maintenance Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}"]
+                "Routine"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}"]
+                "Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}"]
+                "Topics"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=hooks;{session_var}={session_id}"]
+                "Integration Hooks"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_maintenance
+    form.option_form.windowbg [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain" method="post"]
+      label
+        input [name="activity" type="radio" value="version"]
+        strong
+          "Check all files against current versions"
+        p
+          "This maintenance task allows you to do a detailed version check of all forum files against the official list of latest versions."
+      label
+        input [name="activity" type="radio" value="repair"]
+        strong
+          "Find and repair any errors"
+        p
+          "If, for example, posts or topics are missing after a server crash, this function may help in finding them again."
+      label
+        input [name="activity" type="radio" value="recount"]
+        strong
+          "Recount all forum totals and statistics"
+        p
+          "Should the total replies of a topic or the number of PMs in your inbox be incorrect: this function will recount all saved counts and statistics for you."
+      label
+        input [name="activity" type="radio" value="rebuild_settings"]
+        strong
+          "Rebuild Settings.php"
+        p
+          "This task reconstructs your Settings.php file. It does not change the values stored in the file. Instead, it cleans up and reformats your Settings.php file to a pristine version."
+      label
+        input [name="activity" type="radio" value="logs"]
+        strong
+          "Empty out unimportant logs"
+        p
+          "This function will empty out all unimportant logs. This should be avoided unless something is wrong, but it does not hurt anything."
+      label
+        input [name="activity" type="radio" value="cleancache"]
+        strong
+          "Empty SMF’s cache"
+        p
+          "This function will empty out the cache should you need it to be cleared."
+      input.button [type="submit" value="Run task now"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/maintain_topics.txt b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_topics.txt
new file mode 100644
index 00000000000..37f444fbfcb
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/maintain_topics.txt
@@ -0,0 +1,182 @@
+status 200
+@ title
+title
+  "Forum Maintenance"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Maintenance"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Topics"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Forum Maintenance"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Optimize tables, make backups, check for errors, and prune boards with these tools."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Forum Maintenance Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Forum Maintenance Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=routine;{session_var}={session_id}"]
+                "Routine"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=members;{session_var}={session_id}"]
+                "Members"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=maintain;sa=topics;{session_var}={session_id}"]
+                "Topics"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=maintain;sa=hooks;{session_var}={session_id}"]
+                "Integration Hooks"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | var rotSwap = false; function swapRot() { rotSwap = !rotSwap; // Toggle icon document.getElementById("rotIcon").src = smf_images_url + (rotSwap ? "/selected_open.png" : "/selected.png"); setInnerHTML(document.getElementById("rotText"), rotSwap ? 'Specific boards (click to select all)' : 'All boards (click to select specific boards)'); // Toggle panel $("#rotPanel").slideToggle(#); // Toggle checkboxes var rotPanel = document.getElementById('rotPanel'); var oBoardCheckBoxes = rotPanel.getElementsByTagName('input'); for (var i = #; i < oBoardCheckBoxes.length; i++) { if (oBoardCheckBoxes[i].type.toLowerCase() == "checkbox") oBoardCheckBoxes[i].checked = !rotSwap; } }
+  div#manage_maintenance
+    div.cat_bar
+      h3.catbg
+        "Remove old posts"
+    div.windowbg
+      div.flow_auto
+        form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=topics;activity=pruneold" method="post"]
+          p
+            a#rotLink
+            "Remove all topics not posted in for"
+            input [name="maxdays" size="#" type="number" value="#"]
+            "days, which are:"
+          p
+            label [for="delete_type_nothing"]
+              input#delete_type_nothing [name="delete_type" type="radio" value="nothing"]
+              "Any sort of topic."
+            br
+            label [for="delete_type_moved"]
+              input#delete_type_moved [checked name="delete_type" type="radio" value="moved"]
+              "Moved/merged topic notices."
+            br
+            label [for="delete_type_locked"]
+              input#delete_type_locked [name="delete_type" type="radio" value="locked"]
+              "Locked."
+            br
+          p
+            label [for="delete_old_not_sticky"]
+              input#delete_old_not_sticky [checked name="delete_old_not_sticky" type="checkbox"]
+              "But do not count stickied topics."
+            br
+          p
+            a [href="#rotLink" onclick="swapRot();"]
+              img#rotIcon [alt="+" src="{boardurl}/Themes/default/images/selected.png"]
+            a#rotText [href="#rotLink" onclick="swapRot();" style="font-weight: bold;"]
+              "All boards (click to select specific boards)"
+          div#rotPanel.flow_hidden [style="display: none;"]
+            snapshot-ignored [selector="#rotPanel > div"]
+          input.button.you_sure [data-confirm="Are you really sure you want to delete old posts now?-n-This cannot be undone!" type="submit" value="Remove now"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+    div.cat_bar
+      h3.catbg
+        "Remove old drafts"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=topics;activity=olddrafts" method="post"]
+        p
+          "Remove all drafts older than"
+          input [name="draftdays" size="#" type="number" value="#"]
+          "days."
+        input.button.you_sure [data-confirm="Are you really sure you want to delete old drafts now?-n-This cannot be undone!" type="submit" value="Remove now"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    div.cat_bar
+      h3.catbg
+        "Move Topics"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=topics;activity=massmove" method="post"]
+        p
+          "Move topics from"
+          select#id_board_from [name="id_board_from"]
+            option [disabled selected]
+              "(Select Board)"
+            optgroup [label="Snapshot fixtures"]
+              option [value="#"]
+                "=> Snapshot board"
+              option [value="#"]
+                "===> Snapshot child one"
+              option [value="#"]
+                "===> Snapshot child two"
+              option [value="#"]
+                "=> Snapshot empty board"
+          "to"
+          select#id_board_to [name="id_board_to"]
+            option [disabled selected]
+              "(Select Board)"
+            optgroup [label="Snapshot fixtures"]
+              option [value="#"]
+                "=> Snapshot board"
+              option [value="#"]
+                "===> Snapshot child one"
+              option [value="#"]
+                "===> Snapshot child two"
+              option [value="#"]
+                "=> Snapshot empty board"
+        p
+          "Move topics not posted in for"
+          input [name="maxdays" size="#" type="number" value="#"]
+          "days. (Enter # to(s) move all topics)"
+        p
+          label [for="move_type_locked"]
+            input#move_type_locked [checked name="move_type_locked" type="checkbox"]
+            "Locked topics"
+          br
+          label [for="move_type_sticky"]
+            input#move_type_sticky [name="move_type_sticky" type="checkbox"]
+            "Sticky topics"
+          br
+        input.button [onclick="if (document.getElementById('id_board_from').options[document.getElementById('id_board_from').selectedIndex].disabled || document.getElementById('id_board_from').options[document.getElementById('id_board_to').selectedIndex].disabled) return false; var confirmText = 'Are you sure you want to move ALL the topics from \"%board_from%\" to \"%board_to%\"?'; return confirm(confirmText.replace(/%board_from%/, document.getElementById('id_board_from').options[document.getElementById('id_board_from').selectedIndex].text.replace(/^=+> /, '')).replace(/%board_to%/, document.getElementById('id_board_to').options[document.getElementById('id_board_to').selectedIndex].text.replace(/^=+> /, '')));" type="submit" value="Move now"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards.txt
new file mode 100644
index 00000000000..92366ab08df
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards.txt
@@ -0,0 +1,108 @@
+status 200
+@ title
+title
+  "Manage Boards and Categories"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Boards"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    div.cat_bar
+      h3.catbg
+        "Modify Boards"
+    div.windowbg
+      div.sub_bar
+        h3.subbg
+          a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=cat;cat=#"]
+            "Snapshot fixtures"
+          a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=cat;cat=#"]
+            "(modify)"
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=newboard;cat=#" method="post"]
+        ul#category_#.nolist
+          li.windowbg [style="padding-inline-start: #px;"]
+            span.floatleft
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            span.floatright
+              a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "permissions"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;move=#"]
+                "move"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#"]
+                "modify"
+            br [style="clear: right;"]
+        input.button [type="submit" value="Add Board"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_board.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_board.txt
new file mode 100644
index 00000000000..ba04c34ecb7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_board.txt
@@ -0,0 +1,280 @@
+status 200
+@ title
+title
+  "Modify Boards"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Boards"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=board#" method="post"]
+      input [name="boardid" type="hidden" value="#"]
+      div.cat_bar
+        h3.catbg
+          "Modify Boards"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Category"
+          dd
+            select [name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != #; this.form.board_order.disabled = this.options[this.selectedIndex].value != # || this.form.order.options[this.form.order.selectedIndex].value == '';}"]
+              option [selected value="#"]
+                "Snapshot fixtures"
+          dt
+            strong
+              "Order"
+          dd
+            select#order [name="placement" onchange="this.form.board_order.disabled = this.options[this.selectedIndex].value == '';"]
+              option [value]
+                "(Unchanged)"
+              option [value="after"]
+                "After ..."
+              option [value="child"]
+                "Sub-board of ..."
+              option [value="before"]
+                "Before ..."
+            select#board_order [disabled name="board_order"]
+              option [value]
+                "(Unchanged)"
+              option [selected value="#"]
+                "(Current Position)"
+              option [value="#"]
+                "- Snapshot child one"
+              option [value="#"]
+                "- Snapshot child two"
+              option [value="#"]
+                "Snapshot empty board"
+          dt
+            strong
+              "Full name"
+            br
+            span.smalltext
+              "This is the name that will be displayed."
+          dd
+            input [name="board_name" size="#" type="text" value="Snapshot board"]
+          dt
+            strong
+              "Description"
+            br
+            span.smalltext
+              "A short description of your board. HTML is not allowed, you can use the following BBC tags: abbr, anchor, b, br, center, color, font, hr, i, img, iurl, left, li, list, ltr, pre, right, s, sub, sup, table, td, tr, u, url"
+          dd
+            textarea [cols="#" name="desc" rows="#"]
+              "Topics, replies and a poll for the snapshot tests."
+          dt
+            strong
+              "Permission Profile"
+            br
+            span.smalltext
+              "Which"
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "permission set"
+              "the board should use."
+          dd
+            select [name="profile"]
+              option [selected value="#"]
+                "Default"
+              option [value="#"]
+                "No Polls"
+              option [value="#"]
+                "Read Only"
+              option [value="#"]
+                "Reply Only"
+          dt
+            strong
+              "Allowed Groups"
+            br
+            span.smalltext
+              "Groups allowed to access this board."
+              br
+              em
+                "Note: if the member is in any group or post group checked, they will have access to this board."
+          dd
+            label [for="groups_-#"]
+              input#groups_-# [checked name="groups[-#]" type="checkbox" value="allow"]
+              span
+                "Guests"
+            br
+            label [for="groups_#"]
+              input#groups_# [checked name="groups[#]" type="checkbox" value="allow"]
+              span.regular_members [title="This group contains all members that have no primary group set."]
+                "Regular Members"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span
+                "Global Moderator"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Newbie"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Jr. Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Full Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Sr. Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Hero Member"
+            br
+            span.select_all_box
+              em
+                "Select all"
+              input [onclick="invertAll(this, this.form, 'groups[');" type="checkbox"]
+            br
+          dt
+            strong
+              "Moderators"
+            br
+            span.smalltext
+              "Additional members to have moderation privileges on this board. Note that administrators do not have to be listed here."
+            br
+          dd
+            input#moderators [name="moderators" size="#" type="text" value]
+            div#moderator_container
+          dt
+            strong
+              "Moderator Groups"
+            br
+            span.smalltext
+              "Groups whose members have moderation privileges on this board. Note that this is limited to groups which are not post-based and not \"hidden\"."
+            br
+          dd
+            input#moderator_groups [name="moderator_groups" size="#" type="text" value]
+            div#moderator_group_container
+        script
+          | $(document).ready(function () { $(".select_all_box").each(function () { $(this).removeClass('select_all_box'); }); });
+        hr
+        div#count_posts_div
+          dl.settings
+            dt
+              strong
+                "Count posts"
+              br
+              span.smalltext
+                "Makes new replies and topics raise members’ post counts."
+              br
+            dd
+              input [checked name="count" type="checkbox"]
+        div#board_theme_div
+          dl.settings
+            dt
+              strong
+                "Board Theme"
+              br
+              span.smalltext
+                "This allows you to change the look of your forum only inside this board."
+              br
+            dd
+              select#boardtheme [name="boardtheme" onchange="refreshOptions();"]
+                option [selected value="#"]
+                  "(overall forum default.)"
+                option [value="#"]
+                  "SMF Default Theme - Curve#"
+        div#override_theme_div
+          dl.settings
+            dt
+              strong
+                "Override Member’s Theme"
+              br
+              span.smalltext
+                "Use this board’s theme even if the member did not choose to use the defaults."
+              br
+            dd
+              input [name="override_theme" type="checkbox"]
+        input [name="rid" type="hidden" value="boards"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="edit" onclick="return !isEmptyText(this.form.board_name);" type="submit" value="Modify"]
+        input.button.you_sure [data-confirm="Do you really want to delete this board?" name="delete" type="submit" value="Delete Board"]
+  script
+    | var oModeratorSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'moderators', sControlId: 'moderators', sSearchType: 'member', bItemList: true, sPostName: 'moderator_list', sURLMask: 'action=profile;u=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'moderator_container', aListItems: [ ] }); var oModeratorGroupSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'moderator_groups', sControlId: 'moderator_groups', sSearchType: 'membergroups', bItemList: true, sPostName: 'moderator_group_list', sURLMask: 'action=groups;sa=members;group=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'moderator_group_container', aListItems: [ ] });
+  script
+    | function refreshOptions() { var redirect = document.getElementById("redirect_enable"); var redirectEnabled = redirect ? redirect.checked : false; var nonDefaultTheme = document.getElementById("boardtheme").value == # ? false : true; // What to show? if(redirectEnabled || !nonDefaultTheme) document.getElementById("override_theme_div").classList.add('hidden'); else document.getElementById("override_theme_div").classList.remove('hidden'); if(redirectEnabled) { document.getElementById("board_theme_div").classList.add('hidden'); document.getElementById("count_posts_div").classList.add('hidden'); } else { document.getElementById("board_theme_div").classList.remove('hidden'); document.getElementById("count_posts_div").classList.remove('hidden'); } } refreshOptions();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_category.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_category.txt
new file mode 100644
index 00000000000..19622815b9f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_edit_category.txt
@@ -0,0 +1,123 @@
+status 200
+@ title
+title
+  "Edit Category"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Boards"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=cat#" method="post"]
+      input [name="cat" type="hidden" value="#"]
+      div.cat_bar
+        h3.catbg
+          "Edit Category"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Order"
+          dd
+            select [name="cat_order"]
+          dt
+            strong
+              "Full name"
+            br
+            span.smalltext
+              "This is the name that will be displayed."
+          dd
+            input [name="cat_name" size="#" type="text" value="Snapshot fixtures"]
+          dt
+            strong
+              "Description"
+            br
+            span.smalltext
+              "A short description of your category. HTML is not allowed, you can use the following BBC tags: abbr, anchor, b, br, center, color, font, hr, i, img, iurl, left, li, list, ltr, pre, right, s, sub, sup, table, td, tr, u, url"
+          dd
+            textarea [cols="#" name="cat_desc" rows="#"]
+              "Content for the template snapshot tests, version #."
+          dt
+            strong
+              "Collapsible"
+            br
+            span.smalltext
+              "Allow users to collapse this category"
+          dd
+            input [checked name="collapse" type="checkbox"]
+        input.button [name="edit" onclick="return !isEmptyText(this.form.cat_name);" type="submit" value="Modify"]
+        input.button.you_sure [data-confirm="Do you really want to delete this category?" name="delete" type="submit" value="Delete Category"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_move.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_move.txt
new file mode 100644
index 00000000000..cab2abb4c36
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_move.txt
@@ -0,0 +1,171 @@
+status 200
+@ title
+title
+  "Manage Boards and Categories"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Boards"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    div.cat_bar
+      h3.catbg
+        "Modify Boards"
+    div.windowbg
+      div.noticebox
+        "Select destination for board \""
+        strong
+          "{board}"
+        "\" ["
+        a [href="{boardurl}/index.php?action=admin;area=manageboards"]
+          "Cancel moving"
+        "]"
+      div.sub_bar
+        h3.subbg
+          a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=cat;cat=#"]
+            "Snapshot fixtures"
+          a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=cat;cat=#"]
+            "(modify)"
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=newboard;cat=#" method="post"]
+        ul#category_#.nolist
+          li
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=before;{session_var}={session_id};{token}" title="Before {board}"]
+              span.main_icons.select_above
+          li.windowbg [style="padding-inline-start: #px;"]
+            span.floatleft
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            span.floatright
+              a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "permissions"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;move=#"]
+                "move"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#"]
+                "modify"
+            br [style="clear: right;"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=child;{session_var}={session_id};{token}" title="Sub-board of {board}"]
+              span.main_icons.select_here [title="Sub-board of {board}"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            span.floatleft
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            span.floatright
+              a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "permissions"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;move=#"]
+                "move"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#"]
+                "modify"
+            br [style="clear: right;"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=after;{session_var}={session_id};{token}" title="After {board}"]
+              span.main_icons.select_above [title="After {board}"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=child;{session_var}={session_id};{token}" title="Sub-board of {board}"]
+              span.main_icons.select_here [title="Sub-board of {board}"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            span.floatleft
+              a.red [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            span.floatright
+              a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "permissions"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;move=#"]
+                "move"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#"]
+                "modify"
+            br [style="clear: right;"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=after;{session_var}={session_id};{token}" title="After {board}"]
+              span.main_icons.select_below [title="After {board}"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            span.floatleft
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            span.floatright
+              a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "permissions"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;move=#"]
+                "move"
+              a.button [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#"]
+                "modify"
+            br [style="clear: right;"]
+          li.windowbg [style="padding-inline-start: #px;"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=after;{session_var}={session_id};{token}" title="After {board}"]
+              span.main_icons.select_below [title="After {board}"]
+            a.move_links [href="{boardurl}/index.php?action=admin;area=manageboards;sa=move;src_board=#;target_board=#;move_to=child;{session_var}={session_id};{token}" title="Sub-board of {board}"]
+              span.main_icons.select_here [title="Sub-board of {board}"]
+        input.button [type="submit" value="Add Board"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_board.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_board.txt
new file mode 100644
index 00000000000..c2aeea7eaeb
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_board.txt
@@ -0,0 +1,299 @@
+status 200
+@ title
+title
+  "Modify Boards"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Boards"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=board#" method="post"]
+      input [name="boardid" type="hidden" value="#"]
+      div.cat_bar
+        h3.catbg
+          "New Board"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Category"
+          dd
+            select [name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != #; this.form.board_order.disabled = this.options[this.selectedIndex].value != # || this.form.order.options[this.form.order.selectedIndex].value == '';}"]
+              option [selected value="#"]
+                "Snapshot fixtures"
+          dt
+            strong
+              "Order"
+          dd
+            select#order [name="placement" onchange="this.form.board_order.disabled = this.options[this.selectedIndex].value == '';"]
+              option [value="after"]
+                "After ..."
+              option [value="child"]
+                "Sub-board of ..."
+              option [value="before"]
+                "Before ..."
+            select#board_order [name="board_order"]
+              option [value="#"]
+                "Snapshot board"
+              option [value="#"]
+                "- Snapshot child one"
+              option [value="#"]
+                "- Snapshot child two"
+              option [value="#"]
+                "Snapshot empty board"
+          dt
+            strong
+              "Full name"
+            br
+            span.smalltext
+              "This is the name that will be displayed."
+          dd
+            input [name="board_name" size="#" type="text" value="New Board"]
+          dt
+            strong
+              "Description"
+            br
+            span.smalltext
+              "A short description of your board. HTML is not allowed, you can use the following BBC tags: abbr, anchor, b, br, center, color, font, hr, i, img, iurl, left, li, list, ltr, pre, right, s, sub, sup, table, td, tr, u, url"
+          dd
+            textarea [cols="#" name="desc" rows="#"]
+          dt
+            strong
+              "Permission Profile"
+            br
+            span.smalltext
+              "Which"
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "permission set"
+              "the board should use."
+          dd
+            select [name="profile"]
+              option [selected value="#"]
+                "Default"
+              option [value="#"]
+                "No Polls"
+              option [value="#"]
+                "Read Only"
+              option [value="#"]
+                "Reply Only"
+              option [value="-#"]
+                "[Inherit from parent board]"
+          dt
+            strong
+              "Allowed Groups"
+            br
+            span.smalltext
+              "Groups allowed to access this board."
+              br
+              em
+                "Note: if the member is in any group or post group checked, they will have access to this board."
+          dd
+            label [for="groups_-#"]
+              input#groups_-# [checked name="groups[-#]" type="checkbox" value="allow"]
+              span
+                "Guests"
+            br
+            label [for="groups_#"]
+              input#groups_# [checked name="groups[#]" type="checkbox" value="allow"]
+              span.regular_members [title="This group contains all members that have no primary group set."]
+                "Regular Members"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span
+                "Global Moderator"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Newbie"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Jr. Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Full Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Sr. Member"
+            br
+            label [for="groups_#"]
+              input#groups_# [name="groups[#]" type="checkbox" value="allow"]
+              span.post_group [title="This group is a post count based group."]
+                "Hero Member"
+            br
+            span.select_all_box
+              em
+                "Select all"
+              input [onclick="invertAll(this, this.form, 'groups[');" type="checkbox"]
+            br
+          dt
+            strong
+              "Moderators"
+            br
+            span.smalltext
+              "Additional members to have moderation privileges on this board. Note that administrators do not have to be listed here."
+            br
+          dd
+            input#moderators [name="moderators" size="#" type="text" value]
+            div#moderator_container
+          dt
+            strong
+              "Moderator Groups"
+            br
+            span.smalltext
+              "Groups whose members have moderation privileges on this board. Note that this is limited to groups which are not post-based and not \"hidden\"."
+            br
+          dd
+            input#moderator_groups [name="moderator_groups" size="#" type="text" value]
+            div#moderator_group_container
+        script
+          | $(document).ready(function () { $(".select_all_box").each(function () { $(this).removeClass('select_all_box'); }); });
+        hr
+        dl.settings
+          dt
+            strong
+              "Redirect to a web address"
+            br
+            span.smalltext
+              "Enable this option to redirect anyone who clicks on this board to another web address."
+            br
+          dd
+            input#redirect_enable [name="redirect_enable" onclick="refreshOptions();" type="checkbox"]
+        div#redirect_address_div
+          dl.settings
+            dt
+              strong
+                "Address to redirect users to"
+              br
+              span.smalltext
+                "For example: \"https://www.simplemachines.org\"."
+              br
+            dd
+              input [name="redirect_address" size="#" type="text" value]
+        div#count_posts_div
+          dl.settings
+            dt
+              strong
+                "Count posts"
+              br
+              span.smalltext
+                "Makes new replies and topics raise members’ post counts."
+              br
+            dd
+              input [checked name="count" type="checkbox"]
+        div#board_theme_div
+          dl.settings
+            dt
+              strong
+                "Board Theme"
+              br
+              span.smalltext
+                "This allows you to change the look of your forum only inside this board."
+              br
+            dd
+              select#boardtheme [name="boardtheme" onchange="refreshOptions();"]
+                option [selected value="#"]
+                  "(overall forum default.)"
+                option [value="#"]
+                  "SMF Default Theme - Curve#"
+        div#override_theme_div
+          dl.settings
+            dt
+              strong
+                "Override Member’s Theme"
+              br
+              span.smalltext
+                "Use this board’s theme even if the member did not choose to use the defaults."
+              br
+            dd
+              input [name="override_theme" type="checkbox"]
+        input [name="rid" type="hidden" value="boards"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input [name="no_children" type="hidden" value="#"]
+        input [name="cur_cat" type="hidden" value="#"]
+        input.button [name="add" onclick="return !isEmptyText(this.form.board_name);" type="submit" value="Add Board"]
+  script
+    | var oModeratorSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'moderators', sControlId: 'moderators', sSearchType: 'member', bItemList: true, sPostName: 'moderator_list', sURLMask: 'action=profile;u=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'moderator_container', aListItems: [ ] }); var oModeratorGroupSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'moderator_groups', sControlId: 'moderator_groups', sSearchType: 'membergroups', bItemList: true, sPostName: 'moderator_group_list', sURLMask: 'action=groups;sa=members;group=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'moderator_group_container', aListItems: [ ] });
+  script
+    | function refreshOptions() { var redirect = document.getElementById("redirect_enable"); var redirectEnabled = redirect ? redirect.checked : false; var nonDefaultTheme = document.getElementById("boardtheme").value == # ? false : true; // What to show? if(redirectEnabled || !nonDefaultTheme) document.getElementById("override_theme_div").classList.add('hidden'); else document.getElementById("override_theme_div").classList.remove('hidden'); if(redirectEnabled) { document.getElementById("board_theme_div").classList.add('hidden'); document.getElementById("count_posts_div").classList.add('hidden'); } else { document.getElementById("board_theme_div").classList.remove('hidden'); document.getElementById("count_posts_div").classList.remove('hidden'); } if(redirectEnabled) document.getElementById("redirect_address_div").classList.remove('hidden'); else document.getElementById("redirect_address_div").classList.add('hidden'); } refreshOptions();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_category.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_category.txt
new file mode 100644
index 00000000000..83800551088
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_new_category.txt
@@ -0,0 +1,124 @@
+status 200
+@ title
+title
+  "New Category"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Create new category"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit your categories and boards here. List multiple moderators as"
+    em
+      "\"username\", \"username\""
+    ". (these must be usernames and *not* display names)"
+    br
+    "To create a new board, click the Add Board button. To make the new board a sub-board of a current board, select \"Sub-board of...\" from the Order drop down menu when creating the board."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#manage_boards
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;sa=cat#" method="post"]
+      input [name="cat" type="hidden" value="#"]
+      div.cat_bar
+        h3.catbg
+          "New Category"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Order"
+          dd
+            select [name="cat_order"]
+              option [value="#"]
+                "After Snapshot fixtures"
+          dt
+            strong
+              "Full name"
+            br
+            span.smalltext
+              "This is the name that will be displayed."
+          dd
+            input [name="cat_name" size="#" type="text" value="New Category"]
+          dt
+            strong
+              "Description"
+            br
+            span.smalltext
+              "A short description of your category. HTML is not allowed, you can use the following BBC tags: abbr, anchor, b, br, center, color, font, hr, i, img, iurl, left, li, list, ltr, pre, right, s, sub, sup, table, td, tr, u, url"
+          dd
+            textarea [cols="#" name="cat_desc" rows="#"]
+          dt
+            strong
+              "Collapsible"
+            br
+            span.smalltext
+              "Allow users to collapse this category"
+          dd
+            input [checked name="collapse" type="checkbox"]
+        input.button [name="add" onclick="return !isEmptyText(this.form.cat_name);" type="submit" value="Add Category"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input [name="empty" type="hidden" value="#"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_settings.txt
new file mode 100644
index 00000000000..133a7588d7f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_boards_settings.txt
@@ -0,0 +1,176 @@
+status 200
+@ title
+title
+  "Manage Boards and Categories - Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Boards and Categories"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Boards and Categories"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Edit general board and category settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Boards and Categories Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Boards and Categories Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=main;{session_var}={session_id}"]
+                "Modify Boards"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=newcat;{session_var}={session_id}"]
+                "Create new category"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=manageboards;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=manageboards;save;sa=settings" method="post" onsubmit="if(document.getElementById('recycle_enable').checked && document.getElementById('recycle_board').value == #) { return confirm('You have enabled the recycling of topics without specifying a board to place them in. This feature will not be enabled until you specify a board to place recycled topics into.');} return true;"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_manage_boards_help [href="{boardurl}/index.php?action=helpadmin;help=manage_boards" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_manage_boards
+          span
+            label
+              "Membergroups allowed to manage boards and categories"
+        dd
+          fieldset#manage_boards
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('manage_boards').style.display = 'none';document.getElementById('manage_boards_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="manage_boards[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="manage_boards[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'manage_boards[');" type="checkbox"]
+                span
+                  "Select all"
+          a#manage_boards_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('manage_boards').style.display = 'block'; document.getElementById('manage_boards_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("manage_boards").style.display = "none"; document.getElementById("manage_boards_groups_link").style.display = "";
+      hr
+      dl.settings
+        dt
+          a#setting_boardindex_max_depth_help [href="{boardurl}/index.php?action=helpadmin;help=boardindex_max_depth" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_boardindex_max_depth
+          span
+            label [for="boardindex_max_depth"]
+              "Maximum depth of sub-boards to check for new posts, etc."
+        dd
+          input#boardindex_max_depth [max="#" min="#" name="boardindex_max_depth" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_countChildPosts_help [href="{boardurl}/index.php?action=helpadmin;help=countChildPosts" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_countChildPosts
+          span
+            label [for="countChildPosts"]
+              "Count sub-board’s posts in parent’s totals"
+        dd
+          input#countChildPosts [name="countChildPosts" type="checkbox" value="#"]
+        dt
+          a#setting_recycle_enable_help [href="{boardurl}/index.php?action=helpadmin;help=recycle_enable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_recycle_enable
+          span
+            label [for="recycle_enable"]
+              "Enable recycling of deleted topics"
+        dd
+          input#recycle_enable [name="recycle_enable" onclick="document.getElementById('recycle_board').disabled = !this.checked;" type="checkbox" value="#"]
+        dt
+          a#setting_recycle_board
+          span
+            label [for="recycle_board"]
+              "Board for recycled topics"
+        dd
+          select#recycle_board [name="recycle_board" size="#"]
+            option [value="#"]
+              "Snapshot fixtures - Snapshot board"
+            option [value="#"]
+              "Snapshot fixtures - Snapshot child one"
+            option [value="#"]
+              "Snapshot fixtures - Snapshot child two"
+            option [value="#"]
+              "Snapshot fixtures - Snapshot empty board"
+        dt
+          a#setting_allow_ignore_boards_help [href="{boardurl}/index.php?action=helpadmin;help=allow_ignore_boards" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_allow_ignore_boards
+          span
+            label [for="allow_ignore_boards"]
+              "Allow boards to be ignored"
+        dd
+          input#allow_ignore_boards [name="allow_ignore_boards" type="checkbox" value="#"]
+        dt
+          a#setting_deny_boards_access_help [href="{boardurl}/index.php?action=helpadmin;help=deny_boards_access" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_deny_boards_access
+          span
+            label [for="deny_boards_access"]
+              "Enable the option to deny board access based on membergroup"
+        dd
+          input#deny_boards_access [name="deny_boards_access" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_calendar.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_calendar.txt
new file mode 100644
index 00000000000..df46479d5d1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_calendar.txt
@@ -0,0 +1,64 @@
+status 200
+@ title
+title
+  "Calendar Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managecalendar;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Calendar"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=calendar" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Calendar"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can enable the calendar, and determine the settings that it should use."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=managecalendar;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Calendar Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_cal_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=cal_enabled" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_cal_enabled
+          span
+            label [for="cal_enabled"]
+              "Enable the calendar"
+        dd
+          input#cal_enabled [name="cal_enabled" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_search.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search.txt
new file mode 100644
index 00000000000..0088155e44e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search.txt
@@ -0,0 +1,133 @@
+status 200
+@ title
+title
+  "Search - method"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=method;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search Method"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=search" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Search"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set the way search is powered."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Search Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Search Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=weights;{session_var}={session_id}"]
+                "Weights"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=managesearch;sa=method;{session_var}={session_id}"]
+                "Search Method"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Search Method"
+  div.information
+    div.smalltext
+      a [href="{boardurl}/index.php?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);"]
+        "Why create a search index?"
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=managesearch;sa=method" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Search Method"
+    div.windowbg
+      dl.settings
+        dt
+          strong
+            "Space used by forum messages in the database"
+        dd
+          "# KB(s)"
+        dt
+          strong
+            "Space used to index messages in the database"
+        dd
+          "# KB(s)"
+      fieldset.floatleft.search_settings
+        legend
+          "Search index"
+        dl
+          dt
+            label
+              input [checked name="search_index" type="radio" value]
+              "No index"
+          hr
+          dt
+            label
+              input [name="search_index" onclick="alert('In order to be able to use this search index, you must first create it.'); return false;" type="radio" value="parsed"]
+              "Parsed index"
+          dd
+            span.smalltext
+              "An optimized index tailored specifically for SMF."
+              br
+              "Parsed index does not currently exist"
+              a.button [href="{boardurl}/index.php?action=admin;area=managesearch;sa=createparsed;{session_var}={session_id};{token}"]
+                "Create"
+      fieldset.floatright.search_settings
+        legend
+          "Search Method"
+        input#search_force_index_check [name="search_force_index" type="checkbox" value="#"]
+        label [for="search_force_index_check"]
+          "Force the use of a search index"
+        br
+        input#search_match_words_check [name="search_match_words" type="checkbox" value="#"]
+        label [for="search_match_words_check"]
+          "Match whole words only"
+      br.clear
+      input.button [name="save" type="submit" value="Save"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_settings.txt
new file mode 100644
index 00000000000..704db0b346f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_settings.txt
@@ -0,0 +1,243 @@
+status 200
+@ title
+title
+  "Search Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=search" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Search"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can changes the basic settings of the search function."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Search Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Search Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=weights;{session_var}={session_id}"]
+                "Weights"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=method;{session_var}={session_id}"]
+                "Search Method"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=managesearch;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=managesearch;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Search Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_search_posts
+          span
+            label
+              "Membergroups with access to the search function"
+        dd
+          fieldset#search_posts
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('search_posts').style.display = 'none';document.getElementById('search_posts_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [checked name="search_posts[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [checked name="search_posts[-#]" type="checkbox" value="on"]
+                span
+                  "Guests"
+              li
+                input [checked name="search_posts[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'search_posts[');" type="checkbox"]
+                span
+                  "Select all"
+          a#search_posts_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('search_posts').style.display = 'block'; document.getElementById('search_posts_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("search_posts").style.display = "none"; document.getElementById("search_posts_groups_link").style.display = "";
+        dt
+          a#setting_search_results_per_page
+          span
+            label [for="search_results_per_page"]
+              "Number of search results per page"
+        dd
+          input#search_results_per_page [min="#" name="search_results_per_page" size="#" type="number" value="#"]
+        dt
+          a#setting_search_max_results
+          span
+            label [for="search_max_results"]
+              "Maximum results to show"
+            br
+            span.smalltext
+              "(#: no limit)"
+        dd
+          input#search_max_results [min="#" name="search_max_results" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_search_floodcontrol_time
+          span
+            label [for="search_floodcontrol_time"]
+              "Time required between searches from same user"
+            br
+            span.smalltext
+              "(# for(s) no limit, in seconds)"
+        dd
+          input#search_floodcontrol_time [min="#" name="search_floodcontrol_time" size="#" type="number" value="#"]
+          "seconds"
+      hr
+      dl.settings
+        dt
+          a#setting_search_stopwords_custom
+          span
+            label [for="search_stopwords_custom"]
+              "Words to ignore when searching"
+            br
+            span.smalltext
+              span.block.infobox
+                "The following words are always ignored:"
+                br
+                code.bbc_tt
+                  "a"
+                ","
+                code.bbc_tt
+                  "about"
+                ","
+                code.bbc_tt
+                  "an"
+                ","
+                code.bbc_tt
+                  "are"
+                ","
+                code.bbc_tt
+                  "as"
+                ","
+                code.bbc_tt
+                  "at"
+                ","
+                code.bbc_tt
+                  "be"
+                ","
+                code.bbc_tt
+                  "by"
+                ","
+                code.bbc_tt
+                  "for"
+                ","
+                code.bbc_tt
+                  "from"
+                ","
+                code.bbc_tt
+                  "how"
+                ","
+                code.bbc_tt
+                  "in"
+                ","
+                code.bbc_tt
+                  "is"
+                ","
+                code.bbc_tt
+                  "it"
+                ","
+                code.bbc_tt
+                  "of"
+                ","
+                code.bbc_tt
+                  "on"
+                ","
+                code.bbc_tt
+                  "or"
+                ","
+                code.bbc_tt
+                  "that"
+                ","
+                code.bbc_tt
+                  "the"
+                ","
+                code.bbc_tt
+                  "this"
+                ","
+                code.bbc_tt
+                  "to"
+                ","
+                code.bbc_tt
+                  "was"
+                ","
+                code.bbc_tt
+                  "what"
+                ","
+                code.bbc_tt
+                  "when"
+                ","
+                code.bbc_tt
+                  "where"
+                ","
+                code.bbc_tt
+                  "who"
+                ","
+                code.bbc_tt
+                  "will"
+                ","
+                code.bbc_tt
+                  "with"
+        dd
+          textarea#search_stopwords_custom [cols="#" name="search_stopwords_custom" rows="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_weights.txt b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_weights.txt
new file mode 100644
index 00000000000..4430ce24e5f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/manage_search_weights.txt
@@ -0,0 +1,155 @@
+status 200
+@ title
+title
+  "Search - weights"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=weights;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Weights"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=search" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Search"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can change the individual components of the relevance rating."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Search Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Search Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=managesearch;sa=weights;{session_var}={session_id}"]
+                "Weights"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=method;{session_var}={session_id}"]
+                "Search Method"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=managesearch;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=managesearch;sa=weights" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Weights"
+    div.windowbg
+      dl.settings
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_frequency" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for number of matching messages within a topic"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_frequency" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_age" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for age of last matching message"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_age" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_length" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for topic length"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_length" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_subject" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for a matching subject"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_subject" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_first_message" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for a first message match"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_first_message" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=search_weight_sticky" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          label [for="weight#_val"]
+            "Relative search weight for a sticky topic"
+        dd
+          span.search_weight
+            input#weight#_val [name="search_weight_sticky" onchange="calculateNewValues()" size="#" type="text" value="#"]
+          span#weight#.search_weight
+            "#%"
+        dt
+          strong
+            "Total"
+        dd
+          span#weighttotal.search_weight
+            strong
+              "#"
+          span.search_weight
+            strong
+              "#%"
+      input.button [name="save" type="submit" value="Save"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/membergroups.txt b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups.txt
new file mode 100644
index 00000000000..04528ccf524
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups.txt
@@ -0,0 +1,233 @@
+status 200
+@ title
+title
+  "Manage Membergroups"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroups"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Edit membergroups"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroups" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Membergroups"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Membergroups are groups of members that have similar permission settings, appearance, or access rights. Some membergroups are based on the amount of posts a user has made. You can assign someone to a membergroup by selecting their profile and changing their account settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Membergroups Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Membergroups Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                "Edit membergroups"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                "Add membergroup"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Regular groups"
+  div.additional_row
+    a.button [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;generalgroup"]
+      "Add group"
+  table#regular_membergroups_list.table_grid
+    thead
+      tr.title_bar
+        th#header_regular_membergroups_list_name.name [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort=name;desc" rel="nofollow"]
+            "Name"
+            span.main_icons.sort_up
+        th#header_regular_membergroups_list_icons.icons [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort=icons" rel="nofollow"]
+            "Icons"
+        th#header_regular_membergroups_list_members.centercol.members [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort=members" rel="nofollow"]
+            "Members"
+        th#header_regular_membergroups_list_modify.centercol.modify [scope="col"]
+          "Modify"
+    tbody
+      tr#list_regular_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=members;group=#" style="color: #FF#;"]
+            "Administrator"
+          "("
+          a [href="{boardurl}/index.php?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"]
+            "?"
+          ")"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+        td.centercol.members
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_regular_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=members;group=#" style="color: ##FF;"]
+            "Global Moderator"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icongmod.png"]
+        td.centercol.members
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_regular_membergroups_list_#.windowbg
+        td.name
+          "Moderator ("
+          a [href="{boardurl}/index.php?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);"]
+            "?"
+          ")"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconmod.png"]
+        td.centercol.members
+          "n/a"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+  div.flow_auto
+    div.additional_row
+      a.button [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;generalgroup"]
+        "Add group"
+  br
+  div.cat_bar
+    h3.catbg
+      "Post count based groups"
+  table#post_count_membergroups_list.table_grid
+    thead
+      tr.title_bar
+        th#header_post_count_membergroups_list_name.name [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort#=name" rel="nofollow"]
+            "Name"
+        th#header_post_count_membergroups_list_icons.icons [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort#=icons" rel="nofollow"]
+            "Icons"
+        th#header_post_count_membergroups_list_members.centercol.members [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort#=members" rel="nofollow"]
+            "Members"
+        th#header_post_count_membergroups_list_required_posts.centercol.required_posts [scope="col"]
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sort#=required_posts;desc#" rel="nofollow"]
+            "Required posts"
+            span.main_icons.sort_up
+        th#header_post_count_membergroups_list_modify.centercol.modify [scope="col"]
+          "Modify"
+    tbody
+      tr#list_post_count_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+            "Newbie"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+        td.centercol.members
+          "#"
+        td.centercol.required_posts
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_post_count_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+            "Jr. Member"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+        td.centercol.members
+          "#"
+        td.centercol.required_posts
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_post_count_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+            "Full Member"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+        td.centercol.members
+          "#"
+        td.centercol.required_posts
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_post_count_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+            "Sr. Member"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+        td.centercol.members
+          "#"
+        td.centercol.required_posts
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+      tr#list_post_count_membergroups_list_#.windowbg
+        td.name
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+            "Hero Member"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+        td.centercol.members
+          "#"
+        td.centercol.required_posts
+          "#"
+        td.centercol.modify
+          a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#"]
+            "Modify"
+  div.flow_auto
+    div.additional_row
+      a.button [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;postgroup"]
+        "Add group"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add.txt b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add.txt
new file mode 100644
index 00000000000..2bbafffe66c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add.txt
@@ -0,0 +1,171 @@
+status 200
+@ title
+title
+  "Add membergroup"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroups"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Add membergroup"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroups" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Membergroups"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Membergroups are groups of members that have similar permission settings, appearance, or access rights. Some membergroups are based on the amount of posts a user has made. You can assign someone to a membergroup by selecting their profile and changing their account settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Membergroups Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Membergroups Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                "Edit membergroups"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                "Add membergroup"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#new_group [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=membergroups;sa=add" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Add membergroup"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="group_name_input"]
+            strong
+              "Membergroup name"
+        dd
+          input#group_name_input [name="group_name" size="#" type="text"]
+        dt
+          label [for="permission_base"]
+            strong
+              "Permissions"
+          br
+          span.smalltext
+            "You can edit them later."
+        dd
+          fieldset#permission_base
+            legend
+              "Select permission profile"
+            input#perm_type_inherit [checked name="perm_type" type="radio" value="inherit"]
+            label [for="perm_type_inherit"]
+              "inherit from"
+            select#inheritperm_select [name="inheritperm" onclick="document.getElementById('perm_type_inherit').checked = true;"]
+              option [value="-#"]
+                "Guests"
+              option [selected value="#"]
+                "Regular Members"
+              option [value="#"]
+                "Global Moderator"
+            br
+            input#perm_type_copy [name="perm_type" type="radio" value="copy"]
+            label [for="perm_type_copy"]
+              "based off of"
+            select#copyperm_select [name="copyperm" onclick="document.getElementById('perm_type_copy').checked = true;"]
+              option [value="-#"]
+                "Guests"
+              option [selected value="#"]
+                "Regular Members"
+              option [value="#"]
+                "Global Moderator"
+            br
+            input#perm_type_predefined [name="perm_type" type="radio" value="predefined"]
+            label [for="perm_type_predefined"]
+              "by type"
+            select#level_select [name="level" onclick="document.getElementById('perm_type_predefined').checked = true;"]
+              option [value="restrict"]
+                "Restrictive"
+              option [selected value="standard"]
+                "Standard"
+              option [value="moderator"]
+                "Moderator"
+              option [value="maintenance"]
+                "Maintenance"
+        dt
+          strong
+            "Visible Boards"
+        dd
+          fieldset#visible_boards
+            legend
+              "Boards the membergroup can see"
+            ul.floatleft.padding
+              li.category
+                a [href="javascript:void(#);" onclick="selectBoards([#, #, #, #], 'new_group'); return false;"]
+                  strong
+                    "Snapshot fixtures"
+                ul
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot board"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child one"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child two"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot empty board"
+            br.clear
+            br
+            input#checkall_check [onclick="invertAll(this, this.form, 'boardaccess');" type="checkbox"]
+            label [for="checkall_check"]
+              em
+                "Select all"
+      input.button [type="submit" value="Add group"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add_post_group.txt b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add_post_group.txt
new file mode 100644
index 00000000000..aecd073c9f9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_add_post_group.txt
@@ -0,0 +1,136 @@
+status 200
+@ title
+title
+  "Add membergroup"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroups"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Add membergroup"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroups" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Membergroups"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Membergroups are groups of members that have similar permission settings, appearance, or access rights. Some membergroups are based on the amount of posts a user has made. You can assign someone to a membergroup by selecting their profile and changing their account settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Membergroups Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Membergroups Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                "Edit membergroups"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                "Add membergroup"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#new_group [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=membergroups;sa=add" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Add membergroup"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="group_name_input"]
+            strong
+              "Membergroup name"
+        dd
+          input#group_name_input [name="group_name" size="#" type="text"]
+        dt#min_posts_text
+          label [for="min_posts_input"]
+            strong
+              "Required posts"
+        dd
+          input#min_posts_input [name="min_posts" size="#" type="number"]
+        dt
+          strong
+            "Visible Boards"
+          br
+          span.smalltext
+            em
+              "Note: normally, post groups do not need access because the group the member is in will give them access."
+        dd
+          fieldset#visible_boards
+            legend
+              "Boards the membergroup can see"
+            ul.floatleft.padding
+              li.category
+                a [href="javascript:void(#);" onclick="selectBoards([#, #, #, #], 'new_group'); return false;"]
+                  strong
+                    "Snapshot fixtures"
+                ul
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot board"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child one"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child two"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot empty board"
+            br.clear
+            br
+            input#checkall_check [onclick="invertAll(this, this.form, 'boardaccess');" type="checkbox"]
+            label [for="checkall_check"]
+              em
+                "Select all"
+      input.button [type="submit" value="Add group"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_edit.txt
new file mode 100644
index 00000000000..1dc608a28a0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_edit.txt
@@ -0,0 +1,250 @@
+status 200
+@ title
+title
+  "Edit Membergroup Global Moderator"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroups"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Edit membergroups"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroups" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Membergroups"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Membergroups are groups of members that have similar permission settings, appearance, or access rights. Some membergroups are based on the amount of posts a user has made. You can assign someone to a membergroup by selecting their profile and changing their account settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Membergroups Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Membergroups Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                "Edit membergroups"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                "Add membergroup"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#groupForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=membergroups;sa=edit;group=#" method="post" name="groupForm"]
+    div.cat_bar
+      h3.catbg
+        "Edit Membergroup Global Moderator"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="group_name_input"]
+            strong
+              "Group name"
+        dd
+          input#group_name_input [name="group_name" size="#" type="text" value="Global Moderator"]
+        dt#group_desc_text
+          label [for="group_desc_input"]
+            strong
+              "Group description"
+        dd
+          textarea#group_desc_input [cols="#" name="group_desc" rows="#"]
+        dt
+          label [for="group_type"]
+            strong
+              "Group type"
+        dd
+          fieldset#group_type
+            legend
+              "Select Group type"
+            label [for="group_type_private"]
+              input#group_type_private [checked name="group_type" type="radio" value="#"]
+              "Private"
+              span.smalltext
+                "(Membership must be assigned)"
+            br
+            label [for="group_type_protected"]
+              input#group_type_protected [name="group_type" type="radio" value="#"]
+              "Protected"
+              span.smalltext
+                "(Only administrators can manage and assign)"
+            br
+            label [for="group_type_request"]
+              input#group_type_request [name="group_type" type="radio" value="#"]
+              "Requestable"
+              span.smalltext
+                "(User may request membership)"
+            br
+            label [for="group_type_free"]
+              input#group_type_free [name="group_type" type="radio" value="#"]
+              "Free"
+              span.smalltext
+                "(User may leave and join group at will)"
+            br
+        dt#group_moderators_text
+          label [for="group_moderators"]
+            strong
+              "Moderators"
+        dd
+          input#group_moderators [name="group_moderators" size="#" type="text" value]
+          div#moderator_container
+        dt#group_hidden_text
+          label [for="group_hidden_input"]
+            strong
+              "Visibility"
+        dd
+          select#group_hidden_input [name="group_hidden" onchange="if (this.value == # && !confirm('Are you sure you want to disallow assignment of this group as a users primary group?\\n\\nDoing so will restrict assignment to additional groups only, and will update all current \"primary\" members to have it as an additional group only.\\n\\nIt will also remove the group as moderator from any boards it is currently assigned to moderate.')) this.value = #;"]
+            option [selected value="#"]
+              "Visible"
+            option [value="#"]
+              "Visible - Apart from in group key"
+            option [value="#"]
+              "Invisible"
+        dt#group_inherit_text
+          label [for="group_inherit_input"]
+            strong
+              "Inherit permissions"
+          br
+          span.smalltext
+            "Select \"No\" to enable group to have own permission set."
+        dd
+          select#group_inherit_input [name="group_inherit"]
+            option [value="-#"]
+              "No - Use unique permissions"
+            option [value="-#"]
+              "Inherit from Guests"
+            option [value="#"]
+              "Inherit from Regular Members"
+          input [name="old_inherit" type="hidden" value="-#"]
+        dt
+          label [for="online_color_input"]
+            strong
+              "Color in online list"
+        dd
+          input#online_color_input [name="online_color" size="#" type="text" value="##FF"]
+        dt
+          label [for="icon_count_input"]
+            strong
+              "Number of icon images"
+        dd
+          input#icon_count_input [name="icon_count" size="#" type="number" value="#"]
+        dt
+          label [for="icon_image_input"]
+            strong
+              "Icon image filename"
+          br
+          span.smalltext
+            "You can upload custom images to the forum’s default theme directory to be able to select them here. Different images can be used in different themes, just give them the same name."
+          span.smalltext
+            "Max size allowed #x#px"
+        dd
+          "Themes/default/images/membericons/"
+          select#icon_image_input [name="icon_image"]
+            option [value="blank.png"]
+              "blank.png"
+            option [value="icon.png"]
+              "icon.png"
+            option [value="iconadmin.png"]
+              "iconadmin.png"
+            option [selected value="icongmod.png"]
+              "icongmod.png"
+            option [value="iconmod.png"]
+              "iconmod.png"
+          img#icon_preview [alt="*" src]
+        dt
+          label [for="max_messages_input"]
+            strong
+              "Max personal messages"
+          br
+          span.smalltext
+            "# = unlimited"
+        dd
+          input#max_messages_input [name="max_messages" size="#" type="text" value="#"]
+        dt
+          strong
+            "Visible Boards"
+        dd
+          fieldset#visible_boards
+            legend
+              "Boards the membergroup can see"
+            ul.floatleft.padding
+              li.category
+                a [href="javascript:void(#);" onclick="selectBoards([#, #, #, #], 'groupForm'); return false;"]
+                  strong
+                    "Snapshot fixtures"
+                ul
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot board"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child one"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot child two"
+                  li.board [style="margin-inline-start: #em;"]
+                    input#brd# [name="boardaccess[#]" type="checkbox" value="allow"]
+                    label [for="brd#"]
+                      "Snapshot empty board"
+            br.clear
+            br
+            input#checkall_check [onclick="invertAll(this, this.form, 'boardaccess');" type="checkbox"]
+            label [for="checkall_check"]
+              em
+                "Select all"
+          a#visible_boards_link.hidden [href="javascript:void(#);" onclick="document.getElementById('visible_boards').classList.remove('hidden'); document.getElementById('visible_boards_link').classList.add('hidden'); return false;"]
+            "[ Show boards ]"
+          script
+            | document.getElementById("visible_boards_link").classList.remove('hidden'); document.getElementById("visible_boards").classList.add('hidden');
+      input.button [name="save" type="submit" value="Save"]
+      input.button.you_sure [data-confirm="Are you sure you want to delete this group?" name="delete" type="submit" value="Delete"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+  script
+    | var oModeratorSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'group_moderators', sControlId: 'group_moderators', sSearchType: 'member', bItemList: true, sPostName: 'moderator_list', sURLMask: 'action=profile;u=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'moderator_container', aListItems: [ ] });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_settings.txt
new file mode 100644
index 00000000000..4c79405494a
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/membergroups_settings.txt
@@ -0,0 +1,112 @@
+status 200
+@ title
+title
+  "Membergroup Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroups"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroups" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Membergroups"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Membergroups are groups of members that have similar permission settings, appearance, or access rights. Some membergroups are based on the amount of posts a user has made. You can assign someone to a membergroup by selecting their profile and changing their account settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Membergroups Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Membergroups Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=index;{session_var}={session_id}"]
+                "Edit membergroups"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=membergroups;sa=add;{session_var}={session_id}"]
+                "Add membergroup"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=membergroups;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=membergroups;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Membergroup Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_manage_membergroups
+          span
+            label
+              "Groups allowed to manage and assign membergroups"
+        dd
+          fieldset#manage_membergroups
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('manage_membergroups').style.display = 'none';document.getElementById('manage_membergroups_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="manage_membergroups[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="manage_membergroups[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'manage_membergroups[');" type="checkbox"]
+                span
+                  "Select all"
+          a#manage_membergroups_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('manage_membergroups').style.display = 'block'; document.getElementById('manage_membergroups_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("manage_membergroups").style.display = "none"; document.getElementById("manage_membergroups_groups_link").style.display = "";
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/members.txt b/tests/Integration/Http/Snapshot/snapshots/admin/members.txt
new file mode 100644
index 00000000000..3d68728e2fd
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/members.txt
@@ -0,0 +1,110 @@
+status 200
+@ title
+title
+  "Manage Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=all;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "View all Members"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=view_members" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Members"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Below is a listing of all the members currently registered with your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=all;{session_var}={session_id}"]
+                "View all Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=search;{session_var}={session_id}"]
+                "Search for Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=viewmembers" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Members List"
+    table#member_list.table_grid
+      thead
+        tr.title_bar
+          th#header_member_list_id_member.id_member [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=id_member" rel="nofollow"]
+              "ID"
+          th#header_member_list_user_name.user_name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=user_name;desc" rel="nofollow"]
+              "Username"
+              span.main_icons.sort_up
+          th#header_member_list_display_name.display_name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=display_name" rel="nofollow"]
+              "Display name"
+          th#header_member_list_email.email [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=email" rel="nofollow"]
+              "Email address"
+          th#header_member_list_ip.ip [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=ip" rel="nofollow"]
+              "IP address"
+          th#header_member_list_last_active.last_active [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=last_active" rel="nofollow"]
+              "Last Online"
+          th#header_member_list_posts.posts [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=viewmembers;sort=posts" rel="nofollow"]
+              "Posts"
+          th#header_member_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      snapshot-ignored [selector="table.table_grid tbody"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="user_name"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/members_search.txt b/tests/Integration/Http/Snapshot/snapshots/admin/members_search.txt
new file mode 100644
index 00000000000..eed30376675
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/members_search.txt
@@ -0,0 +1,286 @@
+status 200
+@ title
+title
+  "Manage Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=search;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search for Members"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=view_members" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Members"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Below is a listing of all the members currently registered with your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=all;{session_var}={session_id}"]
+                "View all Members"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=search;{session_var}={session_id}"]
+                "Search for Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=viewmembers" method="post"]
+    input [name="sa" type="hidden" value="query"]
+    div.cat_bar
+      h3.catbg
+        span.floatleft
+          "Search for"
+        span.floatright.smalltext
+          "wildcard characters * and ? are allowed"
+    div.windowbg
+      div.flow_hidden
+        div.floatleft.msearch_details
+          dl.right.settings
+            dt.righttext
+              strong
+                label [for="mem_id"]
+                  "ID"
+              select [name="types[mem_id]"]
+                option [value="--"]
+                  "<"
+                option [value="-"]
+                  "<="
+                option [selected value="="]
+                  "="
+                option [value="+"]
+                  ">="
+                option [value="++"]
+                  ">"
+            dd
+              input#mem_id [name="mem_id" size="#" type="number" value]
+            dt.righttext
+              strong
+                label [for="age"]
+                  "User age"
+              select [name="types[age]"]
+                option [value="--"]
+                  "<"
+                option [value="-"]
+                  "<="
+                option [selected value="="]
+                  "="
+                option [value="+"]
+                  ">="
+                option [value="++"]
+                  ">"
+            dd
+              input#age [name="age" size="#" type="number" value]
+            dt.righttext
+              strong
+                label [for="posts"]
+                  "Posts"
+              select [name="types[posts]"]
+                option [value="--"]
+                  "<"
+                option [value="-"]
+                  "<="
+                option [selected value="="]
+                  "="
+                option [value="+"]
+                  ">="
+                option [value="++"]
+                  ">"
+            dd
+              input#posts [name="posts" size="#" type="number" value]
+            dt.righttext
+              strong
+                label [for="reg_date"]
+                  "Date registered"
+              select [name="types[reg_date]"]
+                option [value="--"]
+                  "<"
+                option [value="-"]
+                  "<="
+                option [selected value="="]
+                  "="
+                option [value="+"]
+                  ">="
+                option [value="++"]
+                  ">"
+            dd
+              input#reg_date [name="reg_date" size="#" type="date" value]
+              span.smalltext
+            dt.righttext
+              strong
+                label [for="last_online"]
+                  "Last Online"
+              select [name="types[last_online]"]
+                option [value="--"]
+                  "<"
+                option [value="-"]
+                  "<="
+                option [selected value="="]
+                  "="
+                option [value="+"]
+                  ">="
+                option [value="++"]
+                  ">"
+            dd
+              input#last_online [name="last_online" size="#" type="date" value]
+              span.smalltext
+        div.floatright.msearch_details
+          dl.right.settings
+            dt.righttext
+              strong
+                label [for="membername"]
+                  "Username"
+            dd
+              input#membername [name="membername" type="text" value]
+            dt.righttext
+              strong
+                label [for="email"]
+                  "Email address"
+            dd
+              input#email [name="email" type="email" value]
+            dt.righttext
+              strong
+                label [for="website"]
+                  "Website"
+            dd
+              input#website [name="website" type="url" value]
+            dt.righttext
+              strong
+                label [for="ip"]
+                  "IP address"
+            dd
+              input#ip [name="ip" type="text" value]
+        div.floatright.msearch_details
+          fieldset
+            legend
+              "Activation Status"
+            label [for="activated-#"]
+              input#activated-# [checked name="activated[]" type="checkbox" value="#"]
+              "Activated"
+            label [for="activated-#"]
+              input#activated-# [checked name="activated[]" type="checkbox" value="#"]
+              "Not activated"
+    div.cat_bar
+      h3.catbg
+        "Member is part of these membergroups"
+    table.table_grid
+      thead
+        tr.title_bar
+          th [scope="col"]
+            "Membergroups"
+          th.centercol.quarter_table [scope="col"]
+            "Primary"
+          th.centercol.quarter_table [scope="col"]
+            "Additional"
+      tbody
+        tr.windowbg
+          td
+            "Regular Members"
+          td.centercol
+            input [checked name="membergroups[#][]" type="checkbox" value="#"]
+          td.centercol
+        tr.windowbg
+          td
+            "Administrator"
+          td.centercol
+            input [checked name="membergroups[#][]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            "Global Moderator"
+          td.centercol
+            input [checked name="membergroups[#][]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            em
+              "Select all"
+          td.centercol
+            input [checked onclick="invertAll(this, this.form, 'membergroups[#]');" type="checkbox"]
+    table.table_grid
+      thead
+        tr.title_bar
+          th [scope="col"]
+            "Post groups"
+          th.quarter_table
+      tbody
+        tr.windowbg
+          td
+            "Newbie"
+          td.centercol
+            input [checked name="postgroups[]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            "Jr. Member"
+          td.centercol
+            input [checked name="postgroups[]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            "Full Member"
+          td.centercol
+            input [checked name="postgroups[]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            "Sr. Member"
+          td.centercol
+            input [checked name="postgroups[]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            "Hero Member"
+          td.centercol
+            input [checked name="postgroups[]" type="checkbox" value="#"]
+        tr.windowbg
+          td
+            em
+              "Select all"
+          td.centercol
+            input [checked onclick="invertAll(this, this.form, 'postgroups[]');" type="checkbox"]
+    br
+    input.button [type="submit" value="Search"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/members_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/members_settings.txt
new file mode 100644
index 00000000000..5b6d40b8464
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/members_settings.txt
@@ -0,0 +1,97 @@
+status 200
+@ title
+title
+  "Manage Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=view_members" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Members"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Below is a listing of all the members currently registered with your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=all;{session_var}={session_id}"]
+                "View all Members"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=search;{session_var}={session_id}"]
+                "Search for Members"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=viewmembers;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=viewmembers;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_always_anonymize_deleted_accounts_help [href="{boardurl}/index.php?action=helpadmin;help=always_anonymize_deleted_accounts" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_always_anonymize_deleted_accounts
+          span
+            label [for="always_anonymize_deleted_accounts"]
+              "Always anonymize personally identifying information when deleting an account"
+            br
+            span.smalltext
+              "Anonymization will still be available on a case-by-case basis when this setting is disabled."
+        dd
+          input#always_anonymize_deleted_accounts [name="always_anonymize_deleted_accounts" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/merge_topic.txt b/tests/Integration/Http/Snapshot/snapshots/admin/merge_topic.txt
new file mode 100644
index 00000000000..91caaf8f4e7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/merge_topic.txt
@@ -0,0 +1,100 @@
+status 200
+@ title
+title
+  "Merge Topics"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#merge_topics
+      div.cat_bar
+        h3.catbg
+          "Merge Topics"
+      div.information
+        "This function will merge the messages of two topics into one topic. The messages will be sorted according to the time of posting. Therefore, the earliest posted message will be the first message of the merged topic."
+      div.windowbg
+        dl.merge_topic.settings
+          dt
+            strong
+              "Topic to be merged"
+          dd
+            "Snapshot second topic"
+      br
+      div.cat_bar
+        h3.catbg
+          "Target topic"
+      div.title_bar
+        h4.titlebg
+          form#mergeSelectBoard [accept-charset="UTF-#" action="{boardurl}/index.php?action=mergetopics;from=#;targetboard=#;board=#" method="post"]
+            "Select target from the list below (Board:"
+            select [name="targetboard" onchange="this.form.submit();"]
+              optgroup [label="Snapshot fixtures"]
+                option [selected value="#"]
+                  "{board}"
+                option [value="#"]
+                  "=> Snapshot child one"
+                option [value="#"]
+                  "=> Snapshot child two"
+                option [value="#"]
+                  "Snapshot empty board"
+            ")"
+            input [name="from" type="hidden" value="#"]
+            input.button [type="submit" value="Go"]
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=mergetopics;sa=options" method="post"]
+        div.pagesection
+          div.pagelinks
+            span.pages
+              "Pages"
+            span.current_page
+              "#"
+        div.windowbg
+          ul.merge_topics
+            li
+              a [href="{boardurl}/index.php?action=mergetopics;sa=options;board=#;from=#;to=#;{session_var}={session_id}"]
+                span.main_icons.merge
+              a [href="{boardurl}/index.php?topic=#" rel="noopener" target="_blank"]
+                "{subject}"
+              "Started by"
+              a [href="{boardurl}/index.php?action=profile;u=#" rel="noopener" target="_blank"]
+                "{member}"
+        div.pagesection
+          div.pagelinks
+            span.pages
+              "Pages"
+            span.current_page
+              "#"
+        br
+        div.title_bar
+          h4.titlebg
+            "Select target by topic ID"
+        div.windowbg
+          dl.merge_topic.settings
+            dt
+              strong
+                "ID of target topic"
+            dd
+              input [name="topics[]" type="hidden" value="#"]
+              input [name="topics[]" type="text"]
+              input [name="{session_var}" type="hidden" value="{session_id}"]
+          input.button [type="submit" value="Merge Topics"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/message_index.txt b/tests/Integration/Http/Snapshot/snapshots/admin/message_index.txt
new file mode 100644
index 00000000000..9c6d752778d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/message_index.txt
@@ -0,0 +1,370 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "Topics, replies and a poll for the snapshot tests."
+    div#board_#_childboards.boardindex_table.main_container
+      div.cat_bar
+        h3.catbg
+          "Sub-Boards"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The first child board."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+          p
+            strong
+              "Last post:"
+            "{date}"
+            span.postby
+              a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+                "{subject}"
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                "{member}"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The second child board, which stays empty."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#messageindex
+      div#topic_header.title_bar
+        div.board_icon
+        div.info
+          a [href="{boardurl}/index.php?board=#;sort=subject"]
+            "Subject"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=starter"]
+            "Started by"
+        div.board_stats.centertext
+          a [href="{boardurl}/index.php?board=#;sort=replies"]
+            "Replies"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=views"]
+            "Views"
+        div.lastpost
+          a [href="{boardurl}/index.php?board=#;asc"]
+            "Last post"
+            span.main_icons.sort_down
+      div#topic_container
+        div.locked.sticky.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+                span.lock.main_icons
+                span.main_icons.sticky
+                span.main_icons.poll
+              div.message_index_title
+                span.bold_text.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=#.msg##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.profile_sm
+          "Topic you have posted in"
+          br
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+            "New Topic"
+          a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+            "New poll"
+          a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+            "Mark Read"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts for new topics"
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this board."
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this board."
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_group_requests.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_group_requests.txt
new file mode 100644
index 00000000000..63fd6be896b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_group_requests.txt
@@ -0,0 +1,69 @@
+status 200
+@ title
+title
+  "Membergroup Requests"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=groups" itemprop="item"]
+        span [itemprop="name"]
+          "Membergroup Requests"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Membergroup Requests"
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=groups;sa=requests" method="post"]
+    table#group_request_list.table_grid [style="width:#%"]
+      thead
+        tr.title_bar
+          th#header_group_request_list_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=groups;sa=requests;sort=member;desc" rel="nofollow"]
+              "Member"
+              span.main_icons.sort_up
+          th#header_group_request_list_group.group [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=groups;sa=requests;sort=group" rel="nofollow"]
+              "Membergroups"
+          th#header_group_request_list_reason.reason [scope="col"]
+            "Reason"
+          th#header_group_request_list_date.date [scope="col" style="width: #%; white-space:nowrap;"]
+            "Date"
+          th#header_group_request_list_action.action.centercol [scope="col" style="width: #%;"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are currently no outstanding membergroup requests."
+    div.additional_row.floatright
+      select#req_action [name="req_action" onchange="if (this.value != # && (this.value == 'reason' || confirm('Are you sure you wish to do this?'))) this.form.submit();"]
+        option [value="#"]
+          "With selected:"
+        option [disabled value="#"]
+          "---------------------"
+        option [value="approve"]
+          "Approve request"
+        option [value="reject"]
+          "Reject request (No Reason)"
+        option [value="reason"]
+          "Reject request with reason"
+      input.button [name="go" onclick="var sel = document.getElementById('req_action'); if (sel.value != # && sel.value != 'reason' && !confirm('Are you sure you wish to do this?')) return false;" type="submit" value="Go"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="sort" type="hidden" value="member"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_index.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_index.txt
new file mode 100644
index 00000000000..1c2c071b0ca
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_index.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Moderation Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Moderation Center"
+  p.information
+    strong
+      "Hello, admin."
+    br
+    "This is your \"Moderation Center\". From here you can perform all the moderation actions assigned to yourself by the Administrator. This home page contains a summary of all the latest happenings in your community."
+  div#modnotes
+    form [action="{boardurl}/index.php?action=moderate;area=index;modnote" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Moderator Notes"
+      div.windowbg
+        div.floatleft.post_note
+          input [name="new_note" placeholder="Add a new note" type="text"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="makenote" type="submit" value="Add"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+  div#modcenter
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#group_requests_link [href="{boardurl}/index.php?action=groups;sa=requests"]
+            "Membergroup Requests"
+        span#group_requests_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#group_requests_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no open requests for group membership."
+      script
+        | var oGroupRequestsPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'group_requests_panel' ], aSwapImages: [ { sId: 'group_requests_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'group_requests_link', msgExpanded: 'Membergroup Requests', msgCollapsed: 'Membergroup Requests' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcgr' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_posts_link [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+            "Recent Topic Reports"
+        span#reported_posts_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_posts_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no outstanding reports."
+      script
+        | var oReportedPostsToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_posts_panel' ], aSwapImages: [ { sId: 'reported_posts_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_posts_link', msgExpanded: 'Recent Topic Reports', msgCollapsed: 'Recent Topic Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcrp' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#watched_users_link [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+            "Recent Watched Members"
+        span#watched_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#watched_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are not currently any watches in place."
+      script
+        | var oWatchedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'watched_users_panel' ], aSwapImages: [ { sId: 'watched_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'watched_users_link', msgExpanded: 'Recent Watched Members', msgCollapsed: 'Recent Watched Members' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcwu' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_users_link [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+            "Recent Profile Reports"
+        span#reported_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no pending profile reports."
+      script
+        | var oReportedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_users_panel' ], aSwapImages: [ { sId: 'reported_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_users_link', msgExpanded: 'Recent Profile Reports', msgCollapsed: 'Recent Profile Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcur' } });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_modlog.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_modlog.txt
new file mode 100644
index 00000000000..a211665b211
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_modlog.txt
@@ -0,0 +1,73 @@
+status 200
+@ title
+title
+  "Moderation Log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=modlog" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=modlog" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Moderation Log"
+  p.information
+    "Below is a list of all the moderation actions that have been carried out by moderators of the forum."
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=modlog" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Moderation Log"
+    div.flow_hidden.information
+      div.additional_row
+        "Quick Search (By Member)"
+        input [name="search" size="#" type="text" value]
+        input.button [name="is_search" style="float:none" type="submit" value="Go"]
+        input.button.you_sure [data-confirm="Are you sure you want to delete the selected log entries?" name="remove" type="submit" value="Delete selected"]
+        input.button.you_sure [data-confirm="Are you sure you want to completely clear the log?" name="removeall" type="submit" value="Clear Log"]
+    table#moderation_log_list.table_grid [style="width:#%"]
+      thead
+        tr.title_bar
+          th#header_moderation_log_list_action.action.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=modlog;sort=action" rel="nofollow"]
+              "Action"
+          th#header_moderation_log_list_time.lefttext.time [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=modlog;sort=time;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+          th#header_moderation_log_list_moderator.lefttext.moderator [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=modlog;sort=moderator" rel="nofollow"]
+              "Member"
+          th#header_moderation_log_list_position.lefttext.position [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=modlog;sort=position" rel="nofollow"]
+              "Position"
+          th#header_moderation_log_list_ip.ip.lefttext [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=modlog;sort=ip" rel="nofollow"]
+              "IP"
+          th#header_moderation_log_list_delete.centercol.delete [scope="col"]
+            input [name="all" onclick="invertAll(this, this.form);" type="checkbox"]
+      snapshot-ignored [selector="table.table_grid tbody"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="params" type="hidden" value]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="sort" type="hidden" value="time"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members.txt
new file mode 100644
index 00000000000..f60add22e1b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members.txt
@@ -0,0 +1,81 @@
+status 200
+@ title
+title
+  "Reported Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedmembers" itemprop="item"]
+        span [itemprop="name"]
+          "Reported Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=open" itemprop="item"]
+        span [itemprop="name"]
+          "Active Reports"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Reported Members"
+  p.information
+    "Allows you to view a list of all users whose profiles have been reported"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Reported Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Reported Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=open"]
+                "Active Reports"
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=closed"]
+                "Old Reports"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#reported_members [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=show;start=#" method="post"]
+    div.cat_bar.cat_bar_round
+      h3.catbg
+        "Active Reports"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.centertext
+        "No Reports Found"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members_closed.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members_closed.txt
new file mode 100644
index 00000000000..886002dd6fe
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_members_closed.txt
@@ -0,0 +1,81 @@
+status 200
+@ title
+title
+  "Reported Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedmembers" itemprop="item"]
+        span [itemprop="name"]
+          "Reported Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=closed" itemprop="item"]
+        span [itemprop="name"]
+          "Old Reports"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Reported Members"
+  p.information
+    "Allows you to view a list of all users whose profiles have been reported"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Reported Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Reported Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=open"]
+                "Active Reports"
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=closed"]
+                "Old Reports"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#reported_members [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=show;closed;start=#" method="post"]
+    div.cat_bar.cat_bar_round
+      h3.catbg
+        "Old Reports"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.centertext
+        "No Reports Found"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts.txt
new file mode 100644
index 00000000000..df886ceb06d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts.txt
@@ -0,0 +1,80 @@
+status 200
+@ title
+title
+  "Reported Posts"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedposts" itemprop="item"]
+        span [itemprop="name"]
+          "Reported Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show" itemprop="item"]
+        span [itemprop="name"]
+          "Active Reports"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Reported Posts"
+  p.information
+    "Here you can review all the post reports raised by members of the community."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Reported Posts Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Reported Posts Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show"]
+                "Active Reports"
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=closed"]
+                "Old Reports"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#reported_posts [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show;start=#" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Active Reports"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.centertext
+        "No Reports Found"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts_closed.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts_closed.txt
new file mode 100644
index 00000000000..c3de7a4311b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_reported_posts_closed.txt
@@ -0,0 +1,80 @@
+status 200
+@ title
+title
+  "Reported Posts"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedposts" itemprop="item"]
+        span [itemprop="name"]
+          "Reported Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=closed" itemprop="item"]
+        span [itemprop="name"]
+          "Old Reports"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Reported Posts"
+  p.information
+    "Here you can review all the post reports raised by members of the community."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Reported Posts Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Reported Posts Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show"]
+                "Active Reports"
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=closed"]
+                "Old Reports"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#reported_posts [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show;closed;start=#" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Old Reports"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.centertext
+        "No Reports Found"
+    div.pagesection
+      div.floatleft.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_attachments.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_attachments.txt
new file mode 100644
index 00000000000..1c2c071b0ca
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_attachments.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Moderation Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Moderation Center"
+  p.information
+    strong
+      "Hello, admin."
+    br
+    "This is your \"Moderation Center\". From here you can perform all the moderation actions assigned to yourself by the Administrator. This home page contains a summary of all the latest happenings in your community."
+  div#modnotes
+    form [action="{boardurl}/index.php?action=moderate;area=index;modnote" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Moderator Notes"
+      div.windowbg
+        div.floatleft.post_note
+          input [name="new_note" placeholder="Add a new note" type="text"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="makenote" type="submit" value="Add"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+  div#modcenter
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#group_requests_link [href="{boardurl}/index.php?action=groups;sa=requests"]
+            "Membergroup Requests"
+        span#group_requests_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#group_requests_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no open requests for group membership."
+      script
+        | var oGroupRequestsPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'group_requests_panel' ], aSwapImages: [ { sId: 'group_requests_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'group_requests_link', msgExpanded: 'Membergroup Requests', msgCollapsed: 'Membergroup Requests' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcgr' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_posts_link [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+            "Recent Topic Reports"
+        span#reported_posts_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_posts_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no outstanding reports."
+      script
+        | var oReportedPostsToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_posts_panel' ], aSwapImages: [ { sId: 'reported_posts_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_posts_link', msgExpanded: 'Recent Topic Reports', msgCollapsed: 'Recent Topic Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcrp' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#watched_users_link [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+            "Recent Watched Members"
+        span#watched_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#watched_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are not currently any watches in place."
+      script
+        | var oWatchedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'watched_users_panel' ], aSwapImages: [ { sId: 'watched_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'watched_users_link', msgExpanded: 'Recent Watched Members', msgCollapsed: 'Recent Watched Members' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcwu' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_users_link [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+            "Recent Profile Reports"
+        span#reported_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no pending profile reports."
+      script
+        | var oReportedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_users_panel' ], aSwapImages: [ { sId: 'reported_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_users_link', msgExpanded: 'Recent Profile Reports', msgCollapsed: 'Recent Profile Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcur' } });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_posts.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_posts.txt
new file mode 100644
index 00000000000..1c2c071b0ca
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_posts.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Moderation Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Moderation Center"
+  p.information
+    strong
+      "Hello, admin."
+    br
+    "This is your \"Moderation Center\". From here you can perform all the moderation actions assigned to yourself by the Administrator. This home page contains a summary of all the latest happenings in your community."
+  div#modnotes
+    form [action="{boardurl}/index.php?action=moderate;area=index;modnote" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Moderator Notes"
+      div.windowbg
+        div.floatleft.post_note
+          input [name="new_note" placeholder="Add a new note" type="text"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="makenote" type="submit" value="Add"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+  div#modcenter
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#group_requests_link [href="{boardurl}/index.php?action=groups;sa=requests"]
+            "Membergroup Requests"
+        span#group_requests_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#group_requests_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no open requests for group membership."
+      script
+        | var oGroupRequestsPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'group_requests_panel' ], aSwapImages: [ { sId: 'group_requests_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'group_requests_link', msgExpanded: 'Membergroup Requests', msgCollapsed: 'Membergroup Requests' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcgr' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_posts_link [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+            "Recent Topic Reports"
+        span#reported_posts_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_posts_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no outstanding reports."
+      script
+        | var oReportedPostsToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_posts_panel' ], aSwapImages: [ { sId: 'reported_posts_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_posts_link', msgExpanded: 'Recent Topic Reports', msgCollapsed: 'Recent Topic Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcrp' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#watched_users_link [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+            "Recent Watched Members"
+        span#watched_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#watched_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are not currently any watches in place."
+      script
+        | var oWatchedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'watched_users_panel' ], aSwapImages: [ { sId: 'watched_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'watched_users_link', msgExpanded: 'Recent Watched Members', msgCollapsed: 'Recent Watched Members' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcwu' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_users_link [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+            "Recent Profile Reports"
+        span#reported_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no pending profile reports."
+      script
+        | var oReportedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_users_panel' ], aSwapImages: [ { sId: 'reported_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_users_link', msgExpanded: 'Recent Profile Reports', msgCollapsed: 'Recent Profile Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcur' } });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_topics.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_topics.txt
new file mode 100644
index 00000000000..1c2c071b0ca
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_unapproved_topics.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Moderation Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Moderation Center"
+  p.information
+    strong
+      "Hello, admin."
+    br
+    "This is your \"Moderation Center\". From here you can perform all the moderation actions assigned to yourself by the Administrator. This home page contains a summary of all the latest happenings in your community."
+  div#modnotes
+    form [action="{boardurl}/index.php?action=moderate;area=index;modnote" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Moderator Notes"
+      div.windowbg
+        div.floatleft.post_note
+          input [name="new_note" placeholder="Add a new note" type="text"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="makenote" type="submit" value="Add"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+  div#modcenter
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#group_requests_link [href="{boardurl}/index.php?action=groups;sa=requests"]
+            "Membergroup Requests"
+        span#group_requests_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#group_requests_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no open requests for group membership."
+      script
+        | var oGroupRequestsPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'group_requests_panel' ], aSwapImages: [ { sId: 'group_requests_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'group_requests_link', msgExpanded: 'Membergroup Requests', msgCollapsed: 'Membergroup Requests' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcgr' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_posts_link [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+            "Recent Topic Reports"
+        span#reported_posts_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_posts_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no outstanding reports."
+      script
+        | var oReportedPostsToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_posts_panel' ], aSwapImages: [ { sId: 'reported_posts_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_posts_link', msgExpanded: 'Recent Topic Reports', msgCollapsed: 'Recent Topic Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcrp' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#watched_users_link [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+            "Recent Watched Members"
+        span#watched_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#watched_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are not currently any watches in place."
+      script
+        | var oWatchedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'watched_users_panel' ], aSwapImages: [ { sId: 'watched_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'watched_users_link', msgExpanded: 'Recent Watched Members', msgCollapsed: 'Recent Watched Members' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcwu' } });
+    div.half_content
+      div.cat_bar
+        h3.catbg
+          a#reported_users_link [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+            "Recent Profile Reports"
+        span#reported_users_toggle.toggle_up [style="display: none;" title="Hide"]
+      div#reported_users_panel.windowbg
+        ul
+          li
+            strong.smalltext
+              "There are no pending profile reports."
+      script
+        | var oReportedUsersToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'reported_users_panel' ], aSwapImages: [ { sId: 'reported_users_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'reported_users_link', msgExpanded: 'Recent Profile Reports', msgCollapsed: 'Recent Profile Reports' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=mcur' } });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_view_groups.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_view_groups.txt
new file mode 100644
index 00000000000..1c86d0eb862
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_view_groups.txt
@@ -0,0 +1,94 @@
+status 200
+@ title
+title
+  "Viewing Membergroups"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=viewgroups" itemprop="item"]
+        span [itemprop="name"]
+          "View Membergroups"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Moderation Center"
+  p.information
+    strong
+      "Hello, admin."
+    br
+    "This is your \"Moderation Center\". From here you can perform all the moderation actions assigned to yourself by the Administrator. This home page contains a summary of all the latest happenings in your community."
+  div.cat_bar
+    h3.catbg
+      "Viewing Membergroups"
+  table#group_lists.table_grid
+    thead
+      tr.title_bar
+        th#header_group_lists_group.group [scope="col"]
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sort=group;desc" rel="nofollow"]
+            "Name"
+            span.main_icons.sort_up
+        th#header_group_lists_icons.icons [scope="col"]
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sort=icons" rel="nofollow"]
+            "Icons"
+        th#header_group_lists_moderators.moderators [scope="col"]
+          "Moderators"
+        th#header_group_lists_members.members [scope="col"]
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sort=members" rel="nofollow"]
+            "Members"
+    tbody
+      tr#list_group_lists_#.windowbg
+        td.group
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#" style="color: #FF#;"]
+            "Administrator"
+          "("
+          a [href="{boardurl}/index.php?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"]
+            "?"
+          ")"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+        td.moderators
+          em
+            "(none)"
+        td.centercol.members
+          "#"
+      tr#list_group_lists_#.windowbg
+        td.group
+          a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#" style="color: ##FF;"]
+            "Global Moderator"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/icongmod.png"]
+        td.moderators
+          em
+            "(none)"
+        td.centercol.members
+          "#"
+      tr#list_group_lists_#.windowbg
+        td.group
+          "Moderator ("
+          a [href="{boardurl}/index.php?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);"]
+            "?"
+          ")"
+        td.icons
+          img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconmod.png"]
+        td.moderators
+          em
+            "(none)"
+        td.centercol.members
+          "n/a"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_log.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_log.txt
new file mode 100644
index 00000000000..ca01eef6fe1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_log.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Viewing warning log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings" itemprop="item"]
+        span [itemprop="name"]
+          "Warnings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log" itemprop="item"]
+        span [itemprop="name"]
+          "Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Warnings"
+  p.information
+    "From this section you can see which warnings have been issued to members of the forum. You can also add and modify the notification templates used when sending a warning to a member."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Warnings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Warnings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log"]
+                "Log"
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates"]
+                "Custom Templates"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=warnings;sa=log;sort=member" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Viewing warning log"
+    table#warning_list.table_grid
+      thead
+        tr.title_bar
+          th#header_warning_list_issuer.issuer [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=issuer" rel="nofollow"]
+              "Issued By"
+          th#header_warning_list_recipient.recipient [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=recipient" rel="nofollow"]
+              "Recipient"
+          th#header_warning_list_time.time [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=time;desc" rel="nofollow"]
+              "Time"
+              span.main_icons.sort_up
+          th#header_warning_list_reason.reason [scope="col"]
+            "Reason"
+          th#header_warning_list_points.points [scope="col"]
+            "Points"
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "No warnings have been issued."
+    div.flow_auto
+      div.additional_row.floatright
+        "Quick Search"
+        input [name="search" size="#" type="text" value]
+        input.button [name="is_search" type="submit" value="Go"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="params" type="hidden" value]
+    input [name="sort" type="hidden" value="time"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_templates.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_templates.txt
new file mode 100644
index 00000000000..afb2fcbb1ba
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warning_templates.txt
@@ -0,0 +1,89 @@
+status 200
+@ title
+title
+  "Custom warning templates"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings" itemprop="item"]
+        span [itemprop="name"]
+          "Warnings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates" itemprop="item"]
+        span [itemprop="name"]
+          "Custom Templates"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Warnings"
+  p.information
+    "From this section you can see which warnings have been issued to members of the forum. You can also add and modify the notification templates used when sending a warning to a member."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Warnings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Warnings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log"]
+                "Log"
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates"]
+                "Custom Templates"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=warnings;sa=templates" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Custom warning templates"
+    table#warning_template_list.table_grid
+      thead
+        tr.title_bar
+          th#header_warning_template_list_title.title [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates;{session_var}={session_id};sort=title;desc" rel="nofollow"]
+              "Template"
+              span.main_icons.sort_up
+          th#header_warning_template_list_creator.creator [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates;{session_var}={session_id};sort=creator" rel="nofollow"]
+              "Created By"
+          th#header_warning_template_list_time.time [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates;{session_var}={session_id};sort=time" rel="nofollow"]
+              "Time Created"
+          th#header_warning_template_list_delete.centercol.delete [scope="col" style="width: #%;"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "No warning templates have been created yet"
+    div.additional_row
+      input.button.you_sure [data-confirm="Are you sure you want to delete the selected templates?" name="delete" type="submit" value="Delete Selected"]
+    div.additional_row
+      input.button [name="add" type="submit" value="Add Template"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warnings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warnings.txt
new file mode 100644
index 00000000000..ca01eef6fe1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_warnings.txt
@@ -0,0 +1,93 @@
+status 200
+@ title
+title
+  "Viewing warning log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings" itemprop="item"]
+        span [itemprop="name"]
+          "Warnings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log" itemprop="item"]
+        span [itemprop="name"]
+          "Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Warnings"
+  p.information
+    "From this section you can see which warnings have been issued to members of the forum. You can also add and modify the notification templates used when sending a warning to a member."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Warnings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Warnings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log"]
+                "Log"
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates"]
+                "Custom Templates"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=warnings;sa=log;sort=member" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Viewing warning log"
+    table#warning_list.table_grid
+      thead
+        tr.title_bar
+          th#header_warning_list_issuer.issuer [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=issuer" rel="nofollow"]
+              "Issued By"
+          th#header_warning_list_recipient.recipient [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=recipient" rel="nofollow"]
+              "Recipient"
+          th#header_warning_list_time.time [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log;{session_var}={session_id};sort=time;desc" rel="nofollow"]
+              "Time"
+              span.main_icons.sort_up
+          th#header_warning_list_reason.reason [scope="col"]
+            "Reason"
+          th#header_warning_list_points.points [scope="col"]
+            "Points"
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "No warnings have been issued."
+    div.flow_auto
+      div.additional_row.floatright
+        "Quick Search"
+        input [name="search" size="#" type="text" value]
+        input.button [name="is_search" type="submit" value="Go"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="params" type="hidden" value]
+    input [name="sort" type="hidden" value="time"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_members.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_members.txt
new file mode 100644
index 00000000000..0ab203c8cc0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_members.txt
@@ -0,0 +1,88 @@
+status 200
+@ title
+title
+  "Watched Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=userwatch" itemprop="item"]
+        span [itemprop="name"]
+          "Watched Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member" itemprop="item"]
+        span [itemprop="name"]
+          "Member"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Watched Members"
+  p.information
+    "Here you can keep a track of all members who have been assigned a \"watch\" by the moderation team."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Watched Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Watched Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member"]
+                "Member"
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=post"]
+                "View by Post"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=userwatch;sa=post" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Watched Members - View By Member"
+    table#watch_user_list.table_grid
+      thead
+        tr.title_bar
+          th#header_watch_user_list_member.member [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member;sort=member;desc" rel="nofollow"]
+              "Member"
+              span.main_icons.sort_up
+          th#header_watch_user_list_warning.warning [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member;sort=warning" rel="nofollow"]
+              "Warning Level"
+          th#header_watch_user_list_posts.posts [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member;sort=posts" rel="nofollow"]
+              "Posts"
+          th#header_watch_user_list_last_login.last_login [scope="col"]
+            a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member;sort=last_login" rel="nofollow"]
+              "Last login"
+          th#header_watch_user_list_last_post.last_post [scope="col"]
+            "Last post"
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are not currently any watches in place."
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="sort" type="hidden" value="member"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_posts.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_posts.txt
new file mode 100644
index 00000000000..3fe6f38d052
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderate_watched_posts.txt
@@ -0,0 +1,72 @@
+status 200
+@ title
+title
+  "Watched Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate" itemprop="item"]
+        span [itemprop="name"]
+          "Moderation Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=userwatch" itemprop="item"]
+        span [itemprop="name"]
+          "Watched Members"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=post" itemprop="item"]
+        span [itemprop="name"]
+          "View by Post"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Watched Members"
+  p.information
+    "Here you can keep a track of all members who have been assigned a \"watch\" by the moderation team."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Watched Members Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Watched Members Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member"]
+                "Member"
+            li
+              a.active [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=post"]
+                "View by Post"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=moderate;area=userwatch;sa=post" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Watched Members - View By Post"
+    table#watch_user_list.table_grid
+      tbody
+        tr.windowbg
+          td.centertext [colspan="#"]
+            "There are no posts from watched members."
+    div.additional_row.floatright
+      input.button [name="delete_selected" type="submit" value="Remove selected"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/moderation_menu.txt b/tests/Integration/Http/Snapshot/snapshots/admin/moderation_menu.txt
new file mode 100644
index 00000000000..2dcb60819e0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/moderation_menu.txt
@@ -0,0 +1,94 @@
+status 200
+@ #genericmenu
+nav#genericmenu [aria-label="Moderation Center Menu"]
+  a.mobile_generic_menu_1
+    span.menu_icon
+    span.text_menu
+      "Moderation Center Menu"
+  div#mobile_generic_menu_#.popup_container
+    div.description.popup_window
+      div.popup_heading
+        "Moderation Center Menu"
+        a.hide_popup.main_icons [href="javascript:void(#);"]
+      div.generic_menu
+        ul.dropdown_menu_1.dropmenu
+          li.subsections
+            a.active [href="{boardurl}/index.php?action=moderate;area=index"]
+              "Main"
+            ul
+              li
+                a.administration.chosen.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=index"]
+                  span.administration.main_icons
+                  "Moderation Center"
+          li.subsections
+            a [href="{boardurl}/index.php?action=moderate;area=modlog"]
+              "Logs"
+            ul
+              li
+                a.logs.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=modlog"]
+                  span.logs.main_icons
+                  "Moderation Log"
+              li.subsections
+                a.moderate_menu_icon.warning [href="{boardurl}/index.php?action=moderate;area=warnings"]
+                  span.main_icons.warning
+                  "Warnings"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=log"]
+                      "Log"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templates"]
+                      "Custom Templates"
+          li.subsections
+            a [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+              "Posts"
+            ul
+              li.subsections
+                a.moderate_menu_icon.reports [href="{boardurl}/index.php?action=moderate;area=reportedposts"]
+                  span.main_icons.reports
+                  "Reported Posts"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=show"]
+                      "Active Reports"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedposts;sa=closed"]
+                      "Old Reports"
+          li.subsections
+            a [href="{boardurl}/index.php?action=moderate;area=groups;sa=requests"]
+              "Groups"
+            ul
+              li
+                a.members_request.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=groups;sa=requests"]
+                  span.main_icons.members_request
+                  "Membergroup Requests"
+              li
+                a.membergroups.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=viewgroups"]
+                  span.main_icons.membergroups
+                  "View Membergroups"
+          li.subsections
+            a [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+              "Members"
+            ul
+              li.subsections
+                a.members_watched.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=userwatch"]
+                  span.main_icons.members_watched
+                  "Watched Members"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=member"]
+                      "Member"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=userwatch;sa=post"]
+                      "View by Post"
+              li.subsections
+                a.members_watched.moderate_menu_icon [href="{boardurl}/index.php?action=moderate;area=reportedmembers"]
+                  span.main_icons.members_watched
+                  "Reported Members"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=open"]
+                      "Active Reports"
+                  li
+                    a [href="{boardurl}/index.php?action=moderate;area=reportedmembers;sa=closed"]
+                      "Old Reports"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/modsettings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/modsettings.txt
new file mode 100644
index 00000000000..c3997b4f7b3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/modsettings.txt
@@ -0,0 +1,79 @@
+status 200
+@ title
+title
+  "Modification Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=modsettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modification Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=modsettings;sa=general;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Miscellaneous"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=modsettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Modification Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page contains settings added by any modifications to your forum"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Modification Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Modification Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=modsettings;sa=general;{session_var}={session_id}"]
+                "Miscellaneous"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=modsettings;save;sa=general" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Miscellaneous"
+    div.information.noup
+      div.centertext
+        "There are no modifications installed that have added any settings to this area yet."
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/move_topic.txt b/tests/Integration/Http/Snapshot/snapshots/admin/move_topic.txt
new file mode 100644
index 00000000000..5c768378f8e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/move_topic.txt
@@ -0,0 +1,112 @@
+status 200
+@ title
+title
+  "Move Topic"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span [itemprop="name"]
+        "Move Topic"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#move_topic.lower_padding
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=movetopic#;current_board=#;topic=#" method="post" onsubmit="submitonce(this);"]
+        div.cat_bar
+          h3.catbg
+            "Move Topic"
+        div.centertext.windowbg
+          div.move_topic
+            dl.settings
+              dt
+                strong
+                  "Move to"
+              dd
+                select [name="toboard"]
+                  optgroup [label="Snapshot fixtures"]
+                    option [disabled value="#"]
+                      "{board}"
+                    option [value="#"]
+                      "=> Snapshot child one"
+                    option [value="#"]
+                      "=> Snapshot child two"
+                    option [value="#"]
+                      "Snapshot empty board"
+            label [for="reset_subject"]
+              input#reset_subject [name="reset_subject" onclick="document.getElementById('subjectArea').classList.toggle('hidden');" type="checkbox"]
+              "Change the topic’s subject"
+            br
+            fieldset#subjectArea.hidden
+              dl.settings
+                dt
+                  strong
+                    "New subject"
+                dd
+                  input [name="custom_subject" size="#" type="text" value="{subject}"]
+              label [for="enforce_subject"]
+                input#enforce_subject [name="enforce_subject" type="checkbox"]
+                "Change every message’s subject"
+            label.block [for="postRedirect"]
+              input#postRedirect [checked name="postRedirect" onclick="document.getElementById('reasonArea').classList.toggle('hidden');" type="checkbox"]
+              "Post a redirection topic"
+            fieldset#reasonArea
+              dl.settings
+                dt
+                  "Please enter a brief description as to"
+                  br
+                  "why this topic is being moved."
+                dd
+                  textarea [name="reason"]
+                    "This topic has been moved to [BOARD]. [TOPIC LINK]"
+                dt
+                  label [for="redirect_topic"]
+                    "Redirect to the moved topic"
+                dd
+                  input#redirect_topic [checked name="redirect_topic" type="checkbox"]
+                dt
+                  "Automatically remove the redirection topic"
+                dd
+                  select [name="redirect_expires"]
+                    option [value="#"]
+                      "Never"
+                    option [value="#"]
+                      "# Day(s)"
+                    option [selected value="#"]
+                      "# Week(s)"
+                    option [value="#"]
+                      "# Week(s)"
+                    option [value="#"]
+                      "# Month(s)"
+            input.button [accesskey="s" onclick="return submitThisOnce(this);" type="submit" value="Move Topic"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="seqnum" type="hidden" value="#"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/news.txt b/tests/Integration/Http/Snapshot/snapshots/admin/news.txt
new file mode 100644
index 00000000000..df65826ce4d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/news.txt
@@ -0,0 +1,129 @@
+status 200
+@ title
+title
+  "News"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "News and Newsletters"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;sa=editnews;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "News"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=edit_news" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "News and Newsletters"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Please place one news item per box."
+    abbr [title="Bulletin Board Code"]
+      "BBC"
+    span [title="Because everyone loves brackets!"]
+      "tags"
+    ", such as"
+    span.monospace
+      "[b]"
+    ","
+    span.monospace
+      "[i]"
+    "and"
+    span.monospace
+      "[u]"
+    ", are allowed in your news, as well as smileys. Clear a news item’s text box to remove it."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "News and Newsletters Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "News and Newsletters Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=news;sa=editnews;{session_var}={session_id}"]
+                "News"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=mailingmembers;{session_var}={session_id}"]
+                "Newsletters"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=news;sa=editnews" method="post"]
+    table#news_lists.table_grid
+      thead
+        tr.title_bar
+          th#header_news_lists_news.half_table.news [scope="col"]
+            "News"
+          th#header_news_lists_preview.half_table.preview [scope="col"]
+            "Preview"
+          th#header_news_lists_check.centercol.check.icon [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr#list_news_lists_#.windowbg
+          td.half_table.news
+            textarea#data_#.block.padding [cols="#" name="news[]" rows="#"]
+              "SMF - Just Installed!"
+            div#preview_#.floatleft
+          td.half_table.preview
+            div#box_preview_# [style="overflow: auto; width: #%; min-height: #ex;"]
+              "SMF - Just Installed!"
+          td.centercol.check.icon
+            input [name="remove[]" type="checkbox" value="#"]
+        tr#list_news_lists_last.windowbg
+          td.half_table.news
+            div#moreNewsItems
+            noscript
+              textarea [cols="#" name="news[]" rows="#" style="width: #%;"]
+          td.half_table.preview
+            div#box_preview_last [style="overflow: auto; width: #%; min-height: #ex;"]
+              div#moreNewsItems_preview
+          td.centercol.check.icon
+    div.additional_row
+      span#moreNewsItems_link.floatleft [style="display: none;"]
+        a.button [href="javascript:void(#);" onclick="addNewsItem(); return false;"]
+          "Add another item"
+      input.button [name="save_items" type="submit" value="Save"]
+      input.button.you_sure [data-confirm="Are you sure you want to delete the selected news items?" name="delete_selection" type="submit" value="Remove selected"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | document.getElementById('list_news_lists_last').style.display = "none"; document.getElementById("moreNewsItems_link").style.display = ""; var last_preview = #; $(document).ready(function () { $("div[id ^= 'preview_']").each(function () { var preview_id = $(this).attr('id').split('_')[#]; if (last_preview < preview_id) last_preview = preview_id; make_preview_btn(preview_id); }); }); function make_preview_btn (preview_id) { $("#preview_" + preview_id).addClass("button"); $("#preview_" + preview_id).text('Preview').click(function () { $.ajax({ type: "POST", headers: { "X-SMF-AJAX": # }, xhrFields: { withCredentials: typeof allow_xhjr_credentials !== "undefined" ? allow_xhjr_credentials : false }, url: "{boardurl}/index.php?action=xmlhttp;sa=previews;xml", data: {item: "newspreview", news: $("#data_" + preview_id).val()}, context: document.body, success: function(request){ if ($(request).find("error").text() == '') $(document).find("#box_preview_" + preview_id).html($(request).text()); else $(document).find("#box_preview_" + preview_id).text('Nothing written'); }, }); }); } function addNewsItem () { last_preview++; $("#list_news_lists_last").before('\n\t\t\t\t<tr class="windowbg' + (last_preview % # == # ? '' : '#') + '">\n\t\t\t\t\t<td style="width: #%;">\n\t\t\t\t\t\t\t<textarea id="data_' + last_preview + '" rows="#" cols="#" name="news[]" style="width: #%;"><' + '/textarea>\n\t\t\t\t\t\t\t<br>\n\t\t\t\t\t\t\t<div class="floatleft" id="preview_' + last_preview + '"><' + '/div>\n\t\t\t\t\t<' + '/td>\n\t\t\t\t\t<td style="width: #%;">\n\t\t\t\t\t\t<div id="box_preview_' + last_preview + '" style="overflow: auto; width: #%; min-height: #ex;"><' + '/div>\n\t\t\t\t\t<' + '/td>\n\t\t\t\t\t<td><' + '/td>\n\t\t\t\t<' + '/tr>'); make_preview_btn(last_preview); }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/news_mailing.txt b/tests/Integration/Http/Snapshot/snapshots/admin/news_mailing.txt
new file mode 100644
index 00000000000..a48c848aac7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/news_mailing.txt
@@ -0,0 +1,202 @@
+status 200
+@ title
+title
+  "Newsletters"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "News and Newsletters"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;sa=mailingmembers;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Newsletters"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=edit_news" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "News and Newsletters"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this menu you can send messages to all members who’ve registered and entered their email addresses. You may edit the distribution list, or send messages to all. Useful for important update/news information."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "News and Newsletters Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "News and Newsletters Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=editnews;{session_var}={session_id}"]
+                "News"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=news;sa=mailingmembers;{session_var}={session_id}"]
+                "Newsletters"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_newsletters.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=news;sa=mailingcompose" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Newsletters"
+    div.information.noup
+      "Please select who should receive a copy of the newsletter"
+    div.noup.windowbg
+      dl.settings
+        dt
+          strong
+            "Membergroups"
+          br
+          span.smalltext
+            "Select the groups to receive this newsletter."
+        dd
+          label [for="groups_#"]
+            input#groups_# [checked name="groups[#]" type="checkbox" value="#"]
+            "Regular Members"
+          em
+            "(#)"
+          br
+          label [for="groups_#"]
+            input#groups_# [checked name="groups[#]" type="checkbox" value="#"]
+            "Administrator"
+          em
+            "(#)"
+          br
+          label [for="groups_#"]
+            input#groups_# [checked name="groups[#]" type="checkbox" value="#"]
+            "Global Moderator"
+          em
+            "(#)"
+          br
+          label [for="checkAllGroups"]
+            input#checkAllGroups [checked onclick="invertAll(this, this.form, 'groups');" type="checkbox"]
+            em
+              "Select all"
+      div#advanced_panel_header.title_bar
+        h3.titlebg
+          a#advanced_panel_link [href="#"]
+            "Advanced"
+        span#advanced_panel_toggle.toggle_down [style="display: none;"]
+      div#advanced_panel_div.padding
+        dl.settings
+          dt
+            strong
+              "Email Addresses"
+            br
+            span.smalltext
+              "A semi-colon separated list of email addresses which should be sent a newsletter (i.e. address#; address#). This is additional to the groups listed above."
+              br
+              span.alert
+                "Note: You must manually handle any unsubscribe requests regarding newsletters sent to these email addresses."
+          dd
+            textarea [cols="#" name="emails" rows="#" style="width: #%;"]
+          dt
+            strong
+              "Members"
+            br
+            span.smalltext
+              "Additional members to receive newsletter."
+          dd
+            input#members [name="members" size="#" type="text" value]
+            span#members_container
+        hr.bordercolor
+        dl.settings
+          dt
+            strong
+              "Excluded Groups"
+            br
+            span.smalltext
+              "Select groups who should definitely not receive the newsletter."
+          dd
+            label [for="exclude_groups_#"]
+              input#exclude_groups_# [name="exclude_groups[#]" type="checkbox" value="#"]
+              "Regular Members"
+            em
+              "(#)"
+            br
+            label [for="exclude_groups_#"]
+              input#exclude_groups_# [name="exclude_groups[#]" type="checkbox" value="#"]
+              "Administrator"
+            em
+              "(#)"
+            br
+            label [for="exclude_groups_#"]
+              input#exclude_groups_# [name="exclude_groups[#]" type="checkbox" value="#"]
+              "Global Moderator"
+            em
+              "(#)"
+            br
+            label [for="checkAllGroupsExclude"]
+              input#checkAllGroupsExclude [onclick="invertAll(this, this.form, 'exclude_groups');" type="checkbox"]
+              em
+                "Select all"
+            br
+          dt
+            strong
+              "Excluded Members"
+            br
+            span.smalltext
+              "Members who should not receive newsletter."
+          dd
+            input#exclude_members [name="exclude_members" size="#" type="text" value]
+            span#exclude_members_container
+        hr.bordercolor
+        dl.settings
+          dt
+            label [for="email_force"]
+              strong
+                "Override notification settings"
+            br
+            span.smalltext
+              "Send this to members even if they have chosen not to receive announcements."
+              br
+              span.alert
+                "This should only be used in exceptional circumstances. Using this to send promotional or other non-essential email messages violates many countries’ privacy and anti-spam laws."
+          dd
+            input#email_force [name="email_force" type="checkbox" value="#"]
+      br
+      input.button [type="submit" value="Next"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | var oAdvancedPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: true, aSwappableContainers: [ 'advanced_panel_div' ], aSwapImages: [ { sId: 'advanced_panel_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'advanced_panel_link', msgExpanded: 'Advanced', msgCollapsed: 'Advanced' } ] });
+  script
+    | var oMemberSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'members', sControlId: 'members', sSearchType: 'member', bItemList: true, sPostName: 'member_list', sURLMask: 'action=profile;u=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'members_container', aListItems: [] }); var oExcludeMemberSuggest = new smc_AutoSuggest({ sSessionId: '{session_id}', sSessionVar: '{session_var}', sSuggestId: 'exclude_members', sControlId: 'exclude_members', sSearchType: 'member', bItemList: true, sPostName: 'exclude_member_list', sURLMask: 'action=profile;u=%item_id%', sTextDeleteItem: 'Delete Item', sItemListContainerId: 'exclude_members_container', aListItems: [] });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/news_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/news_settings.txt
new file mode 100644
index 00000000000..15d23c84895
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/news_settings.txt
@@ -0,0 +1,172 @@
+status 200
+@ title
+title
+  "News - Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "News and Newsletters"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=news;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=edit_news" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "News and Newsletters"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can change the settings and permissions related to news and newsletters."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "News and Newsletters Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "News and Newsletters Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=editnews;{session_var}={session_id}"]
+                "News"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=news;sa=mailingmembers;{session_var}={session_id}"]
+                "Newsletters"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=news;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=news;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_edit_news
+          span
+            label
+              "Groups allowed to edit news items"
+        dd
+          fieldset#edit_news
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('edit_news').style.display = 'none';document.getElementById('edit_news_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="edit_news[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="edit_news[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'edit_news[');" type="checkbox"]
+                span
+                  "Select all"
+          a#edit_news_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('edit_news').style.display = 'block'; document.getElementById('edit_news_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("edit_news").style.display = "none"; document.getElementById("edit_news_groups_link").style.display = "";
+        dt
+          a#setting_send_mail
+          span
+            label
+              "Groups allowed to send out forum newsletters"
+        dd
+          fieldset#send_mail
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('send_mail').style.display = 'none';document.getElementById('send_mail_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="send_mail[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="send_mail[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'send_mail[');" type="checkbox"]
+                span
+                  "Select all"
+          a#send_mail_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('send_mail').style.display = 'block'; document.getElementById('send_mail_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("send_mail").style.display = "none"; document.getElementById("send_mail_groups_link").style.display = "";
+      hr
+      dl.settings
+        dt
+          a#setting_xmlnews_enable_help [href="{boardurl}/index.php?action=helpadmin;help=xmlnews_enable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_xmlnews_enable
+          span
+            label [for="xmlnews_enable"]
+              "Enable XML/RSS news"
+        dd
+          input#xmlnews_enable [checked name="xmlnews_enable" onclick="document.getElementById('xmlnews_maxlen').disabled = !this.checked;" type="checkbox" value="#"]
+        dt
+          a#setting_xmlnews_maxlen
+          span
+            label [for="xmlnews_maxlen"]
+              "Maximum message length"
+            br
+            span.smalltext
+              "(# to(s) disable, bad idea.)"
+        dd
+          input#xmlnews_maxlen [min="#" name="xmlnews_maxlen" size="#" type="number" value="#"]
+        dt
+          a#setting_xmlnews_attachments_help [href="{boardurl}/index.php?action=helpadmin;help=xmlnews_attachments" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_xmlnews_attachments
+          span
+            label [for="xmlnews_attachments"]
+              "Enclose attachments in XML/RSS feeds"
+            br
+            span.smalltext
+              "Note: Some feed formats will only enclose one attachment per post."
+        dd
+          input#xmlnews_attachments [name="xmlnews_attachments" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/packages.txt b/tests/Integration/Http/Snapshot/snapshots/admin/packages.txt
new file mode 100644
index 00000000000..2fed12096d1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/packages.txt
@@ -0,0 +1,139 @@
+status 200
+@ title
+title
+  "Package Manager - Browse Packages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=packages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Package Manager"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=packages;sa=browse;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Browse Packages"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Package Manager"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this easy to use interface, you can download and install modifications for use on your forum."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Package Manager Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Package Manager Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=packages;sa=browse;{session_var}={session_id}"]
+                "Browse Packages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=packageget;get;{session_var}={session_id}"]
+                "Add Packages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=perms;{session_var}={session_id}"]
+                "File Permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=options;{session_var}={session_id}"]
+                "Options"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#update_section
+  div#admin_form_wrapper
+    div.cat_bar
+      h3.catbg
+        "Obtaining Packages"
+    div.information
+      "You can always find new packages for your forum from the SMF modifications area -"
+      strong
+        a [href="https://custom.simplemachines.org/mods/" rel="noopener" target="_blank"]
+          "https://custom.simplemachines.org/mods/"
+      ". You can browse them on the website, read the comments, and download them to your computer and then upload them to your forum from there."
+      br
+      "If you run into any questions with modifications, each modification published on simplemachines.org has a dedicated topic about it where support and comments should be directed to."
+    script
+      | window.smfForum_scripturl = smf_scripturl; window.smfForum_sessionid = smf_session_id; window.smfForum_sessionvar = smf_session_var; window.smfInstalledPackages = [""]; window.smfVersion = "SMF # Alpha(s) #-dev";
+    div#yourVersion [style="display:none"]
+      "SMF # Alpha(s) #-dev"
+    script [src="{boardurl}/index.php?action=viewsmfile;filename=latest-news.js"]
+    script
+      | var oAdminIndex = new smf_AdminIndex({ bLoadAnnouncements: false, bLoadVersions: false, bLoadUpdateNotification: true, sUpdateNotificationContainerId: 'update_section', sUpdateNotificationDefaultTitle: 'Update available', sUpdateNotificationDefaultMessage: 'You’re using an outdated version of SMF, which contains some bugs which have since been fixed.\n\tIt is recommended that you <a hr'+'ef="#" id="update-link" class="bbc_link strong">update your forum<' + '/a> to the latest version as soon as possible. It only takes a minute!', sUpdateNotificationTemplate: '\n\t\t\t\t\t\t<h# id(s)="update_title">\n\t\t\t\t\t\t\t%title%\n\t\t\t\t\t\t<' + '/h#>\n\t\t\t\t\t\t<div id="update_message" class="smalltext">\n\t\t\t\t\t\t\t%message%\n\t\t\t\t\t\t<' + '/div>\n\t\t\t\t\t', sUpdateNotificationLink: smf_scripturl + '?action=admin;area=packages;pgdownload;auto;package=%package%;{session_var}={session_id}' });
+  div.noticebox
+    "No packages yet."
+  form [action="{boardurl}/index.php?action=admin;area=packages;sa=browse" method="get"]
+    div#advanced_box
+      div.cat_bar
+        h3.catbg
+          a#advanced_panel_link [href="#"]
+            "Emulation Support"
+        span#advanced_panel_toggle.toggle_down [style="display: none;"]
+      div#advanced_panel_div.windowbg
+        p
+          "Sometimes packages are locked to early versions of SMF but remain compatible with a newer version. Here you can choose to \"emulate\" a different SMF version within the package manager."
+        dl.settings
+          dt
+            strong
+              "Emulate Version"
+            br
+            span.smalltext
+              a [href="#" onclick="return revert();"]
+                "Revert"
+          dd
+            a#revert [name="revert"]
+            select#ve [name="version_emulate"]
+              option [value="# RC(s)#"]
+                "# RC(s)#"
+              option [value="#"]
+                "#"
+              option [value="# Beta(s) #"]
+                "# Beta(s) #"
+              option [value="# RC(s)#"]
+                "# RC(s)#"
+              option [value="#"]
+                "#"
+              option [selected="selected" value="# Alpha(s) #-dev"]
+                "# Alpha(s) #-dev"
+        div.padding.righttext
+          input.button [type="submit" value="Apply"]
+    input [name="action" type="hidden" value="admin"]
+    input [name="area" type="hidden" value="packages"]
+    input [name="sa" type="hidden" value="browse"]
+  script
+    | var oAdvancedPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: true, aSwappableContainers: [ 'advanced_panel_div' ], aSwapImages: [ { sId: 'advanced_panel_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'advanced_panel_link', msgExpanded: 'Emulation Support', msgCollapsed: 'Emulation Support' } ] }); function revert() { var default_version = "# Alpha(s) #-dev"; $("#ve").find("option").filter(function(index) { return default_version === $(this).text(); }).attr("selected", "selected"); return false; }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/packages_options.txt b/tests/Integration/Http/Snapshot/snapshots/admin/packages_options.txt
new file mode 100644
index 00000000000..34afd497d4c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/packages_options.txt
@@ -0,0 +1,117 @@
+status 200
+@ title
+title
+  "Options"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=packages;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Package Manager"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=packages;sa=options;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Options"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Package Manager"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Set various options for how the package manager installs modifications, including backups and FTP access"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Package Manager Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Package Manager Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=browse;{session_var}={session_id}"]
+                "Browse Packages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=packageget;get;{session_var}={session_id}"]
+                "Add Packages"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=packages;sa=perms;{session_var}={session_id}"]
+                "File Permissions"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=packages;sa=options;{session_var}={session_id}"]
+                "Options"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Installation Options"
+  div.information.noup
+    "Using the package manager’s FTP functionality is the easiest way to avoid having to manually chmod the files writable through FTP yourself for the package manager to work."
+    br
+    "Here you can set the default values for some fields."
+  div.noup.windowbg
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=packages;sa=options" method="post"]
+      dl.settings
+        dt
+          label [for="pack_server"]
+            strong
+              "FTP Server"
+        dd
+          input#pack_server [name="pack_server" size="#" type="text" value="localhost"]
+        dt
+          label [for="pack_port"]
+            strong
+              "Port"
+        dd
+          input#pack_port [name="pack_port" size="#" type="text" value="#"]
+        dt
+          label [for="pack_user"]
+            strong
+              "Username"
+        dd
+          input#pack_user [name="pack_user" size="#" type="text" value]
+        dt
+          label [for="package_make_backups"]
+            "Create Backup versions of replaced files with a tilde (~) on the end of their names."
+        dd
+          input#package_make_backups [checked name="package_make_backups" type="checkbox" value="#"]
+        dt
+          label [for="package_make_full_backups"]
+            "Create a backup of key SMF files whenever a package is installed or uninstalled."
+        dd
+          input#package_make_full_backups [name="package_make_full_backups" type="checkbox" value="#"]
+      input.button [name="save" type="submit" value="Save"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/paid_subscriptions.txt b/tests/Integration/Http/Snapshot/snapshots/admin/paid_subscriptions.txt
new file mode 100644
index 00000000000..68d4827edb3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/paid_subscriptions.txt
@@ -0,0 +1,60 @@
+status 200
+@ title
+title
+  "Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=paidsubscribe;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Paid Subscriptions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Paid Subscriptions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this section you can add, remove and edit paid subscription methods to your forum."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=paidsubscribe;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Paid Subscriptions"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_paid_enabled
+          span
+            label [for="paid_enabled"]
+              "Enable Paid Subscriptions"
+        dd
+          input#paid_enabled [name="paid_enabled" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/permissions.txt b/tests/Integration/Http/Snapshot/snapshots/admin/permissions.txt
new file mode 100644
index 00000000000..b8aab464324
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/permissions.txt
@@ -0,0 +1,338 @@
+status 200
+@ title
+title
+  "Manage Permissions"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Permissions"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General permissions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Permissions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "General permissions"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Permissions Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Permissions Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                "General permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                "Board permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "Edit profiles"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                "Post moderation"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    form#permissionForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;sa=quick" method="post" name="permissionForm"]
+      div.cat_bar
+        h3.catbg
+          "Manage Permissions"
+      table.table_grid
+        thead
+          tr.title_bar
+            th
+              "Name"
+            th.small_table
+              "Members"
+            th.small_table
+              "Permissions"
+            th.small_table
+              "Modify"
+            th.centercol.table_icon
+              input [onclick="invertAll(this, this.form, 'group');" type="checkbox"]
+        tbody
+          tr.windowbg
+            td
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroup_guests" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              span
+                "Guests"
+            td
+              "N/A"
+            td
+              "#"
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=modify;group=-#"]
+                "Modify"
+            td.centercol
+              input [name="group[]" type="checkbox" value="-#"]
+          tr.windowbg
+            td
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroup_regular_members" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              span
+                "Regular Members"
+            td
+              "#"
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=modify;group=#"]
+                "Modify"
+            td.centercol
+              input [name="group[]" type="checkbox" value="#"]
+          tr.windowbg
+            td
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              span
+                "Administrator"
+            td
+              a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+                "#"
+            td
+              "(all)"
+            td
+            td.centercol
+          tr.windowbg
+            td
+              img.icon [alt="Help" src="{boardurl}/Themes/default/images/blank.png"]
+              span
+                "Global Moderator"
+            td
+              a [href="{boardurl}/index.php?action=moderate;area=viewgroups;sa=members;group=#"]
+                "#"
+            td
+              "#"
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=modify;group=#"]
+                "Modify"
+            td.centercol
+              input [name="group[]" type="checkbox" value="#"]
+          tr.windowbg
+            td
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              span
+                "Moderator"
+            td
+              "N/A"
+            td
+              "#"
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=modify;group=#"]
+                "Modify"
+            td.centercol
+              input [name="group[]" type="checkbox" value="#"]
+      br
+      div.cat_bar
+        h3.catbg
+          a#permissions_panel_link [href="#"]
+            "Advanced Options"
+        span#permissions_panel_toggle.toggle_up [style="display: none;"]
+      div#permissions_panel_advanced.windowbg
+        fieldset
+          legend
+            "With selection"
+          dl.settings
+            dt
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              "Apply pre-defined permission set"
+            dd
+              select [name="predefined"]
+                option [value]
+                  "(Select a pre-defined profile)"
+                option [value="restrict"]
+                  "Restrictive"
+                option [value="standard"]
+                  "Standard"
+                option [value="moderator"]
+                  "Moderator"
+                option [value="maintenance"]
+                  "Maintenance"
+            dt
+              "Set permissions like this group"
+            dd
+              select [name="copy_from"]
+                option [value="empty"]
+                  "(Select a membergroup)"
+                option [value="-#"]
+                  "Guests"
+                option [value="#"]
+                  "Regular Members"
+                option [value="#"]
+                  "Global Moderator"
+                option [value="#"]
+                  "Moderator"
+            dt
+              select [name="add_remove"]
+                option [value="add"]
+                  "Add permission..."
+                option [value="clear"]
+                  "Clear permission..."
+            dd [style="overflow:auto;"]
+              select [name="permissions"]
+                option [value]
+                  "(Select a permission)"
+                option [disabled value]
+                  "[General]"
+                option [value="global/search_posts"]
+                  "Search for posts and topics"
+                option [value="global/view_mlist"]
+                  "View the memberlist and groups"
+                option [value="global/view_stats"]
+                  "View forum statistics"
+                option [value="global/who_view"]
+                  "View Who’s Online page"
+                option [disabled value]
+                  "[Forum administration]"
+                option [value="global/access_mod_center"]
+                  "Access the moderation center"
+                option [value="global/edit_news"]
+                  "Edit news"
+                option [value="global/manage_attachments"]
+                  "Manage attachments and avatars"
+                option [value="global/manage_boards"]
+                  "Manage boards and categories"
+                option [value="global/manage_smileys"]
+                  "Manage smileys and message icons"
+                option [value="global/admin_forum"]
+                  "Administrate forum and database"
+                option [disabled value]
+                  "[Member administration]"
+                option [value="global/issue_warning"]
+                  "Issue warnings to members"
+                option [value="global/manage_bans"]
+                  "Manage ban list"
+                option [value="global/manage_permissions"]
+                  "Manage permissions"
+                option [value="global/moderate_forum"]
+                  "Moderate forum members"
+                option [value="global/send_mail"]
+                  "Send a forum email to members"
+                option [value="global/manage_membergroups"]
+                  "Manage and assign membergroups"
+                option [disabled value]
+                  "[Personal Messaging]"
+                option [value="global/pm_draft"]
+                  "Save drafts of personal messages"
+                option [value="global/pm_read"]
+                  "Read personal messages"
+                option [value="global/pm_send"]
+                  "Send personal messages"
+                option [disabled value]
+                  "[Member Profiles]"
+                option [value="global/profile_blurb_own"]
+                  "Edit personal text (Own profile)"
+                option [value="global/profile_blurb_any"]
+                  "Edit personal text (Any profile)"
+                option [value="global/profile_extra_own"]
+                  "Edit additional profile settings (Own profile)"
+                option [value="global/profile_extra_any"]
+                  "Edit additional profile settings (Any profile)"
+                option [value="global/profile_forum_own"]
+                  "Allow Forum Profile edits (Own profile)"
+                option [value="global/profile_forum_any"]
+                  "Allow Forum Profile edits (Any profile)"
+                option [value="global/profile_gravatar"]
+                  "Choose a Gravatar"
+                option [value="global/profile_remote_avatar"]
+                  "Choose a remotely stored avatar"
+                option [value="global/profile_server_avatar"]
+                  "Select an avatar from the server"
+                option [value="global/profile_signature_own"]
+                  "Edit signature (Own signature)"
+                option [value="global/profile_signature_any"]
+                  "Edit signature (Any signature)"
+                option [value="global/profile_title_own"]
+                  "Edit custom title (Own profile)"
+                option [value="global/profile_title_any"]
+                  "Edit custom title (Any profile)"
+                option [value="global/profile_upload_avatar"]
+                  "Upload an avatar to the server"
+                option [value="global/profile_view"]
+                  "View other members’ profile summary and stats pages"
+                option [value="global/profile_website_own"]
+                  "Edit website (Own profile)"
+                option [value="global/profile_website_any"]
+                  "Edit website (Any profile)"
+                option [value="global/report_user"]
+                  "Report users’ profiles"
+                option [disabled value]
+                  "[Member Accounts]"
+                option [value="global/profile_displayed_name_own"]
+                  "Edit displayed name (Own displayed name)"
+                option [value="global/profile_displayed_name_any"]
+                  "Edit displayed name (Any displayed name)"
+                option [value="global/profile_identity_own"]
+                  "Edit account settings (Own profile)"
+                option [value="global/profile_identity_any"]
+                  "Edit account settings (Any profile)"
+                option [value="global/profile_password_own"]
+                  "Change password (Own profile)"
+                option [value="global/profile_password_any"]
+                  "Change password (Any profile)"
+                option [value="global/profile_remove_own"]
+                  "Delete account (Own account)"
+                option [value="global/profile_remove_any"]
+                  "Delete account (Any account)"
+                option [value="global/view_warning_own"]
+                  "View warning status (Own account)"
+                option [value="global/view_warning_any"]
+                  "View warning status (Any account)"
+                option [disabled value]
+                  "[BBCode]"
+                option [value="global/bbc_html"]
+                  "Use the [html] BBCode"
+        input.button [onclick="return checkSubmit();" type="submit" value="Set permissions"]
+      script
+        | var oPermissionsPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: false, aSwappableContainers: [ 'permissions_panel_advanced' ], aSwapImages: [ { sId: 'permissions_panel_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'permissions_panel_link', msgExpanded: 'Advanced Options', msgCollapsed: 'Advanced Options' } ], oThemeOptions: { bUseThemeSettings: true, sOptionName: 'admin_preferences', sSessionVar: smf_session_var, sSessionId: smf_session_id, sThemeId: '#', sAdditionalVars: ';admin_key=app' } }); function checkSubmit() { if ((document.forms.permissionForm.predefined.value != "" && (document.forms.permissionForm.copy_from.value != "empty" || document.forms.permissionForm.permissions.value != "")) || (document.forms.permissionForm.copy_from.value != "empty" && document.forms.permissionForm.permissions.value != "")) { alert("You can only select one action to modify the permissions"); return false; } if (document.forms.permissionForm.predefined.value == "" && document.forms.permissionForm.copy_from.value == "" && document.forms.permissionForm.permissions.value == "") { alert("No action selected"); return false; } if (document.forms.permissionForm.permissions.value != "" && document.forms.permissionForm.add_remove.value == "deny") return confirm("You are about to deny one or more permissions.\nThis can be dangerous and cause unexpected results if you have not made sure no one is accidentally in the group or groups you are denying permissions to.\n\nAre you sure you want to continue?"); return true; }
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/permissions_board.txt b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_board.txt
new file mode 100644
index 00000000000..63d4cf50265
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_board.txt
@@ -0,0 +1,131 @@
+status 200
+@ title
+title
+  "Board permissions"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Permissions"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Board permissions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Permissions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set which permissions profile a board uses. You can create new permission profiles from the \"Edit Profiles\" menu."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Permissions Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Permissions Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                "General permissions"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                "Board permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "Edit profiles"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                "Post moderation"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;sa=board" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Board permissions"
+    div.information
+      "The list below shows which set of permissions has been assigned to each board on your forum. You may edit the assigned permission profile by either clicking the board name or select \"edit all\" from the bottom of the page. To edit the profile itself simply click the profile name."
+    div.cat_bar
+      h3#board_permissions.catbg.flow_hidden
+        span.floatleft.perm_name
+          "Board name"
+        span.floatleft.perm_profile
+          "Permission Profile"
+    div.windowbg
+      div.sub_bar
+        h3.subbg
+          "Snapshot fixtures"
+      ul.flow_hidden.perm_boards
+        li.flow_hidden
+          span.floatleft.perm_board
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#;rid=permissions;{session_var}={session_id}"]
+              "Snapshot board"
+          span.floatleft.perm_boardprofile
+            a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+              "Default"
+        li.flow_hidden
+          span.floatleft.perm_board
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#;rid=permissions;{session_var}={session_id}"]
+              "- Snapshot child one"
+          span.floatleft.perm_boardprofile
+            a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+              "Default"
+        li.flow_hidden
+          span.floatleft.perm_board
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#;rid=permissions;{session_var}={session_id}"]
+              "- Snapshot child two"
+          span.floatleft.perm_boardprofile
+            a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+              "Default"
+        li.flow_hidden
+          span.floatleft.perm_board
+            a [href="{boardurl}/index.php?action=admin;area=manageboards;sa=board;boardid=#;rid=permissions;{session_var}={session_id}"]
+              "Snapshot empty board"
+          span.floatleft.perm_boardprofile
+            a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+              "Default"
+      a.button [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;edit;{session_var}={session_id}"]
+        "Edit All"
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/permissions_group.txt b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_group.txt
new file mode 100644
index 00000000000..b5ba9b6072f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_group.txt
@@ -0,0 +1,550 @@
+status 200
+@ title
+title
+  "Modify Group"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Permissions"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General permissions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Permissions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "General permissions"
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Permissions Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Permissions Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                "General permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                "Board permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "Edit profiles"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                "Post moderation"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  script
+    | window.smf_usedDeny = false; function warnAboutDeny() { if (window.smf_usedDeny) return confirm("You are about to deny one or more permissions.\nThis can be dangerous and cause unexpected results if you have not made sure no one is accidentally in the group or groups you are denying permissions to.\n\nAre you sure you want to continue?"); else return true; }
+  form#permissions [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;sa=modify#;group=#;pid=#" method="post" name="permissionForm" onsubmit="return warnAboutDeny();"]
+    div.cat_bar
+      h3.catbg
+        "General Permissions for \"Regular Members\""
+    table.half_content.table_grid
+      tbody
+        tr.title_bar
+          th
+          th.smalltext
+            "General"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_search_posts" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Search for posts and topics"
+          td
+          td
+            input [checked="checked" name="perm[global][search_posts]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_view_mlist" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "View the memberlist and groups"
+          td
+          td
+            input [checked="checked" name="perm[global][view_mlist]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_view_stats" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "View forum statistics"
+          td
+          td
+            input [checked="checked" name="perm[global][view_stats]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_who_view" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "View Who’s Online page"
+          td
+          td
+            input [checked="checked" name="perm[global][who_view]" type="checkbox" value="on"]
+        tr.title_bar
+          th
+          th.smalltext
+            "Forum administration"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_access_mod_center" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Access the moderation center"
+          td
+          td
+            input [name="perm[global][access_mod_center]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_edit_news" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit news"
+          td
+          td
+            input [name="perm[global][edit_news]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_attachments" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage attachments and avatars"
+          td
+          td
+            input [name="perm[global][manage_attachments]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_boards" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage boards and categories"
+          td
+          td
+            input [name="perm[global][manage_boards]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_smileys" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage smileys and message icons"
+          td
+          td
+            input [name="perm[global][manage_smileys]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_admin_forum" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Administrate forum and database"
+          td
+          td
+            input [name="perm[global][admin_forum]" type="checkbox" value="on"]
+        tr.title_bar
+          th
+          th.smalltext
+            "Member administration"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_issue_warning" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Issue warnings to members"
+          td
+          td
+            input [name="perm[global][issue_warning]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_bans" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage ban list"
+          td
+          td
+            input [name="perm[global][manage_bans]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_permissions" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage permissions"
+          td
+          td
+            input [name="perm[global][manage_permissions]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_moderate_forum" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Moderate forum members"
+          td
+          td
+            input [name="perm[global][moderate_forum]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_send_mail" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Send a forum email to members"
+          td
+          td
+            input [name="perm[global][send_mail]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_manage_membergroups" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Manage and assign membergroups"
+          td
+          td
+            input [name="perm[global][manage_membergroups]" type="checkbox" value="on"]
+    table.half_content.table_grid
+      tbody
+        tr.title_bar
+          th
+          th.smalltext
+            "Personal Messaging"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_pm_draft" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Save drafts of personal messages"
+          td
+          td
+            input [checked="checked" name="perm[global][pm_draft]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_pm_read" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Read personal messages"
+          td
+          td
+            input [checked="checked" name="perm[global][pm_read]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_pm_send" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Send personal messages"
+          td
+          td
+            input [checked="checked" name="perm[global][pm_send]" type="checkbox" value="on"]
+        tr.title_bar
+          th
+          th.smalltext
+            "Member Profiles"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_blurb" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit personal text"
+          td
+            input#profile_blurb_own_on [checked="checked" name="perm[global][profile_blurb_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_blurb_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_extra" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit additional profile settings"
+          td
+            input#profile_extra_own_on [checked="checked" name="perm[global][profile_extra_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_extra_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_forum" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Allow Forum Profile edits"
+          td
+            input#profile_forum_own_on [checked="checked" name="perm[global][profile_forum_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_forum_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_gravatar" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Choose a Gravatar"
+          td
+          td
+            input [name="perm[global][profile_gravatar]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_remote_avatar" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Choose a remotely stored avatar"
+          td
+          td
+            input [checked="checked" name="perm[global][profile_remote_avatar]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_server_avatar" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Select an avatar from the server"
+          td
+          td
+            input [checked="checked" name="perm[global][profile_server_avatar]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_signature" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit signature"
+          td
+            input#profile_signature_own_on [checked="checked" name="perm[global][profile_signature_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_signature_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_title" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit custom title"
+          td
+            input#profile_title_own_on [name="perm[global][profile_title_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_title_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_upload_avatar" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Upload an avatar to the server"
+          td
+          td
+            input [checked="checked" name="perm[global][profile_upload_avatar]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_view" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "View other members’ profile summary and stats pages"
+          td
+          td
+            input [checked="checked" name="perm[global][profile_view]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_website" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit website"
+          td
+            input#profile_website_own_on [checked="checked" name="perm[global][profile_website_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_website_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_report_user" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Report users’ profiles"
+          td
+          td
+            input [name="perm[global][report_user]" type="checkbox" value="on"]
+        tr.title_bar
+          th
+          th.smalltext
+            "Member Accounts"
+          th
+            "Own"
+          th
+            "Any"
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_displayed_name" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit displayed name"
+          td
+            input#profile_displayed_name_own_on [checked="checked" name="perm[global][profile_displayed_name_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_displayed_name_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_identity" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Edit account settings"
+          td
+            input#profile_identity_own_on [checked="checked" name="perm[global][profile_identity_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_identity_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_password" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Change password"
+          td
+            input#profile_password_own_on [checked="checked" name="perm[global][profile_password_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_password_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_profile_remove" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "Delete account"
+          td
+            input#profile_remove_own_on [checked="checked" name="perm[global][profile_remove_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][profile_remove_any]" type="checkbox" value="on"]
+        tr.windowbg
+          td
+            a.help [href="{boardurl}/index.php?action=helpadmin;help=permissionhelp_view_warning" onclick="return reqOverlayDiv(this.href);"]
+              span.help.main_icons [title="Help"]
+          td.full_width.lefttext
+            "View warning status"
+          td
+            input#view_warning_own_on [name="perm[global][view_warning_own]" type="checkbox" value="on"]
+          td
+            input [name="perm[global][view_warning_any]" type="checkbox" value="on"]
+    br.clear
+    div.padding
+      input.button [type="submit" value="Save changes"]
+    input [name="perm[global][calendar_edit_own]" type="hidden" value="off"]
+    input [name="perm[global][calendar_edit_any]" type="hidden" value="off"]
+    input [name="perm[global][calendar_post]" type="hidden" value="off"]
+    input [name="perm[global][calendar_view]" type="hidden" value="on"]
+    input [name="perm[global][karma_edit]" type="hidden" value="off"]
+    input [name="perm[global][likes_like]" type="hidden" value="off"]
+    input [name="perm[global][mention]" type="hidden" value="off"]
+    input [name="perm[global][bbc_cowsay]" type="hidden" value="off"]
+    input [name="perm[global][bbc_abbr]" type="hidden" value="off"]
+    input [name="perm[global][bbc_acronym]" type="hidden" value="off"]
+    input [name="perm[global][bbc_anchor]" type="hidden" value="off"]
+    input [name="perm[global][bbc_attach]" type="hidden" value="off"]
+    input [name="perm[global][bbc_b]" type="hidden" value="off"]
+    input [name="perm[global][bbc_bdo]" type="hidden" value="off"]
+    input [name="perm[global][bbc_black]" type="hidden" value="off"]
+    input [name="perm[global][bbc_blue]" type="hidden" value="off"]
+    input [name="perm[global][bbc_br]" type="hidden" value="off"]
+    input [name="perm[global][bbc_center]" type="hidden" value="off"]
+    input [name="perm[global][bbc_code]" type="hidden" value="off"]
+    input [name="perm[global][bbc_color]" type="hidden" value="off"]
+    input [name="perm[global][bbc_details]" type="hidden" value="off"]
+    input [name="perm[global][bbc_email]" type="hidden" value="off"]
+    input [name="perm[global][bbc_flash]" type="hidden" value="off"]
+    input [name="perm[global][bbc_float]" type="hidden" value="off"]
+    input [name="perm[global][bbc_ftp]" type="hidden" value="off"]
+    input [name="perm[global][bbc_font]" type="hidden" value="off"]
+    input [name="perm[global][bbc_glow]" type="hidden" value="off"]
+    input [name="perm[global][bbc_green]" type="hidden" value="off"]
+    input [name="perm[global][bbc_h#]" type="hidden" value="off"]
+    input [name="perm[global][bbc_hr]" type="hidden" value="off"]
+    input [name="perm[global][bbc_i]" type="hidden" value="off"]
+    input [name="perm[global][bbc_img]" type="hidden" value="off"]
+    input [name="perm[global][bbc_iurl]" type="hidden" value="off"]
+    input [name="perm[global][bbc_justify]" type="hidden" value="off"]
+    input [name="perm[global][bbc_li]" type="hidden" value="off"]
+    input [name="perm[global][bbc_list]" type="hidden" value="off"]
+    input [name="perm[global][bbc_ltr]" type="hidden" value="off"]
+    input [name="perm[global][bbc_me]" type="hidden" value="off"]
+    input [name="perm[global][bbc_member]" type="hidden" value="off"]
+    input [name="perm[global][bbc_move]" type="hidden" value="off"]
+    input [name="perm[global][bbc_nobbc]" type="hidden" value="off"]
+    input [name="perm[global][bbc_nolink]" type="hidden" value="off"]
+    input [name="perm[global][bbc_php]" type="hidden" value="off"]
+    input [name="perm[global][bbc_pre]" type="hidden" value="off"]
+    input [name="perm[global][bbc_quote]" type="hidden" value="off"]
+    input [name="perm[global][bbc_red]" type="hidden" value="off"]
+    input [name="perm[global][bbc_right]" type="hidden" value="off"]
+    input [name="perm[global][bbc_rtl]" type="hidden" value="off"]
+    input [name="perm[global][bbc_s]" type="hidden" value="off"]
+    input [name="perm[global][bbc_shadow]" type="hidden" value="off"]
+    input [name="perm[global][bbc_size]" type="hidden" value="off"]
+    input [name="perm[global][bbc_spoiler]" type="hidden" value="off"]
+    input [name="perm[global][bbc_sub]" type="hidden" value="off"]
+    input [name="perm[global][bbc_sup]" type="hidden" value="off"]
+    input [name="perm[global][bbc_table]" type="hidden" value="off"]
+    input [name="perm[global][bbc_td]" type="hidden" value="off"]
+    input [name="perm[global][bbc_time]" type="hidden" value="off"]
+    input [name="perm[global][bbc_tr]" type="hidden" value="off"]
+    input [name="perm[global][bbc_tt]" type="hidden" value="off"]
+    input [name="perm[global][bbc_u]" type="hidden" value="off"]
+    input [name="perm[global][bbc_url]" type="hidden" value="off"]
+    input [name="perm[global][bbc_white]" type="hidden" value="off"]
+    input [name="perm[global][bbc_youtube]" type="hidden" value="off"]
+    input [name="perm[global][approve_group_requests]" type="hidden" value="off"]
+    input [name="perm[global][is_not_guest]" type="hidden" value="off"]
+    input [name="perm[board][post_unapproved_replies_own]" type="hidden" value="on"]
+    input [name="perm[board][post_unapproved_replies_any]" type="hidden" value="on"]
+    input [name="perm[board][post_unapproved_topics]" type="hidden" value="on"]
+    input [name="perm[board][approve_posts]" type="hidden" value="off"]
+    input [name="perm[board][post_unapproved_attachments]" type="hidden" value="on"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/permissions_profiles.txt b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_profiles.txt
new file mode 100644
index 00000000000..d4ec34806ca
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_profiles.txt
@@ -0,0 +1,161 @@
+status 200
+@ title
+title
+  "Edit Profiles"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Permissions"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Edit profiles"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Permissions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Permission profiles are assigned to individual boards to allow you to easily manage your security settings. From this area you can create, edit and delete permission profiles."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Permissions Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Permissions Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                "General permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                "Board permissions"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "Edit profiles"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                "Post moderation"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;sa=profiles" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Edit Profiles"
+      table.table_grid
+        thead
+          tr.title_bar
+            th
+              "Profile Name"
+            th
+              "Used By"
+            th.table_icon
+              "Delete"
+        tbody
+          tr.windowbg
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "Default"
+            td
+              "# board(s)"
+            td
+              input [disabled name="delete_profile[]" type="checkbox" value="#"]
+          tr.windowbg
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "No Polls"
+            td
+              "No boards"
+            td
+              input [disabled name="delete_profile[]" type="checkbox" value="#"]
+          tr.windowbg
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "Read Only"
+            td
+              "No boards"
+            td
+              input [disabled name="delete_profile[]" type="checkbox" value="#"]
+          tr.windowbg
+            td
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;pid=#;{session_var}={session_id}"]
+                "Reply Only"
+            td
+              "No boards"
+            td
+              input [disabled name="delete_profile[]" type="checkbox" value="#"]
+      div.flow_auto.padding.righttext
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="delete" type="submit" value="Remove selected"]
+    br
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;sa=profiles" method="post"]
+      div.cat_bar
+        h3.catbg
+          "New Profile"
+      div.windowbg
+        dl.settings
+          dt
+            strong
+              "Profile Name"
+          dd
+            input [name="profile_name" type="text" value]
+          dt
+            strong
+              "Copy Permissions from"
+          dd
+            select [name="copy_from"]
+              option [value="#"]
+                "Default"
+              option [value="#"]
+                "No Polls"
+              option [value="#"]
+                "Read Only"
+              option [value="#"]
+                "Reply Only"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="create" type="submit" value="Create"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/permissions_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_settings.txt
new file mode 100644
index 00000000000..460d60f7848
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/permissions_settings.txt
@@ -0,0 +1,138 @@
+status 200
+@ title
+title
+  "Permission Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Permissions"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=permissions" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Permissions"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set who has permission to change permissions, as well as how sophisticated the permission system should be."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Permissions Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Permissions Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=index;{session_var}={session_id}"]
+                "General permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=board;{session_var}={session_id}"]
+                "Board permissions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=profiles;{session_var}={session_id}"]
+                "Edit profiles"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=permissions;sa=postmod;{session_var}={session_id}"]
+                "Post moderation"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=permissions;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=permissions;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_manage_permissions
+          span
+            label
+              "Membergroups allowed to manage permissions"
+        dd
+          fieldset#manage_permissions
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('manage_permissions').style.display = 'none';document.getElementById('manage_permissions_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="manage_permissions[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="manage_permissions[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'manage_permissions[');" type="checkbox"]
+                span
+                  "Select all"
+          a#manage_permissions_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('manage_permissions').style.display = 'block'; document.getElementById('manage_permissions_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("manage_permissions").style.display = "none"; document.getElementById("manage_permissions_groups_link").style.display = "";
+      hr
+      dl.settings
+        dt
+          a#setting_permission_enable_deny_help [href="{boardurl}/index.php?action=helpadmin;help=permissions_deny" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_permission_enable_deny
+          span
+            label [for="permission_enable_deny"]
+              "Enable the option to deny permissions"
+        dd
+          input#permission_enable_deny [name="permission_enable_deny" type="checkbox" value="#"]
+        dt
+          a#setting_permission_enable_postgroups_help [href="{boardurl}/index.php?action=helpadmin;help=permissions_postgroups" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_permission_enable_postgroups
+          span
+            label [for="permission_enable_postgroups"]
+              "Enable permissions for post count based groups"
+        dd
+          input#permission_enable_postgroups [name="permission_enable_postgroups" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_edit.txt
new file mode 100644
index 00000000000..ab5e08996d1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_edit.txt
@@ -0,0 +1,237 @@
+status 200
+@ title
+title
+  "Modify message"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span
+        strong.nav
+          "Modify message ("
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+      span
+        strong.nav
+          ")"
+@ #content_section
+div#content_section
+  main#main_content_section
+    script
+      | var icon_urls = {"xx":"{boardurl}/Themes/default/images/post/xx.png","thumbup":"{boardurl}/Themes/default/images/post/thumbup.png","thumbdown":"{boardurl}/Themes/default/images/post/thumbdown.png","exclamation":"{boardurl}/Themes/default/images/post/exclamation.png","question":"{boardurl}/Themes/default/images/post/question.png","lamp":"{boardurl}/Themes/default/images/post/lamp.png","smiley":"{boardurl}/Themes/default/images/post/smiley.png","angry":"{boardurl}/Themes/default/images/post/angry.png","cheesy":"{boardurl}/Themes/default/images/post/cheesy.png","grin":"{boardurl}/Themes/default/images/post/grin.png","sad":"{boardurl}/Themes/default/images/post/sad.png","wink":"{boardurl}/Themes/default/images/post/wink.png","poll":"{boardurl}/Themes/default/images/post/poll.png"};
+    form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=post#;start=#;msg=#;{session_var}={session_id};board=#" enctype="multipart/form-data" method="post" name="postmodify" onsubmit="submitonce(this);"]
+      div#preview_section [style="display: none;"]
+        div.cat_bar
+          h3.catbg
+            span#preview_subject
+        div#preview_body.windowbg
+          br
+      br
+      div.cat_bar
+        h3.catbg
+          "Modify message"
+      div#post_area
+        div.noup.roundframe
+          input [name="topic" type="hidden" value="#"]
+          div#errors.noticebox
+            dl
+              dt
+                strong#error_serious
+                  "The message has the following error or errors that must be corrected before continuing:"
+              dd#error_list.error
+                "Warning: this topic has not been posted in for at least {duration}."
+                br
+                "Unless you are sure you want to reply, please consider starting a new topic."
+          div#draft_section.infobox [style="display: none;"]
+            "The contents have been saved as a draft, and will be accessible from the"
+            a [href="{boardurl}/index.php?action=profile;u=#;area=showdrafts"]
+              "Show Drafts area"
+            "of your profile."
+            strong
+              "Please note that all drafts will be automatically deleted after {duration}."
+          dl#post_header
+            dt.clear.pf_subject
+              label#caption_subject [for="subject"]
+                "Subject"
+            dd.pf_subject
+              input#subject [maxlength="#" name="subject" required size="#" type="text" value="{subject}"]
+            dt.clear.pf_icon
+              label#caption_icon [for="icon"]
+                "Message icon"
+            dd.pf_icon
+              select#icon [name="icon" onchange="showimage();"]
+                option [selected value="xx"]
+                  "Standard"
+                option [value="thumbup"]
+                  "Thumb Up"
+                option [value="thumbdown"]
+                  "Thumb Down"
+                option [value="exclamation"]
+                  "Exclamation point"
+                option [value="question"]
+                  "Question mark"
+                option [value="lamp"]
+                  "Lamp"
+                option [value="smiley"]
+                  "Smiley"
+                option [value="angry"]
+                  "Angry"
+                option [value="cheesy"]
+                  "Cheesy"
+                option [value="grin"]
+                  "Grin"
+                option [value="sad"]
+                  "Sad"
+                option [value="wink"]
+                  "Wink"
+                option [value="poll"]
+                  "Poll"
+              img#icons [src="{boardurl}/Themes/default/images/post/xx.png"]
+            dt.clear.pf_modify_reason
+              label#caption_modify_reason [for="modify_reason"]
+                "Reason for editing"
+            dd.pf_modify_reason
+              input#modify_reason [maxlength="#" name="modify_reason" size="#" type="text" value]
+          textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+            "The first post, with [b]bold[/b], [i]italic[/i], [u]underlined[/u] and [s]struck[/s] text. [url=https://www.simplemachines.org]A link[/url] and [email]{email}[/email]. [quote]An unattributed quote.[/quote] [code]echo \"code\";[/code] [list][li]One[/li][li]Two[/li][/list] [color=red]Red[/color] [size=#pt]Sized[/size] [center]Centred[/center] [table][tr][td]A[/td][td]B[/td][/tr][/table] [spoiler]Hidden[/spoiler] [hr] Smileys: :) ;)"
+          input#message_mode [name="message_mode" type="hidden" value="#"]
+          script
+            | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } }, "autofocus": true }; sceditor.create(textarea, options, '#', '#'); });
+          div#post_attachments_area.noup.roundframe
+            div#postAttachment
+              div.padding
+                div
+                  strong
+                    "Attachments"
+                  ":"
+                  input [multiple="multiple" name="attachment[]" type="file"]
+                  input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+                div.smalltext
+                  "Restrictions: {#} per post ("
+                  span.attach_remaining
+                    "#"
+                  "remaining), maximum total size , maximum individual size"
+                div.smalltext
+                  input [name="attach_del[]" type="hidden" value="#"]
+                  "Uncheck the attachments you no longer want attached"
+              div.attachments
+            div#attachment_upload
+              div#drop_zone_ui.centertext
+                div.attach_drop_zone_label
+                  "Click or drag files here to attach them."
+              div#attachment_previews.files
+                div#au-template
+                  div.attachment_preview_wrapper
+                    div.attach-ui.roundframe
+                      a.cancel.delete.floatright.main_icons [data-dz-remove]
+                      div.attached_BBC_width_height
+                        div.attached_BBC_width
+                          label
+                            span
+                              "Insert width (px):"
+                            input [min="#" name="attached_BBC_width" placeholder="auto" type="number" value]
+                        div.attached_BBC_height
+                          label
+                            span
+                              "Insert height (px):"
+                            input [min="#" name="attached_BBC_height" placeholder="auto" type="number" value]
+                    div.attach-preview
+                      img [data-dz-thumbnail]
+                    div.attachment_info
+                      span.name [data-dz-name]
+                      span.error [data-dz-errormessage]
+                      span.size [data-dz-size]
+                      span.message [data-dz-message]
+                      div.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+                        div.bar
+                div.attachment_spacer
+                  div.fallback
+                    input#attachment#.fallback [multiple="multiple" name="attachment[]" type="file"]
+                    "("
+                    a [href="javascript:void(#);" onclick="cleanFileInput('attachment#');"]
+                      "Clear attachments"
+                    ")"
+                    input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+            div#max_files_progress.max_files_progress.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+              div.bar
+              div#max_files_progress_text
+          details#post_options_toggle
+            summary
+              "Other options"
+            ul#post_options.smalltext
+              li
+                input [name="notify" type="hidden" value="#"]
+                label [for="check_notify"]
+                  input#check_notify [checked name="notify" type="checkbox" value="#"]
+                  "Notify me of replies"
+              li
+                input [name="already_locked" type="hidden" value]
+                input [name="lock" type="hidden" value="#"]
+                label [for="check_lock"]
+                  input#check_lock [name="lock" type="checkbox" value="#"]
+                  "Lock this topic"
+              li
+                label [for="check_back"]
+                  input#check_back [checked name="goback" type="checkbox" value="#"]
+                  "Return to this topic"
+              li
+                input [name="already_sticky" type="hidden" value]
+                input [name="sticky" type="hidden" value="#"]
+                label [for="check_sticky"]
+                  input#check_sticky [name="sticky" type="checkbox" value="#"]
+                  "Sticky this topic"
+              li
+                label [for="check_smileys"]
+                  input#check_smileys [name="ns" type="checkbox" value="NS"]
+                  "Do not use smileys"
+              li
+                input [name="move" type="hidden" value="#"]
+                label [for="check_move"]
+                  input#check_move [name="move" type="checkbox" value="#"]
+                  "Move this topic"
+              li
+                label [for="check_announce"]
+                  input#check_announce [name="announce_topic" type="checkbox" value="#"]
+                  "Announce topic"
+              li
+                label [for="approve"]
+                  input#approve [checked name="approve" type="checkbox" value="#"]
+                  "Approve this post"
+          span#post_confirm_buttons
+            span.smalltext
+              "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+            span.post_button_container
+              input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+              input#id_draft [name="id_draft" type="hidden" value="#"]
+              input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+              input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Save"]
+      br.clear
+      input [name="last_msg" type="hidden" value="#"]
+      input#additional_options [name="additional_options" type="hidden" value="#"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="seqnum" type="hidden" value="#"]
+    script
+      | var oPreviewPost = new smc_preview_post({ sPreviewSectionContainerID: "preview_section", sPreviewSubjectContainerID: "preview_subject", sPreviewBodyContainerID: "preview_body", sErrorsContainerID: "errors", sErrorsSeriousContainerID: "error_serious", sErrorsListContainerID: "error_list", sCaptionContainerID: "caption_%ID%", sNewImageContainerID: "image_new_%ID%", sPostBoxContainerID: 'message', bMakePoll: false, sTxtPreviewTitle: 'Preview post', sTxtPreviewFetch: 'Fetching preview...', sSessionVar: '{session_var}', newPostsTemplate:'\n\t\t<span id="new_replies"><' + '/span>\n\t\t<div class="windowbg">\n\t\t\t<div id="msg%PostID%">\n\t\t\t<h# clas(s)="floatleft">\n\t\t\t\tPosted by %PosterName%, %PostTime%&nbsp;&##; <span class="new_posts" id="image_new_%PostID%">New<' + '/span>\n\t\t\t<' + '/h#>\n\t\t\t<br class="clear">\n\t\t\t<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">You are ignoring this user.<a hr'+'ef="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">Show me the post.<' + '/a><' + '/div>\n\t\t\t<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%<' + '/div>\n\t\t\t<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">\n\t\t\t\t<li class="post_modify">\n\t\t\t\t\t<a hr'+'ef="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"><' + '/span>Quote<' + '/a>\n\t\t\t\t<' + '/li>\n\t\t\t<' + '/ul>\n\t\t<' + '/div>', iCurrentBoard: # }); document.getElementById('post_options_toggle').addEventListener('toggle', function () { document.getElementById('additional_options').value = this.open ? '#' : '#'; }); var oEditorID = "message";
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_edit_poll.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_edit_poll.txt
new file mode 100644
index 00000000000..8e7f2c3c55c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_edit_poll.txt
@@ -0,0 +1,126 @@
+status 200
+@ title
+title
+  "Edit Poll"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span [itemprop="name"]
+        "Edit Poll"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#edit_poll
+      form#postmodify [accept-charset="UTF-#" action="{boardurl}/index.php?action=editpoll#;topic=#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+        div.cat_bar
+          h3.catbg
+            "Edit Poll"
+        div
+          div.noup.roundframe
+            input [name="poll" type="hidden" value="#"]
+            fieldset#poll_main
+              legend
+                span
+                  "Question"
+              dl#poll_choices.poll_options.settings [data-more-txt="Add Option" data-option-txt="Option #"]
+                dt
+                  "Question"
+                dd
+                  input [name="question" size="#" type="text" value="Which colour?"]
+                dt
+                  label [for="options-#"]
+                    "Option #"
+                dd
+                  input#options-# [maxlength="#" name="options[#]" size="#" type="text" value="Red"]
+                  "(# vote(s))"
+                dt
+                  label [for="options-#"]
+                    "Option #"
+                dd
+                  input#options-# [maxlength="#" name="options[#]" size="#" type="text" value="Green"]
+                  "(# vote(s))"
+                dt
+                  label [for="options-#"]
+                    "Option #"
+                dd
+                  input#options-# [maxlength="#" name="options[#]" size="#" type="text" value="Blue"]
+                  "(# vote(s))"
+                dt
+                  label [for="options-#"]
+                    "Option #"
+                dd
+                  input#options-# [maxlength="#" name="options[#]" size="#" type="text" value]
+            fieldset#poll_options
+              legend
+                "Poll Options"
+              dl.poll_options.settings
+                dt
+                  label [for="poll_max_votes"]
+                    "Maximum votes per user"
+                dd
+                  input#poll_max_votes [min="#" name="poll_max_votes" type="number" value="#"]
+                dt
+                  label [for="poll_expire"]
+                    "Number of days to run the poll"
+                  br
+                  em.smalltext
+                    "(# for(s) no limit)"
+                dd
+                  input#poll_expire [max="#" min="#" name="poll_expire" type="number" value="#"]
+                dt
+                  label [for="poll_change_vote"]
+                    "Allow users to change vote"
+                dd
+                  input#poll_change_vote [name="poll_change_vote" type="checkbox"]
+                dt
+                  "Result visibility"
+                dd
+                  input#poll_results_anyone [checked name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_anyone"]
+                    "Show the poll’s results to anyone."
+                  br
+                  input#poll_results_voted [name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_voted"]
+                    "Only show the results after someone has voted."
+                  br
+                  input#poll_results_expire [disabled name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_expire"]
+                    "Only show the results after the poll has expired."
+            fieldset#poll_reset
+              legend
+                "Reset vote count"
+              input [name="resetVoteCount" type="checkbox" value="on"]
+              "Check this if you want to reset all vote counts to #."
+            input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Save"]
+        input [name="seqnum" type="hidden" value="#"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings.txt
new file mode 100644
index 00000000000..18d980980bf
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings.txt
@@ -0,0 +1,232 @@
+status 200
+@ title
+title
+  "Post Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Posts and Topics"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Post Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=posts_and_topics" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Posts and Topics"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set everything related to posts and posting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Posts and Topics Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Posts and Topics Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}"]
+                "Post Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}"]
+                "Censored Words"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}"]
+                "Topic Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}"]
+                "Drafts"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=postsettings;save;sa=posts" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Post Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_removeNestedQuotes_help [href="{boardurl}/index.php?action=helpadmin;help=removeNestedQuotes" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_removeNestedQuotes
+          span
+            label [for="removeNestedQuotes"]
+              "Remove nested quotes when quoting"
+        dd
+          input#removeNestedQuotes [name="removeNestedQuotes" type="checkbox" value="#"]
+        dt
+          a#setting_disable_wysiwyg_help [href="{boardurl}/index.php?action=helpadmin;help=disable_wysiwyg" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_disable_wysiwyg
+          span
+            label [for="disable_wysiwyg"]
+              "Disable WYSIWYG editor"
+        dd
+          input#disable_wysiwyg [name="disable_wysiwyg" type="checkbox" value="#"]
+        dt
+          a#setting_additional_options_collapsable
+          span
+            label [for="additional_options_collapsable"]
+              "Enable collapsible additional post options"
+        dd
+          input#additional_options_collapsable [checked name="additional_options_collapsable" type="checkbox" value="#"]
+        dt
+          a#setting_guest_post_no_email
+          span
+            label [for="guest_post_no_email"]
+              "Do not show the email field for guests’ posts"
+        dd
+          input#guest_post_no_email [name="guest_post_no_email" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_max_messageLength
+          span
+            label [for="max_messageLength"]
+              "Maximum allowed post size"
+            br
+            span.smalltext
+              "# for(s) no max."
+        dd
+          input#max_messageLength [min="#" name="max_messageLength" size="#" type="number" value="#"]
+          "characters"
+        dt
+          a#setting_topicSummaryPosts_help [href="{boardurl}/index.php?action=helpadmin;help=topicSummaryPosts" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_topicSummaryPosts
+          span
+            label [for="topicSummaryPosts"]
+              "Posts to show on topic summary"
+        dd
+          input#topicSummaryPosts [min="#" name="topicSummaryPosts" size="#" type="number" value="#"]
+          "posts"
+      hr
+      dl.settings
+        dt
+          a#setting_spamWaitTime_help [href="{boardurl}/index.php?action=helpadmin;help=spamWaitTime" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_spamWaitTime
+          span
+            label [for="spamWaitTime"]
+              "Time required between posts from the same IP"
+        dd
+          input#spamWaitTime [min="#" name="spamWaitTime" size="#" type="number" value="#"]
+          "seconds"
+        dt
+          a#setting_edit_wait_time_help [href="{boardurl}/index.php?action=helpadmin;help=edit_wait_time" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_edit_wait_time
+          span
+            label [for="edit_wait_time"]
+              "Courtesy edit wait time"
+        dd
+          input#edit_wait_time [min="#" name="edit_wait_time" size="#" type="number" value="#"]
+          "seconds"
+        dt
+          a#setting_edit_disable_time_help [href="{boardurl}/index.php?action=helpadmin;help=edit_disable_time" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_edit_disable_time
+          span
+            label [for="edit_disable_time"]
+              "Maximum time after posting to allow edit"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#edit_disable_time [min="#" name="edit_disable_time" size="#" type="number" value="#"]
+          "minutes"
+      hr
+      dl.settings
+        dt
+          a#setting_max_image_width_help [href="{boardurl}/index.php?action=helpadmin;help=max_image_width" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_max_image_width
+          span
+            label [for="max_image_width"]
+              "Max display width of posted or attached images"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#max_image_width [min="#" name="max_image_width" size="#" type="number" value="#"]
+        dt
+          a#setting_max_image_height_help [href="{boardurl}/index.php?action=helpadmin;help=max_image_height" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_max_image_height
+          span
+            label [for="max_image_height"]
+              "Max display height of posted or attached images"
+            br
+            span.smalltext
+              "(# for(s) no limit)"
+        dd
+          input#max_image_height [min="#" name="max_image_height" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_preview_characters_help [href="{boardurl}/index.php?action=helpadmin;help=preview_characters" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_preview_characters
+          span
+            label [for="preview_characters"]
+              "Maximum length of last/first post preview"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#preview_characters [min="#" name="preview_characters" size="#" type="number" value="#"]
+          "characters"
+        dt
+          a#setting_quote_expand_help [href="{boardurl}/index.php?action=helpadmin;help=quote_expand" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_quote_expand
+          span
+            label [for="quote_expand"]
+              "Minimum quote height to add an expand link on large quotes"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#quote_expand [min="#" name="quote_expand" size="#" type="number" value="#"]
+          "pixels"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_censor.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_censor.txt
new file mode 100644
index 00000000000..fe6552d7348
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_censor.txt
@@ -0,0 +1,142 @@
+status 200
+@ title
+title
+  "Censored Words"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Posts and Topics"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Censored Words"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=posts_and_topics" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Posts and Topics"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Due to the public nature of forums there may be some words that you wish to prohibit being posted by users of your forum. You can enter any words below that you wish to be censored whenever used by a member."
+    br
+    "Clear a box to remove that word from the censor."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Posts and Topics Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Posts and Topics Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}"]
+                "Post Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}"]
+                "Censored Words"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}"]
+                "Topic Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}"]
+                "Drafts"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=postsettings;sa=censor" method="post"]
+    div#section_header.cat_bar
+      h3.catbg
+        "Censored Words"
+    div.windowbg
+      p
+        "Put the word to be censored on the left, and what to change it to on the right."
+      div.block
+        input [name="censor_vulgar[]" size="#" type="text"]
+        "=>"
+        input [name="censor_proper[]" size="#" type="text"]
+      div#moreCensoredWords
+      div#moreCensoredWords_link.block.hidden
+        a.button [href="#" onclick="addNewWord(); return false;"]
+          "Add another word"
+        br
+      script
+        | document.getElementById("moreCensoredWords_link").classList.remove('hidden');
+      hr
+      dl.settings
+        dt
+          strong
+            label [for="allow_no_censored"]
+              "Allow users to turn off word censoring"
+        dd
+          input#allow_no_censored [name="allow_no_censored" type="checkbox" value="#"]
+        dt
+          strong
+            label [for="censorWholeWord_check"]
+              "Check only whole words"
+        dd
+          input#censorWholeWord_check [name="censorWholeWord" type="checkbox" value="#"]
+        dt
+          strong
+            label [for="censorIgnoreCase_check"]
+              "Ignore case when censoring"
+        dd
+          input#censorIgnoreCase_check [checked name="censorIgnoreCase" type="checkbox" value="#"]
+        dt
+          a#spoofdetector_censor_help [href="{boardurl}/index.php?action=helpadmin;help=spoofdetector_censor" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          strong
+            label [for="spoofdetector_censor_check"]
+              "Detect character spoofing when censoring"
+          br
+          span.smalltext
+            "Prevents attempts to bypass the word censor by using visually similar Unicode characters."
+            br
+            "If enabling this causes some words to be censored incorrectly, click the help icon for solutions."
+        dd
+          input#spoofdetector_censor_check [name="spoofdetector_censor" type="checkbox" value="#"]
+      input.button [name="save_censor" type="submit" value="Save"]
+    div.cat_bar
+      h3.catbg
+        "Test censored words"
+    div.windowbg
+      p.centertext
+        input [name="censortest" type="text" value]
+        input.button [type="submit" value="Test"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_drafts.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_drafts.txt
new file mode 100644
index 00000000000..45381c31f21
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_drafts.txt
@@ -0,0 +1,148 @@
+status 200
+@ title
+title
+  "Draft Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Posts and Topics"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Drafts"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=posts_and_topics" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Posts and Topics"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set all settings involving drafts."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Posts and Topics Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Posts and Topics Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}"]
+                "Post Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}"]
+                "Censored Words"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}"]
+                "Topic Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}"]
+                "Drafts"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Draft Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_drafts_post_enabled
+          span
+            label [for="drafts_post_enabled"]
+              "Enable the saving of Post drafts"
+        dd
+          input#drafts_post_enabled [checked name="drafts_post_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_drafts_pm_enabled
+          span
+            label [for="drafts_pm_enabled"]
+              "Enable the saving of PM drafts"
+        dd
+          input#drafts_pm_enabled [checked name="drafts_pm_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_drafts_show_saved_enabled
+          span
+            label [for="drafts_show_saved_enabled"]
+              "Enable the selection of drafts from the posting screen"
+            br
+            span.smalltext
+              "This will allow the user to select and load appropriate drafts from the posting screen. The user must also have the proper permissions"
+        dd
+          input#drafts_show_saved_enabled [checked name="drafts_show_saved_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_drafts_keep_days
+          span
+            label [for="drafts_keep_days"]
+              "Maximum number of days to keep a draft"
+            br
+            span.smalltext
+              "Enter # to(s) keep drafts indefinitely"
+        dd
+          input#drafts_keep_days [min="#" name="drafts_keep_days" size="#" type="number" value="#"]
+          "days"
+      hr
+      dl.settings
+        dt
+          a#setting_drafts_autosave_enabled
+          span
+            label [for="drafts_autosave_enabled"]
+              "Enable automatic saving of drafts"
+            br
+            span.smalltext
+              "This will automatically save user drafts in the background on a given frequency. The user must also have the proper permissions"
+        dd
+          input#drafts_autosave_enabled [checked name="drafts_autosave_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_drafts_autosave_frequency
+          span
+            label [for="drafts_autosave_frequency"]
+              "How often should drafts be autosaved?"
+            br
+            span.smalltext
+              "The minimum allowable value is {duration}"
+        dd
+          input#drafts_autosave_frequency [min="#" name="drafts_autosave_frequency" size="#" type="number" value="#"]
+          "seconds"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | function toggle() { $("#drafts_autosave_frequency").prop("disabled", !($("#drafts_autosave_enabled").prop("checked"))); }; toggle(); $("#drafts_autosave_enabled").click(function() { toggle(); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_topics.txt b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_topics.txt
new file mode 100644
index 00000000000..45270089a24
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/post_settings_topics.txt
@@ -0,0 +1,240 @@
+status 200
+@ title
+title
+  "Topic Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Posts and Topics"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Topic Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=posts_and_topics" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage Posts and Topics"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can set all settings involving topics."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Manage Posts and Topics Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Manage Posts and Topics Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=posts;{session_var}={session_id}"]
+                "Post Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=censor;{session_var}={session_id}"]
+                "Censored Words"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=postsettings;sa=topics;{session_var}={session_id}"]
+                "Topic Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=postsettings;sa=drafts;{session_var}={session_id}"]
+                "Drafts"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=postsettings;save;sa=topics" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Topic Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_enableParticipation_help [href="{boardurl}/index.php?action=helpadmin;help=enableParticipation" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableParticipation
+          span
+            label [for="enableParticipation"]
+              "Enable participation icons"
+        dd
+          input#enableParticipation [checked name="enableParticipation" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_oldTopicDays_help [href="{boardurl}/index.php?action=helpadmin;help=oldTopicDays" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_oldTopicDays
+          span
+            label [for="oldTopicDays"]
+              "Time before topic is warned as old on reply"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#oldTopicDays [min="#" name="oldTopicDays" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_defaultMaxTopics
+          span
+            label [for="defaultMaxTopics"]
+              "Number of topics per page in the message index"
+        dd
+          input#defaultMaxTopics [min="#" name="defaultMaxTopics" size="#" type="number" value="#"]
+          "topics"
+        dt
+          a#setting_defaultMaxMessages
+          span
+            label [for="defaultMaxMessages"]
+              "Number of posts per page in a topic page"
+        dd
+          input#defaultMaxMessages [min="#" name="defaultMaxMessages" size="#" type="number" value="#"]
+          "posts"
+        dt
+          a#setting_disable_print_topic
+          span
+            label [for="disable_print_topic"]
+              "Disable print topic feature"
+        dd
+          input#disable_print_topic [name="disable_print_topic" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_enableAllMessages_help [href="{boardurl}/index.php?action=helpadmin;help=enableAllMessages" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableAllMessages
+          span
+            label [for="enableAllMessages"]
+              "Max topic size to show \"All\" posts"
+            br
+            span.smalltext
+              "# to(s) never show \"All\""
+        dd
+          input#enableAllMessages [min="#" name="enableAllMessages" size="#" type="number" value="#"]
+          "posts"
+        dt
+          a#setting_disableCustomPerPage_help [href="{boardurl}/index.php?action=helpadmin;help=disableCustomPerPage" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_disableCustomPerPage
+          span
+            label [for="disableCustomPerPage"]
+              "Disable user defined topic/message count per page"
+        dd
+          input#disableCustomPerPage [name="disableCustomPerPage" type="checkbox" value="#"]
+        dt
+          a#setting_enablePreviousNext_help [href="{boardurl}/index.php?action=helpadmin;help=enablePreviousNext" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enablePreviousNext
+          span
+            label [for="enablePreviousNext"]
+              "Enable previous/next topic links"
+        dd
+          input#enablePreviousNext [checked name="enablePreviousNext" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_subject_toggle
+          span
+            label [for="subject_toggle"]
+              "Show subjects in topics."
+        dd
+          input#subject_toggle [name="subject_toggle" type="checkbox" value="#"]
+        dt
+          a#setting_show_modify
+          span
+            label [for="show_modify"]
+              "Show last modification date on modified posts"
+        dd
+          input#show_modify [checked name="show_modify" type="checkbox" value="#"]
+        dt
+          a#setting_show_profile_buttons
+          span
+            label [for="show_profile_buttons"]
+              "Show view profile button under post"
+        dd
+          input#show_profile_buttons [checked name="show_profile_buttons" type="checkbox" value="#"]
+        dt
+          a#setting_show_user_images
+          span
+            label [for="show_user_images"]
+              "Show user avatars in message view"
+        dd
+          input#show_user_images [checked name="show_user_images" type="checkbox" value="#"]
+        dt
+          a#setting_show_blurb
+          span
+            label [for="show_blurb"]
+              "Show personal text in message view"
+        dd
+          input#show_blurb [checked name="show_blurb" type="checkbox" value="#"]
+        dt
+          a#setting_hide_post_group
+          span
+            label [for="hide_post_group"]
+              "Hide post group titles for grouped members"
+            br
+            span.smalltext
+              "Enabling this will not display a member’s post group title on the message view if they are assigned to a non-post based group."
+        dd
+          input#hide_post_group [name="hide_post_group" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_preview_characters_help [href="{boardurl}/index.php?action=helpadmin;help=preview_characters" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_preview_characters
+          span
+            label [for="preview_characters"]
+              "Maximum length of last/first post preview"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#preview_characters [min="#" name="preview_characters" size="#" type="number" value="#"]
+          "characters"
+        dt
+          a#setting_message_index_preview_first
+          span
+            label [for="message_index_preview_first"]
+              "When using post previews, show the text of the first post"
+            br
+            span.smalltext
+              "Leave unchecked to show the text of the last post instead"
+        dd
+          input#message_index_preview_first [name="message_index_preview_first" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_account.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_account.txt
new file mode 100644
index 00000000000..484144b93e9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_account.txt
@@ -0,0 +1,300 @@
+status 200
+@ title
+title
+  "Profile - Account Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=account" itemprop="item"]
+        span [itemprop="name"]
+          "Account Settings"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.chosen.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=account;u=#" autocomplete="off" enctype="multipart/form-data" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Profile"
+        p.information
+          "These are your account settings. This page holds all critical information that identifies you on this forum. For security reasons, you will need to enter your (current) password to make changes to this information."
+        div.roundframe
+          dl.settings
+            dt
+              strong
+                "Username"
+            dd
+              "snapshot_member"
+              a.button.smalltext [href="{boardurl}/index.php?action=profile;u=#;area=account;changeusername"]
+                "change"
+            dt
+              strong
+                label [for="real_name"]
+                  "Name"
+              br
+              span.smalltext
+                "This is the displayed name that people will see."
+            dd
+              input#real_name [maxlength="#" name="real_name" size="#" type="text" value="Snapshot Member"]
+            dt
+              strong
+                label [for="date_registered"]
+                  "Date registered"
+            dd
+              input#date_registered [name="date_registered" size="#" type="date" value="{date}"]
+            dt
+              strong
+                label [for="posts"]
+                  "Posts"
+            dd
+              input#posts [max="#" min="#" name="posts" size="#" type="number" value="#"]
+            dt
+              strong
+                label [for="lngfile"]
+                  "Preferred language"
+            dd
+              select#lngfile [name="lngfile"]
+                option [selected value="en_US"]
+                  "English (US)"
+          hr
+          dl.settings
+            dt
+              label [for="id_group"]
+                strong
+                  "Primary Membergroup"
+              br
+              span.smalltext
+                a [href="{boardurl}/index.php?action=helpadmin;help=moderator_why_missing" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons
+                  "why isn’t moderator here?"
+            dd
+              select#id_group [name="id_group"]
+                option [selected value="#"]
+                  "(no primary membergroup)"
+                option [value="#"]
+                  "Administrator"
+                option [value="#"]
+                  "Global Moderator"
+            dt
+              strong
+                "Additional Membergroups"
+            dd
+              span#additional_groupsList
+                input [name="additional_groups[]" type="hidden" value="#"]
+                label [for="additional_groups-#"]
+                  input#additional_groups-# [name="additional_groups[]" type="checkbox" value="#"]
+                  "Administrator"
+                br
+                label [for="additional_groups-#"]
+                  input#additional_groups-# [name="additional_groups[]" type="checkbox" value="#"]
+                  "Global Moderator"
+                br
+              a#additional_groupsLink.toggle_down [href="javascript:void(#);" onclick="document.getElementById('additional_groupsList').style.display = 'block'; document.getElementById('additional_groupsLink').style.display = 'none'; return false;" style="display: none;"]
+                "show additional groups"
+              script
+                | document.getElementById("additional_groupsList").style.display = "none"; document.getElementById("additional_groupsLink").style.display = "";
+          hr
+          dl.settings
+            dt
+              strong
+                "Email address"
+              br
+              span.smalltext
+                "This must be a valid email address."
+            dd
+              "{email}"
+              a.button.smalltext [href="{boardurl}/index.php?action=profile;u=#;area=account;change_email"]
+                "change"
+            dt
+              strong
+                label [for="show_online"]
+                  "Show others my online status"
+            dd
+              input [name="show_online" type="hidden" value="#"]
+              input#show_online [checked name="show_online" type="checkbox" value="#"]
+          hr
+          dl.settings
+            dt
+              strong
+                "Two-Factor Authentication"
+              br
+              div.smalltext
+                "#FA allows you to have a secondary layer of security by assigning a dedicated device without which no one would be able to log into your account even if they have your username and password"
+            dd
+              "Two-Factor Authentication is disabled"
+          hr
+          dl.settings
+            dt
+              strong
+                "Choose Password"
+              br
+              span.smalltext
+                "For best security, you should use eight or more characters. It is a good idea to use a phrase with multiple words."
+            dd
+              a.button.smalltext [href="{boardurl}/index.php?action=profile;u=#;area=account;change_password"]
+                "change"
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="secret_question"]
+                  "Secret Question"
+              br
+              span.smalltext
+                "To help retrieve your password, enter a question here with an answer that"
+                strong
+                  "only"
+                "you know."
+            dd
+              input#secret_question [name="secret_question" size="#" type="text" value]
+            dt
+              strong
+                label [for="secret_answer"]
+                  "Answer"
+              br
+              span.smalltext
+                "Choose carefully. You would not want someone guessing your answer!"
+            dd
+              input#secret_answer [name="secret_answer" size="#" type="text" value]
+              span.smalltext
+                a [href="{boardurl}/index.php?action=helpadmin;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons
+                  "why is this blank?"
+          input.button.floatright [name="save" type="submit" value="Change profile"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="account"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_delete.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_delete.txt
new file mode 100644
index 00000000000..38e382f0cd5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_delete.txt
@@ -0,0 +1,184 @@
+status 200
+@ title
+title
+  "Delete this account"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=deleteaccount" itemprop="item"]
+        span [itemprop="name"]
+          "Delete this account"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.chosen.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=deleteaccount;save" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Delete this account"
+        p.information
+          "From this page you can delete this user’s account and posts."
+        div.windowbg
+          div.errorbox
+            "Warning - These actions are irreversible!"
+          fieldset
+            label [for="deleteVotes"]
+              input#deleteVotes [name="deleteVotes" type="checkbox" value="#"]
+              "Remove poll votes made by this member"
+          fieldset
+            label [for="deletePosts"]
+              input#deletePosts [name="deletePosts" type="checkbox" value="#"]
+              "Remove posts made by this member"
+            select [name="remove_type"]
+              option [value="posts"]
+                "Replies to Topics"
+              option [value="topics"]
+                "Topics and Posts"
+          fieldset
+            label [for="deleteAccount"]
+              input#deleteAccount [name="deleteAccount" onclick="if (this.checked) return confirm('Are you completely sure you want to delete this account?');" type="checkbox" value="#"]
+              "Delete this member’s account"
+            br
+            label [for="anonymize"]
+              input#anonymize [name="anonymize" type="checkbox" value="#"]
+              "Anonymize personally identifying information when account is deleted"
+          div
+            input.button.floatright [type="submit" value="Delete"]
+            input [name="{token_var}" type="hidden" value="{hash}"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="u" type="hidden" value="#"]
+            input [name="sa" type="hidden" value="deleteaccount"]
+        br
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_forum.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_forum.txt
new file mode 100644
index 00000000000..33e63a8d1a6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_forum.txt
@@ -0,0 +1,367 @@
+status 200
+@ title
+title
+  "Profile - Forum Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=forumprofile" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Profile"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.chosen.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=forumprofile;u=#" enctype="multipart/form-data" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Profile"
+        p.information
+          "You can change your personal information on this page. This information will be displayed throughout {forum_name}. If you are not comfortable with sharing some information, simply skip it - nothing here is required."
+        div.roundframe
+          dl.settings
+            dt
+              strong#personal_picture
+                label [for="avatar_upload_box"]
+                  "Personalized picture"
+              input#avatar_choice_none [checked="checked" name="avatar_choice" type="radio" value="none"]
+              label [for="avatar_choice_none"]
+                "No avatar"
+              br
+              input#avatar_choice_server_stored [name="avatar_choice" type="radio" value="server_stored"]
+              label [for="avatar_choice_server_stored"]
+                "Choose avatar from gallery"
+              br
+              input#avatar_choice_external [name="avatar_choice" type="radio" value="external"]
+              label [for="avatar_choice_external"]
+                "Specify avatar by URL"
+              br
+              input#avatar_choice_upload [name="avatar_choice" type="radio" value="upload"]
+              label [for="avatar_choice_upload"]
+                "Upload an avatar"
+              br
+              input#avatar_choice_gravatar [name="avatar_choice" type="radio" value="gravatar"]
+              label [for="avatar_choice_gravatar"]
+                "Use my Gravatar"
+              span.smalltext
+                a [href="{boardurl}/index.php?action=helpadmin;help=gravatar" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons
+            dd
+              div#avatar_server_stored [data-avatar-choice="server_stored"]
+                div
+                  select#cat [data-avatardir="{boardurl}/avatars/" name="cat" size="#"]
+                    option [selected value="blank.png"]
+                      "(no pic)"
+                    optgroup [label="[Oxygen]"]
+                      option [value="Oxygen/beagle.png"]
+                        "beagle"
+                      option [value="Oxygen/bug.png"]
+                        "bug"
+                      option [value="Oxygen/cards.png"]
+                        "cards"
+                      option [value="Oxygen/cookie.png"]
+                        "cookie"
+                      option [value="Oxygen/dice.png"]
+                        "dice"
+                      option [value="Oxygen/Earl.png"]
+                        "Earl"
+                      option [value="Oxygen/flish.png"]
+                        "flish"
+                      option [value="Oxygen/game.png"]
+                        "game"
+                      option [value="Oxygen/golf.png"]
+                        "golf"
+                      option [value="Oxygen/hardware.png"]
+                        "hardware"
+                      option [value="Oxygen/invisible-user.png"]
+                        "invisible-user"
+                      option [value="Oxygen/lense.png"]
+                        "lense"
+                      option [value="Oxygen/love.png"]
+                        "love"
+                      option [value="Oxygen/megaphone.png"]
+                        "megaphone"
+                      option [value="Oxygen/pi.png"]
+                        "pi"
+                      option [value="Oxygen/scope.png"]
+                        "scope"
+                      option [value="Oxygen/smiley.png"]
+                        "smiley"
+                      option [value="Oxygen/tea.png"]
+                        "tea"
+                      option [value="Oxygen/wine.png"]
+                        "wine"
+                    option [value="default.png"]
+                      "default"
+                div.edit_avatar_img
+                  img#avatar [alt src="{boardurl}/avatars/blank.png"]
+              div#avatar_external [data-avatar-choice="external"]
+                div.smalltext
+                  "Specify your own avatar by URL. (e.g.:"
+                  em
+                    "https://www.example.com/mypic.png"
+                  ")"
+                input [name="userpicpersonal" size="#" type="text" value="http://"]
+                br
+              div#avatar_upload [data-avatar-choice="upload"]
+                input#avatar_upload_box [accept="image/gif, image/jpeg, image/jpg, image/png, image/svg+xml, image/webp" name="attachment" size="#" type="file" value]
+                div.smalltext
+                  "Max size: #px by #px"
+              div#avatar_gravatar [data-avatar-choice="gravatar" data-clear-email]
+                div.smalltext
+                  "Normally, the Gravatar used will be based on your regular email address but if you wish to use the Gravatar from a different email account to your regular forum account (say, the Gravatar from your blog’s email account), you can enter that email address here."
+                input#gravatarEmail [name="gravatarEmail" size="#" type="text" value="http://"]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="personal_text"]
+                  "Personal text"
+            dd
+              input#personal_text [maxlength="#" name="personal_text" size="#" type="text" value="Personal text for Snapshot Member"]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="birthdate"]
+                  "Date of birth"
+            dd
+              input#birthdate [name="birthdate" size="#" type="date" value]
+            dt
+              strong
+                label [for="usertitle"]
+                  "Custom title"
+            dd
+              input#usertitle [maxlength="#" name="usertitle" size="#" type="text" value]
+            dt#current_signature [style="display:none"]
+              strong
+                "Current signature"
+            dd#current_signature_display [style="display:none"]
+              hr
+            dt#preview_signature [style="display:none"]
+              strong
+                "Signature preview"
+            dd#preview_signature_display [style="display:none"]
+              hr
+            dt
+              label [for="signature"]
+                strong
+                  "Signature"
+              br
+              span.smalltext
+                "Signatures are displayed at the bottom of each post or personal message. BBCode and smileys may be used in your signature."
+              br
+            dd
+              textarea#signature.editor [cols="#" data-max-length="#" name="signature" rows="#"]
+                "A signature with [b]bold[/b] text."
+              br
+              span.smalltext
+                "Max characters: #; characters remaining:"
+                span#signatureLeft
+                  "#"
+              br
+              input#preview_button.button.floatright [name="preview_signature" type="button" value="Preview signature"]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="website_title"]
+                  "Website title"
+              br
+              span.smalltext
+                "This must be included if you specify a URL below."
+            dd
+              input#website_title [name="website_title" size="#" type="text" value="Example"]
+            dt
+              strong
+                label [for="website_url"]
+                  "Website URL"
+              br
+              span.smalltext
+                "This must be a complete URL."
+            dd
+              input#website_url [name="website_url" size="#" type="url" value="https://www.example.com"]
+          hr
+          dl.settings
+            dt
+              strong
+                "ICQ"
+              br
+              span.smalltext
+                "This is your ICQ number."
+            dd
+              input#customfield[cust_icq] [maxlength="#" name="customfield[cust_icq]" size="#" type="text" value]
+            dt
+              strong
+                "Skype"
+              br
+              span.smalltext
+                "Your Skype username"
+            dd
+              input#customfield[cust_skype] [maxlength="#" name="customfield[cust_skype]" size="#" type="text" value]
+            dt
+              strong
+                "Location"
+              br
+              span.smalltext
+                "Geographic location."
+            dd
+              input#customfield[cust_loca] [maxlength="#" name="customfield[cust_loca]" size="#" type="text" value]
+            dt
+              strong
+                "Gender"
+              br
+              span.smalltext
+                "Your gender."
+            dd
+              fieldset
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [checked name="customfield[cust_gender]" type="radio" value="#"]
+                  "None"
+                br
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [name="customfield[cust_gender]" type="radio" value="#"]
+                  "Male"
+                br
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [name="customfield[cust_gender]" type="radio" value="#"]
+                  "Female"
+                br
+          input.button.floatright [name="save" type="submit" value="Change profile"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="forumprofile"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_issue_warning.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_issue_warning.txt
new file mode 100644
index 00000000000..03bc21b88fc
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_issue_warning.txt
@@ -0,0 +1,251 @@
+status 200
+@ title
+title
+  "Issue a Warning"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=issuewarning" itemprop="item"]
+        span [itemprop="name"]
+          "Issue a Warning"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.chosen.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      script
+        | var notification_templates = ["Snapshot Member,\n\nYou have received a warning for spamming. Please cease these activities and abide by the forum rules otherwise we will take further action.\n\nIf you wish to discuss this, please get in touch with an administrator.\n\nRegards,\nThe {forum_name} Team.","Snapshot Member,\n\nYou have received a warning for posting offensive material. Please cease these activities and abide by the forum rules otherwise we will take further action.\n\nIf you wish to discuss this, please get in touch with an administrator.\n\nRegards,\nThe {forum_name} Team.","Snapshot Member,\n\nYou have received a warning for insulting other users and/or staff members. Please cease these activities and abide by the forum rules otherwise we will take further action.\n\nIf you wish to discuss this, please get in touch with an administrator.\n\nRegards,\nThe {forum_name} Team."]; var level_effects = {"#":"None.","#":"User will be added to moderator watch list.","#":"All users posts will be moderated.","#":"User will not be able to post."};
+      form.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;u=#;area=issuewarning" method="post"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Issue a Warning"
+        p.information
+          "From this section you can adjust the user’s warning level and issue them with a written warning if necessary. You can also track their warning history and view the effects of their current warning level as determined by the administrator."
+        div.windowbg
+          dl.settings
+            dt
+              strong
+                "Member Name"
+            dd
+              strong
+                "Snapshot Member"
+            dt
+              strong
+                "Warning Level"
+            dd
+              "#%"
+              input#warning_level [max="#" min="#" name="warning_level" step="#" type="range" value="#"]
+              "#%"
+              div.clear_left
+                "Result:"
+                output [data-format="{#}%" for="warning_level" name="cur_level"]
+                  "#% (None.)"
+            dt
+              strong
+                "Reason for Warning"
+              br
+              span.smalltext
+                "This is required and will be logged."
+            dd
+              input#warn_reason [name="warn_reason" size="#" type="text" value]
+          hr
+          div#box_preview [style="display:none"]
+            dl.settings
+              dt
+                strong
+                  "Preview"
+              dd#body_preview
+            hr
+          dl.settings
+            dt
+              strong
+                label [for="warn_notify"]
+                  "Send a Notification"
+            dd
+              input#warn_notify [name="warn_notify" type="checkbox"]
+            dt
+              strong
+                label [for="warn_sub"]
+                  "Notification Subject"
+            dd
+              input#warn_sub [name="warn_sub" size="#" type="text" value="You have received a warning"]
+            dt
+              strong
+                label [for="warn_temp"]
+                  "Notification Message"
+            dd
+              select#warn_temp [disabled name="warn_temp"]
+                option [value="-#"]
+                  "Select template:"
+                option [disabled value="-#"]
+                  "------------------------------"
+                option [value="#"]
+                  "Spamming"
+                option [value="#"]
+                  "Posting Offensive Material"
+                option [value="#"]
+                  "Insulting Users/Staff"
+              span#new_template_link [hidden]
+                a.button.floatnone [href="{boardurl}/index.php?action=moderate;area=warnings;sa=templateedit;tid=#" rel="noopener" target="_blank"]
+                  "New Template"
+              br
+              textarea#warn_body [cols="#" name="warn_body" rows="#"]
+          div.righttext
+            input [name="{token_var}" type="hidden" value="{hash}"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input#preview_button.button [name="preview" type="button" value="Preview"]
+            input.button [name="save" type="submit" value="Issue Warning"]
+      div.cat_bar
+        h3.catbg
+          "Previous Warnings"
+      table#view_warnings.table_grid
+        thead
+          tr.title_bar
+            th#header_view_warnings_issued_by.issued_by [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=issuewarning;sa=user;u=#;sort=issued_by" rel="nofollow"]
+                "Issued By"
+            th#header_view_warnings_log_time.log_time [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=issuewarning;sa=user;u=#;sort=log_time;desc" rel="nofollow"]
+                "Time"
+                span.main_icons.sort_up
+            th#header_view_warnings_reason.reason [scope="col"]
+              "Reason"
+            th#header_view_warnings_level.level [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=issuewarning;sa=user;u=#;sort=level" rel="nofollow"]
+                "Points"
+        tbody
+          tr.windowbg
+            td.centertext [colspan="#"]
+              "No warnings have been issued."
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_permissions.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_permissions.txt
new file mode 100644
index 00000000000..c92827b076a
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_permissions.txt
@@ -0,0 +1,401 @@
+status 200
+@ title
+title
+  "Show Permissions"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=permissions" itemprop="item"]
+        span [itemprop="name"]
+          "Show Permissions"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.chosen.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg.profile_hd
+          "Show Permissions"
+      div.information
+        "This section allows you to view all permissions for this member (denied permissions are"
+        del.error
+          "struck out"
+        ")."
+      div#permissions.flow_hidden
+        div.tborder
+          div.cat_bar
+            h3.catbg
+              "General Permissions"
+          table.table_grid
+            thead
+              tr.title_bar
+                th.half_table.lefttext
+                  "Permission (denied permissions are"
+                  del.error
+                    "struck out"
+                  ")"
+                th.half_table.lefttext
+                  "Permission status"
+            tbody
+              tr.windowbg
+                td [title="calendar_view"]
+                  "View the calendar"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="pm_draft"]
+                  "Save drafts of personal messages"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="pm_read"]
+                  "Read personal messages"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="pm_send"]
+                  "Send personal messages"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_blurb_own"]
+                  "Edit personal text - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_displayed_name_own"]
+                  "Edit displayed name - Own displayed name"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_extra_own"]
+                  "Edit additional profile settings - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_forum_own"]
+                  "Allow Forum Profile edits - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_identity_own"]
+                  "Edit account settings - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_password_own"]
+                  "Change password - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_remote_avatar"]
+                  "Choose a remotely stored avatar"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_remove_own"]
+                  "Delete account - Own account"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_server_avatar"]
+                  "Select an avatar from the server"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_signature_own"]
+                  "Edit signature - Own signature"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_upload_avatar"]
+                  "Upload an avatar to the server"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_view"]
+                  "View other members’ profile summary and stats pages"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="profile_website_own"]
+                  "Edit website - Own profile"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="search_posts"]
+                  "Search for posts and topics"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="view_mlist"]
+                  "View the memberlist and groups"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="view_stats"]
+                  "View forum statistics"
+                td.smalltext
+                  "Given by Regular Members"
+              tr.windowbg
+                td [title="who_view"]
+                  "View Who’s Online page"
+                td.smalltext
+                  "Given by Regular Members"
+        br
+        form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;u=#;area=permissions#board_permissions" method="post"]
+          div.cat_bar
+            h3.catbg
+              span#board_permissions
+                "Board specific permissions for"
+              select [name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();"]
+                option [selected value="#"]
+                  "All boards"
+        table.table_grid
+          thead
+            tr.title_bar
+              th.half_table.lefttext
+                "Permission (denied permissions are"
+                del.error
+                  "struck out"
+                ")"
+              th.half_table.lefttext
+                "Permission status"
+          tbody
+            tr.windowbg
+              td [title="delete_own"]
+                "Delete posts - Own post"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="lock_own"]
+                "Lock topics - Own topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="modify_own"]
+                "Modify posts - Own post"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_add_own"]
+                "Add poll to topics - Own topics"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_edit_own"]
+                "Edit polls - Own poll"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_lock_own"]
+                "Lock polls - Own poll"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_post"]
+                "Post polls"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_view"]
+                "View polls"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="poll_vote"]
+                "Vote in polls"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_attachment"]
+                "Post attachments"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_draft"]
+                "Save drafts of new posts"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_new"]
+                "Post new topics"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_reply_any"]
+                "Post replies to topics - Any topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_reply_own"]
+                "Post replies to topics - Own topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_unapproved_attachments"]
+                "Post attachments, but hide until approved"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_unapproved_replies_any"]
+                "Post replies to topics, but hide until approved - Any topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_unapproved_replies_own"]
+                "Post replies to topics, but hide until approved - Own topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="post_unapproved_topics"]
+                "Post new topics, but hide until approved"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="remove_own"]
+                "Remove topics - Own topic"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="report_any"]
+                "Report posts to the moderators"
+              td.smalltext
+                "Given by Regular Members"
+            tr.windowbg
+              td [title="view_attachments"]
+                "View attachments"
+              td.smalltext
+                "Given by Regular Members"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_summary.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_summary.txt
new file mode 100644
index 00000000000..b447233f155
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_summary.txt
@@ -0,0 +1,238 @@
+status 200
+@ title
+title
+  "{member}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Member"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="mailto:{email}" rel="nofollow" title="{email}"]
+                span.mail.main_icons [title="Email"]
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+            br
+            a [href="{boardurl}/index.php?action=buddy;u=#;{session_var}={session_id}"]
+              "Add to buddy list"
+          a.infolinks [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+            "Send PM"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Username"
+            dd
+              "snapshot_member"
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Email"
+            dd
+              a [href="mailto:{email}"]
+                "{email}"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Member"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "IP"
+            dd
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;searchip=#;u=#"]
+                "#"
+            dt
+              "Hostname"
+            dd
+              "localhost"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_activity.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_activity.txt
new file mode 100644
index 00000000000..8dc33dbf36d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_activity.txt
@@ -0,0 +1,223 @@
+status 200
+@ title
+title
+  "Track Activity of User Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking" itemprop="item"]
+        span [itemprop="name"]
+          "Track User"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking;sa=activity" itemprop="item"]
+        span [itemprop="name"]
+          "Activity"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.chosen.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Tracking"
+      p.information
+        "This section allows you to review certain profile actions performed on this member’s profile as well as track their IP address and login history."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Tracking Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Tracking Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                    "Activity"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                    "IP Address"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                    "Logins"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "View IPs used by Snapshot Member"
+      div#tracking.windowbg
+        dl.noborder.settings
+          dt
+            "Most recent IP address"
+          dd
+            a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;searchip=#;u=#"]
+              "#"
+          dt
+            "IPs used in recent posts"
+          dd
+            a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;searchip=#;u=#"]
+              "#"
+          dt
+            "IPs used in error messages"
+          snapshot-ignored [selector="#tracking dd:nth-of-type(n+#)"]
+          dt
+            "Members possibly in the same range"
+          snapshot-ignored [selector="#tracking dd:nth-of-type(n+#)"]
+      div.cat_bar
+        h3.catbg
+          "Error messages by Snapshot Member"
+      div.flow_hidden.information
+        div.additional_row
+          "Below is a list of all the recent errors that this user has generated/experienced."
+      table#track_user_list.table_grid
+        thead
+          tr.title_bar
+            th#header_track_user_list_ip_address.ip_address [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=user;u=#;sort=ip_address" rel="nofollow"]
+                "IP address"
+            th#header_track_user_list_message.message [scope="col"]
+              "Message"
+            th#header_track_user_list_date.date [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=user;u=#;sort=date;desc" rel="nofollow"]
+                "Date"
+                span.main_icons.sort_up
+        snapshot-ignored [selector="table.table_grid tbody"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_edits.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_edits.txt
new file mode 100644
index 00000000000..8dc33dbf36d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_edits.txt
@@ -0,0 +1,223 @@
+status 200
+@ title
+title
+  "Track Activity of User Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking" itemprop="item"]
+        span [itemprop="name"]
+          "Track User"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking;sa=activity" itemprop="item"]
+        span [itemprop="name"]
+          "Activity"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.chosen.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Tracking"
+      p.information
+        "This section allows you to review certain profile actions performed on this member’s profile as well as track their IP address and login history."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Tracking Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Tracking Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                    "Activity"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                    "IP Address"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                    "Logins"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "View IPs used by Snapshot Member"
+      div#tracking.windowbg
+        dl.noborder.settings
+          dt
+            "Most recent IP address"
+          dd
+            a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;searchip=#;u=#"]
+              "#"
+          dt
+            "IPs used in recent posts"
+          dd
+            a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;searchip=#;u=#"]
+              "#"
+          dt
+            "IPs used in error messages"
+          snapshot-ignored [selector="#tracking dd:nth-of-type(n+#)"]
+          dt
+            "Members possibly in the same range"
+          snapshot-ignored [selector="#tracking dd:nth-of-type(n+#)"]
+      div.cat_bar
+        h3.catbg
+          "Error messages by Snapshot Member"
+      div.flow_hidden.information
+        div.additional_row
+          "Below is a list of all the recent errors that this user has generated/experienced."
+      table#track_user_list.table_grid
+        thead
+          tr.title_bar
+            th#header_track_user_list_ip_address.ip_address [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=user;u=#;sort=ip_address" rel="nofollow"]
+                "IP address"
+            th#header_track_user_list_message.message [scope="col"]
+              "Message"
+            th#header_track_user_list_date.date [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=user;u=#;sort=date;desc" rel="nofollow"]
+                "Date"
+                span.main_icons.sort_up
+        snapshot-ignored [selector="table.table_grid tbody"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_ip.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_ip.txt
new file mode 100644
index 00000000000..ed646b734e7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_ip.txt
@@ -0,0 +1,269 @@
+status 200
+@ title
+title
+  "Track IP Address of User {member}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking" itemprop="item"]
+        span [itemprop="name"]
+          "Track User"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking;sa=ip" itemprop="item"]
+        span [itemprop="name"]
+          "IP Address"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.chosen.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Tracking"
+      p.information
+        "This section allows you to review certain profile actions performed on this member’s profile as well as track their IP address and login history."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Tracking Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Tracking Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                    "Activity"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                    "IP Address"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                    "Logins"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "IP Address"
+      div.windowbg
+        form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#" method="post"]
+          dl.settings
+            dt
+              label [for="searchip"]
+                strong
+                  "Enter IP (range)"
+            dd
+              input#searchip [name="searchip" type="text" value="#"]
+          input.button [type="submit" value="IP Address"]
+      br
+      div.cat_bar
+        h3.catbg
+          "Look up # on(s) a regional whois-server"
+      div.windowbg
+        a [href="https://wq.apnic.net/apnic-bin/whois.pl?searchtext=#" rel="noopener" target="_blank"]
+          "APNIC (Asia Pacific region)"
+        br
+        a [href="https://whois.arin.net/rest/ip/#" rel="noopener" target="_blank"]
+          "ARIN (North America, a portion of the Caribbean and sub-Saharan Africa)"
+        br
+        a [href="https://query.milacnic.lacnic.net/search?id=#" rel="noopener" target="_blank"]
+          "LACNIC (Latin American and Caribbean region)"
+        br
+        a [href="https://apps.db.ripe.net/db-web-ui/query?searchtext=#" rel="noopener" target="_blank"]
+          "RIPE (Europe, the Middle East and parts of Africa and Asia)"
+        br
+      br
+      div.cat_bar
+        h3.catbg
+          "Members from IP range #"
+      table.table_grid
+        thead
+          tr.title_bar
+            th [scope="col"]
+              "IP address"
+            th [scope="col"]
+              "Display name"
+        snapshot-ignored [selector="table.table_grid tbody"]
+      br
+      div.cat_bar
+        h3.catbg
+          "Messages posted from IP range #"
+      div.flow_hidden.information
+        div.additional_row
+          "Below is a list of all messages posted from this IP (range)."
+      table#track_message_list.table_grid
+        thead
+          tr.title_bar
+            th#header_track_message_list_ip_address.ip_address [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#;sort=ip_address" rel="nofollow"]
+                "IP address"
+            th#header_track_message_list_poster.poster [scope="col"]
+              "Poster"
+            th#header_track_message_list_subject.subject [scope="col"]
+              "Subject"
+            th#header_track_message_list_date.date [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#;sort=date;desc" rel="nofollow"]
+                "Date"
+                span.main_icons.sort_up
+        snapshot-ignored [selector="table.table_grid tbody"]
+      br
+      div.cat_bar
+        h3.catbg
+          "Error messages from IP range #"
+      div.flow_hidden.information
+        div.additional_row
+          "Below is a list of all recent error messages generated by this IP (range)."
+      table#track_user_list.table_grid
+        thead
+          tr.title_bar
+            th#header_track_user_list_ip_address#.ip_address2 [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#;sort=ip_address#" rel="nofollow"]
+                "IP address"
+            th#header_track_user_list_display_name.display_name [scope="col"]
+              "Display name"
+            th#header_track_user_list_message.message [scope="col"]
+              "Message"
+            th#header_track_user_list_date#.date2 [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#;searchip=#;sort=date#;desc" rel="nofollow"]
+                "Date"
+                span.main_icons.sort_up
+        snapshot-ignored [selector="table.table_grid tbody"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_logins.txt b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_logins.txt
new file mode 100644
index 00000000000..b800c2d3870
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/profile_track_logins.txt
@@ -0,0 +1,197 @@
+status 200
+@ title
+title
+  "Track Logins of User Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking" itemprop="item"]
+        span [itemprop="name"]
+          "Track User"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=tracking;sa=logins" itemprop="item"]
+        span [itemprop="name"]
+          "Logins"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.permissions.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=permissions;u=#"]
+                      span.main_icons.permissions
+                      "Show Permissions"
+                  li.subsections
+                    a.chosen.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                          "Activity"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                          "IP Address"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=reporttm;{session_var}={session_id};u=#"]
+                      span.main_icons.warning
+                      "Report this member"
+                  li
+                    a.profile_menu_icon.warning [href="{boardurl}/index.php?action=profile;area=issuewarning;u=#"]
+                      span.main_icons.warning
+                      "Issue a Warning"
+                  li
+                    a.ban.profile_menu_icon [href="{boardurl}/index.php?action=admin;area=ban;sa=add;u=#"]
+                      span.ban.main_icons
+                      "Ban this user"
+                  li
+                    a.packages.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=getprofiledata;u=#"]
+                      span.main_icons.packages
+                      "Download profile data"
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Tracking"
+      p.information
+        "This section allows you to review certain profile actions performed on this member’s profile as well as track their IP address and login history."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Tracking Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Tracking Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=activity;u=#"]
+                    "Activity"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=tracking;sa=ip;u=#"]
+                    "IP Address"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                    "Logins"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Logins"
+      div.flow_hidden.information
+        div.additional_row
+          "Below is a list of all times this account was logged into."
+      table#track_logins_list.table_grid
+        thead
+          tr.title_bar
+            th#header_track_logins_list_time.time [scope="col"]
+              "Date"
+            th#header_track_logins_list_ip.ip [scope="col"]
+              "IP address"
+        snapshot-ignored [selector="table.table_grid tbody"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/registration.txt b/tests/Integration/Http/Snapshot/snapshots/admin/registration.txt
new file mode 100644
index 00000000000..5f2bed10f53
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/registration.txt
@@ -0,0 +1,147 @@
+status 200
+@ title
+title
+  "Registration"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Register new member"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=registrations" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Registration"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here you can register new members into the forum, and if desired, email them their details."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Registration Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Registration Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                "Register new member"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                "Registration Agreement"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                "Privacy Policy"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                "Set reserved names"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    form#postForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=regcenter" method="post" name="postForm"]
+      div.cat_bar
+        h3.catbg
+          "Register new member"
+      div#register_screen.windowbg
+        dl#admin_register_form.register_form
+          dt
+            strong
+              label [for="user_input"]
+                "New Username"
+            span.smalltext
+              "Username for the new member"
+          dd
+            input#user_input [maxlength="#" name="user" size="#" type="text"]
+          dt
+            strong
+              label [for="email_input"]
+                "Email Address"
+            span.smalltext
+              "Email address of the member"
+          dd
+            input#email_input [name="email" size="#" type="email"]
+          dt
+            strong
+              label [for="password_input"]
+                "Password"
+            span.smalltext
+              "Password for new member"
+          dd
+            input#password_input [name="password" onchange="onCheckChange();" size="#" type="password"]
+          dt
+            strong
+              label [for="group_select"]
+                "Primary Membergroup"
+            span.smalltext
+              "Primary membergroup new member will belong to"
+          dd
+            select#group_select [name="group"]
+              option [value="#"]
+                "(no primary membergroup)"
+              option [value="#"]
+                "Administrator"
+              option [value="#"]
+                "Global Moderator"
+          dt
+            strong
+              label [for="emailPassword_check"]
+                "Email new password to user"
+            span.smalltext
+              "Email address required even if unchecked"
+          dd
+            input#emailPassword_check [checked disabled name="emailPassword" type="checkbox"]
+          dt
+            strong
+              label [for="emailActivate_check"]
+                "Require user to activate the account"
+          dd
+            input#emailActivate_check [name="emailActivate" onclick="onCheckChange();" type="checkbox"]
+        div.flow_auto
+          input.button [name="regSubmit" type="submit" value="Sign up"]
+          input [name="sa" type="hidden" value="register"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+  br.clear
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/registration_agreement.txt b/tests/Integration/Http/Snapshot/snapshots/admin/registration_agreement.txt
new file mode 100644
index 00000000000..f38be05f800
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/registration_agreement.txt
@@ -0,0 +1,100 @@
+status 200
+@ title
+title
+  "Registration Agreement"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration Agreement"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=registrations" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Registration"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This agreement is shown when a user registers an account on this forum and has to be accepted before users can continue registration."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Registration Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Registration Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                "Register new member"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                "Registration Agreement"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                "Privacy Policy"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                "Set reserved names"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    div.cat_bar
+      h3.catbg
+        "Registration Agreement"
+    div#registration_agreement.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=regcenter" method="post"]
+        textarea#agreement [cols="#" name="agreement" rows="#"]
+          "You agree, through your use of this forum, that you will not post any material which is false, defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person's privacy, adult material, or otherwise in violation of any International or United States Federal law. You also agree not to post any copyrighted material unless you own the copyright or you have written consent from the owner of the copyrighted material. Spam, flooding, advertisements, chain letters, pyramid schemes, and solicitations are also forbidden on this forum. Note that it is impossible for the staff or the owners of this forum to confirm the validity of posts. Please remember that we do not actively monitor the posted messages, and as such, are not responsible for the content contained within. We do not warrant the accuracy, completeness, or usefulness of any information presented. The posted messages express the views of the author, and not necessarily the views of this forum, its staff, its subsidiaries, or this forum's owner. Anyone who feels that a posted message is objectionable is encouraged to notify an administrator or moderator of this forum immediately. The staff and the owner of this forum reserve the right to remove objectionable content, within a reasonable time frame, if they determine that removal is necessary. This is a manual process, however, please realize that they may not be able to remove or edit particular messages immediately. This policy applies to member profile information as well. You remain solely responsible for the content of your posted messages. Furthermore, you agree to indemnify and hold harmless the owners of this forum, any related websites to this forum, its staff, and its subsidiaries. The owners of this forum also reserve the right to reveal your identity (or any other related information collected on this service) in the event of a formal complaint or legal action arising from any situation caused by your use of this forum. You have the ability, as you register, to choose your username. We advise that you keep the name appropriate. With this user account you are about to register, you agree to never give your password out to another person except an administrator, for your protection and for validity reasons. You also agree to NEVER use another person's account for any reason. We also HIGHLY recommend you use a complex and unique password for your account, to prevent account theft. After you register and login to this forum, you will be able to fill out a detailed profile. It is your responsibility to present clean and accurate information. Any information the forum owner or staff determines to be inaccurate or vulgar in nature will be removed, with or without prior notice. Appropriate sanctions may be applicable. Please note that with each post, your IP address is recorded, in the event that you need to be banned from this forum or your ISP contacted. This will only happen in the event of a major violation of this agreement. Also note that the software places a cookie, a text file containing bits of information (such as your username and password), in your browser's cache. This is ONLY used to keep you logged in/out. The software does not collect or send any other form of information to your computer."
+        div.information
+          span
+            "Last updated: Never."
+        input.button [onclick="return resetAgreementConfirm()" type="submit" value="Save"]
+        input [name="agree_lang" type="hidden" value="en_US"]
+        input [name="sa" type="hidden" value="agreement"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        script
+          | function resetAgreementConfirm() { return true; }
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/registration_policy.txt b/tests/Integration/Http/Snapshot/snapshots/admin/registration_policy.txt
new file mode 100644
index 00000000000..4aa9ca575ef
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/registration_policy.txt
@@ -0,0 +1,99 @@
+status 200
+@ title
+title
+  "Privacy Policy"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Privacy Policy"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=registrations" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Registration"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This privacy policy describes the promises you make to your users regarding how you will use their personal data. It is shown when a user registers an account on this forum and has to be accepted before the user can continue registration."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Registration Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Registration Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                "Register new member"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                "Registration Agreement"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                "Privacy Policy"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                "Set reserved names"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Privacy Policy"
+  div#privacy_policy.windowbg
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=regcenter" method="post"]
+      textarea#agreement [cols="#" name="policy" rows="#"]
+      div.information
+        span
+          "Last updated: Never."
+      div.righttext
+        input.button [onclick="return resetPolicyConfirm()" type="submit" value="Save"]
+        input [name="policy_lang" type="hidden" value="en_US"]
+        input [name="sa" type="hidden" value="policy"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        script
+          | function resetPolicyConfirm() { return true; }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/registration_reserved.txt b/tests/Integration/Http/Snapshot/snapshots/admin/registration_reserved.txt
new file mode 100644
index 00000000000..9e1830f60ee
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/registration_reserved.txt
@@ -0,0 +1,117 @@
+status 200
+@ title
+title
+  "Set reserved names"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Set reserved names"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=registrations" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Registration"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Reserved names will keep members from registering certain usernames or using these words in their displayed names. Choose the options you wish to use from the bottom before submitting."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Registration Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Registration Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                "Register new member"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                "Registration Agreement"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                "Privacy Policy"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                "Set reserved names"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=regcenter" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Set reserved names"
+    div.windowbg
+      h4
+        "One reserved word per line."
+      textarea#reserved [cols="#" name="reserved" rows="#"]
+        "Admin Webmaster Guest root"
+      dl.settings
+        dt
+          label [for="matchword"]
+            "Match whole name only. If unchecked, search within names."
+        dd
+          input#matchword [name="matchword" type="checkbox"]
+        dt
+          label [for="matchcase"]
+            "Match case. If unchecked, search will be case insensitive."
+        dd
+          input#matchcase [checked name="matchcase" type="checkbox"]
+        dt
+          label [for="matchuser"]
+            "Check username."
+        dd
+          input#matchuser [checked name="matchuser" type="checkbox"]
+        dt
+          label [for="matchname"]
+            "Check display name."
+        dd
+          input#matchname [checked name="matchname" type="checkbox"]
+      div.flow_auto
+        input.button [name="save_reserved_names" type="submit" value="Save"]
+        input [name="sa" type="hidden" value="reservednames"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/registration_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/registration_settings.txt
new file mode 100644
index 00000000000..ef2d729ae81
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/registration_settings.txt
@@ -0,0 +1,193 @@
+status 200
+@ title
+title
+  "Registration"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Registration"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=registrations" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Registration"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Here you can change a variety of settings related to registration of new members."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Registration Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Registration Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=register;{session_var}={session_id}"]
+                "Register new member"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=agreement;{session_var}={session_id}"]
+                "Registration Agreement"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=policy;{session_var}={session_id}"]
+                "Privacy Policy"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=regcenter;sa=reservednames;{session_var}={session_id}"]
+                "Set reserved names"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=regcenter;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=regcenter;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_registration_method_help [href="{boardurl}/index.php?action=helpadmin;help=registration_method" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_registration_method
+          span
+            label [for="registration_method"]
+              "Method of registration employed for new members"
+        dd
+          select#registration_method [name="registration_method" size="#"]
+            option [value="#"]
+              "Immediate Registration"
+            option [value="#"]
+              "Email Activation"
+            option [value="#"]
+              "Admin Approval"
+            option [value="#"]
+              "Registration Disabled"
+        dt
+          a#setting_send_welcomeEmail_help [href="{boardurl}/index.php?action=helpadmin;help=send_welcomeEmail" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_send_welcomeEmail
+          span
+            label [for="send_welcomeEmail"]
+              "Send welcome email to new members"
+        dd
+          input#send_welcomeEmail [checked name="send_welcomeEmail" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_requireAgreement_help [href="{boardurl}/index.php?action=helpadmin;help=requireAgreement" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_requireAgreement
+          span
+            label [for="requireAgreement"]
+              "Require new members to accept the registration agreement"
+        dd
+          input#requireAgreement [checked name="requireAgreement" type="checkbox" value="#"]
+        dt
+          a#setting_requirePolicyAgreement_help [href="{boardurl}/index.php?action=helpadmin;help=requirePolicyAgreement" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_requirePolicyAgreement
+          span
+            label [for="requirePolicyAgreement"]
+              "Require new members to accept the privacy policy"
+        dd
+          input#requirePolicyAgreement [name="requirePolicyAgreement" type="checkbox" value="#"]
+        dd.alert
+      hr
+      dl.settings
+        dt
+          a#setting_coppaAge_help [href="{boardurl}/index.php?action=helpadmin;help=coppaAge" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_coppaAge
+          span
+            label [for="coppaAge"]
+              "Age below which to apply registration restrictions"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#coppaAge [min="#" name="coppaAge" onchange="checkCoppa();" size="#" type="number" value="#"]
+        dt
+          a#setting_coppaType_help [href="{boardurl}/index.php?action=helpadmin;help=coppaType" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_coppaType
+          span
+            label [for="coppaType"]
+              "Action to take when a user below minimum age registers"
+        dd
+          select#coppaType [name="coppaType" onchange="checkCoppa();" size="#"]
+            option [value="#"]
+              "Reject their registration"
+            option [value="#"]
+              "Require parent/guardian approval"
+        dt
+          a#setting_coppaPost_help [href="{boardurl}/index.php?action=helpadmin;help=coppaPost" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_coppaPost
+          span
+            label [for="coppaPost"]
+              "Postal address to which approval forms should be sent"
+            br
+            span.smalltext
+              "Only applies if age restriction is in place"
+        dd
+          textarea#coppaPost [cols="#" name="coppaPost" rows="#"]
+        dt
+          a#setting_coppaFax
+          span
+            label [for="coppaFax"]
+              "Fax number to which approval forms should be faxed"
+        dd
+          input#coppaFax [name="coppaFax" type="text" value]
+        dt
+          a#setting_coppaPhone
+          span
+            label [for="coppaPhone"]
+              "Contact number for parents to contact with age restriction queries"
+        dd
+          input#coppaPhone [name="coppaPhone" type="text" value]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | function checkCoppa() { var coppaDisabled = document.getElementById('coppaAge').value == #; document.getElementById('coppaType').disabled = coppaDisabled; var disableContacts = coppaDisabled || document.getElementById('coppaType').options[document.getElementById('coppaType').selectedIndex].value != #; document.getElementById('coppaPost').disabled = disableContacts; document.getElementById('coppaFax').disabled = disableContacts; document.getElementById('coppaPhone').disabled = disableContacts; } checkCoppa();
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/reports.txt b/tests/Integration/Http/Snapshot/snapshots/admin/reports.txt
new file mode 100644
index 00000000000..2dcf5ffb7b3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/reports.txt
@@ -0,0 +1,86 @@
+status 200
+@ title
+title
+  "Reports"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=reports;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Reports"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Reports"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this section you can generate a variety of reports to assist in the administration of your forum. Simply follow the steps below to select the option of your choice."
+  div.cat_bar
+    h3.catbg
+      "Select type of Report"
+  form.option_form.windowbg [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=reports" method="post"]
+    label
+      input [checked name="rt" type="radio" value="boards"]
+      strong
+        "Boards"
+      p
+        "Reports showing the current settings and access levels for each of boards on your forum."
+    label
+      input [name="rt" type="radio" value="board_access"]
+      strong
+        "Board Access"
+      p
+        "Report on which membergroup has access to which boards on your forum."
+    label
+      input [name="rt" type="radio" value="board_perms"]
+      strong
+        "Board Permissions"
+      p
+        "Generate reports showing permissions each membergroup has across the different boards in your forum."
+    label
+      input [name="rt" type="radio" value="member_groups"]
+      strong
+        "Membergroups"
+      p
+        "Report showing the settings for each membergroup on your forum."
+    label
+      input [name="rt" type="radio" value="group_perms"]
+      strong
+        "Group Permissions"
+      p
+        "Report on the permissions each membergroup has in the forum."
+    label
+      input [name="rt" type="radio" value="staff"]
+      strong
+        "Staff"
+      p
+        "This report summarizes all members who currently have positions of authority on the forum."
+    input.button [name="continue" type="submit" value="Continue"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_task_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_task_edit.txt
new file mode 100644
index 00000000000..2b452fc8f07
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_task_edit.txt
@@ -0,0 +1,87 @@
+status 200
+@ title
+title
+  "Edit Scheduled Task"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;save;tid=#" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Edit Scheduled Task"
+    div.information
+      em
+        "Note the start time should be the offset against the current server time. Current server time is: {date}"
+    div.windowbg
+      dl.settings
+        dt
+          strong
+            "Task Name"
+        dd
+          "Daily Maintenance"
+          br
+          span.smalltext
+            "Runs essential daily maintenance on the forum - should not be disabled."
+        dt
+          strong
+            label [for="regularity"]
+              "Interval"
+        dd
+          "Repeat task every"
+          input#regularity [min="#" name="regularity" onchange="if (this.value < #) this.value = #;" size="#" type="number" value="#"]
+          select [name="unit"]
+            option [value="m"]
+              "minute(s)"
+            option [value="h"]
+              "hour(s)"
+            option [selected value="d"]
+              "day(s)"
+            option [value="w"]
+              "week(s)"
+        dt
+          strong
+            label [for="start_time"]
+              "Start time"
+          br
+          span.smalltext
+            "Time when the first instance of the day should start"
+        dd
+          input#start_time [name="offset" type="time" value="#:#"]
+        dt
+          strong
+            label [for="enabled"]
+              "Enabled"
+        dd
+          input#enabled [checked name="enabled" type="checkbox"]
+      div.righttext
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input.button [name="save" type="submit" value="Save Changes"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks.txt b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks.txt
new file mode 100644
index 00000000000..0fbfdd7adc1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks.txt
@@ -0,0 +1,245 @@
+status 200
+@ title
+title
+  "Scheduled Tasks"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=scheduledtasks" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Scheduled Tasks"
+    div.flow_hidden.information
+      div.additional_row
+        strong
+          "Note:"
+        "All times given below are"
+        em
+          "server time"
+        "and do not take into account any time offsets set up within SMF."
+    table#scheduled_tasks.table_grid
+      thead
+        tr.title_bar
+          th#header_scheduled_tasks_name.name [scope="col" style="width: #%;"]
+            "Task Name"
+          th#header_scheduled_tasks_next_due.next_due [scope="col"]
+            "Next Due"
+          th#header_scheduled_tasks_regularity.regularity [scope="col"]
+            "Regularity"
+          th#header_scheduled_tasks_run_now.centercol.run_now [scope="col" style="width: #%;"]
+            "Run now"
+          th#header_scheduled_tasks_enabled.centercol.enabled [scope="col" style="width: #%;"]
+            "Enabled"
+      tbody
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Daily Maintenance"
+            br
+            span.smalltext
+              "Runs essential daily maintenance on the forum - should not be disabled."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Daily Notification summary"
+            br
+            span.smalltext
+              "Emails out the daily digest for notification subscribers."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Fetch Simple Machines files"
+            br
+            span.smalltext
+              "Retrieves javascript files containing notifications of updates and other information."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Mark Boards as Read"
+            br
+            span.smalltext
+              "Marks boards as read for users inactive longer than the number of days defined in the"
+              a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings#markread_title"]
+                "Read Logs settings"
+              "in the admin panel."
+          td.next_due.smalltext
+            "N/A"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Paid Subscription Checks"
+            br
+            span.smalltext
+              "Sends out any necessary paid subscription reminders and removes expired member subscriptions."
+          td.next_due.smalltext
+            "N/A"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Remove MOVED: redirection topics"
+            br
+            span.smalltext
+              "Deletes \"MOVED:\" topic notifications as specified when the moved notice was created."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Remove old drafts"
+            br
+            span.smalltext
+              "Deletes drafts older than the number of days defined in the draft settings in the admin panel."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Remove temporary attachment files"
+            br
+            span.smalltext
+              "Deletes temporary files created while attaching a file to a post that for any reason were not renamed or deleted before."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Send Birthday emails"
+            br
+            span.smalltext
+              "Sends out emails wishing members a happy birthday."
+          td.next_due.smalltext
+            "N/A"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Weekly Maintenance"
+            br
+            span.smalltext
+              "Runs essential weekly maintenance on the forum - should not be disabled."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+        tr#list_scheduled_tasks_#.windowbg
+          td.name
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=taskedit;tid=#"]
+              "Weekly Notification summary"
+            br
+            span.smalltext
+              "Emails out the weekly digest for notification subscribers."
+          td.next_due.smalltext
+            "{date}"
+          td.regularity.smalltext
+            "Starting at #:#, repeating every {duration}"
+          td.centercol.run_now
+            input#run_task_# [name="run_task[#]" type="checkbox"]
+          td.centercol.enabled
+            input#task_# [name="enable_task[#]" type="hidden" value="#"]
+            input#task_check_# [checked name="enable_task[#]" type="checkbox"]
+    div.flow_auto
+      div.additional_row
+        input.button [name="save" type="submit" value="Save Changes"]
+        input.button [name="run" type="submit" value="Run now"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_log.txt b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_log.txt
new file mode 100644
index 00000000000..0f631f7918f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_log.txt
@@ -0,0 +1,62 @@
+status 200
+@ title
+title
+  "Task Log"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasklog;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Task Log"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasklog" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Task Log"
+    div.flow_hidden.information
+      div.additional_row
+        strong
+          "Note:"
+        "All times given below are"
+        em
+          "server time"
+        "and do not take into account any time offsets set up within SMF."
+    table#task_log.table_grid
+      thead
+        tr.title_bar
+          th#header_task_log_name.name [scope="col"]
+            "Task Name"
+          th#header_task_log_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasklog;sort=date;desc" rel="nofollow"]
+              "Time Run"
+              span.main_icons.sort_up
+          th#header_task_log_time_taken.time_taken [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=tasklog;sort=time_taken" rel="nofollow"]
+              "Time taken"
+      snapshot-ignored [selector="table.table_grid tbody"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_settings.txt
new file mode 100644
index 00000000000..64ba41ed68f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/scheduled_tasks_settings.txt
@@ -0,0 +1,62 @@
+status 200
+@ title
+title
+  "Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Scheduled Tasks"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=scheduledtasks;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=scheduledtasks;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_cron_is_real_cron_help [href="{boardurl}/index.php?action=helpadmin;help=cron_is_real_cron" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_cron_is_real_cron
+          span
+            label [for="cron_is_real_cron"]
+              "Disable JavaScript-based method of running scheduled tasks."
+            br
+            span.smalltext
+              strong
+                "Do not check this box"
+              "unless you are"
+              strong
+                u
+                  "sure"
+              "that you have configured another method to tell your server to run SMF’s cron.php on a regular basis."
+        dd
+          input#cron_is_real_cron [name="cron_is_real_cron" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/search_engines.txt b/tests/Integration/Http/Snapshot/snapshots/admin/search_engines.txt
new file mode 100644
index 00000000000..04cd866dadc
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/search_engines.txt
@@ -0,0 +1,177 @@
+status 200
+@ title
+title
+  "Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=sengines;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Search Engines"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Search Engines"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From this area you can decide in what detail you wish to track search engines as they index your forum as well as review search engine logs."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=sengines;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.information.noup
+      "You can change settings for robot tracking from this page. Note, if you wish to enable automatic pruning of the hit logs you can set this up"
+      a [href="{boardurl}/index.php?action=admin;area=logs;sa=settings;{session_var}={session_id}"]
+        "here"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_spider_mode_help [href="{boardurl}/index.php?action=helpadmin;help=spider_mode" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_spider_mode
+          span
+            label [for="spider_mode"]
+              "Search Engine and Robot Tracking level"
+            br
+            span.smalltext
+              "Note that logging of every robot action only occurs if tracking is set to either \"moderate\" or \"aggressive\". Details about every robot action are only logged if tracking is set to \"aggressive\"."
+        dd
+          select#spider_mode [name="spider_mode" onchange="disableFields();" size="#"]
+            option [value="#"]
+              "Disabled"
+            option [value="#"]
+              "Standard"
+            option [value="#"]
+              "Moderate"
+            option [value="#"]
+              "Aggressive"
+        dt
+          a#setting_spider_group_help [href="{boardurl}/index.php?action=helpadmin;help=spider_group" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_spider_group
+          span
+            label [for="spider_group"]
+              "Apply restrictive permissions from group"
+            br
+            span.smalltext
+              "To enable you to stop robots indexing some pages."
+        dd
+          select#spider_group [name="spider_group" size="#"]
+            option [value="#"]
+              "Disabled"
+            option [value="#"]
+              "Regular Members"
+            option [value="#"]
+              "Global Moderator"
+            option [value="#"]
+              "Newbie"
+            option [value="#"]
+              "Jr. Member"
+            option [value="#"]
+              "Full Member"
+            option [value="#"]
+              "Sr. Member"
+            option [value="#"]
+              "Hero Member"
+        dt
+          a#setting_show_spider_online_help [href="{boardurl}/index.php?action=helpadmin;help=show_spider_online" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_show_spider_online
+          span
+            label [for="show_spider_online"]
+              "Show robots in the online list"
+        dd
+          select#show_spider_online [name="show_spider_online" size="#"]
+            option [value="#"]
+              "Not at all"
+            option [value="#"]
+              "Show robot quantity"
+            option [value="#"]
+              "Show robot names"
+            option [value="#"]
+              "Show robot names - admin only"
+      hr
+      dl.settings
+        dt
+          a#setting_robots_txt_help [href="{boardurl}/index.php?action=helpadmin;help=robots_txt" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_robots_txt
+          span
+            label [for="robots_txt"]
+              "Add SMF rules to robots.txt"
+            br
+            span.smalltext
+              "Enter the path to your robots.txt file so that SMF can append rules to it."
+        dd
+          input#robots_txt [name="robots_txt" size="#" type="text" value]
+          button.button.floatnone [onclick="document.getElementById('robots_txt').value = '{boarddir}/robots.txt'; return false;"]
+            "Detect path"
+        dt
+          a#setting_robots_txt_search_help [href="{boardurl}/index.php?action=helpadmin;help=robots_txt_search" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_robots_txt_search
+          span
+            label [for="robots_txt_search"]
+              "Allow search engines to link to the forum in their search results"
+        dd
+          input#robots_txt_search [checked name="robots_txt_search" type="checkbox" value="#"]
+        dt
+          a#setting_robots_txt_ai_input_help [href="{boardurl}/index.php?action=helpadmin;help=robots_txt_ai_input" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_robots_txt_ai_input
+          span
+            label [for="robots_txt_ai_input"]
+              "Allow search engines to generate AI summaries of forum content"
+        dd
+          input#robots_txt_ai_input [name="robots_txt_ai_input" type="checkbox" value="#"]
+        dt
+          a#setting_robots_txt_ai_train_help [href="{boardurl}/index.php?action=helpadmin;help=robots_txt_ai_train" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_robots_txt_ai_train
+          span
+            label [for="robots_txt_ai_train"]
+              "Allow forum content to be used for AI training"
+        dd
+          input#robots_txt_ai_train [name="robots_txt_ai_train" type="checkbox" value="#"]
+        dt
+          a#setting_meta_keywords_help [href="{boardurl}/index.php?action=helpadmin;help=meta_keywords" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_meta_keywords
+          span
+            label [for="meta_keywords"]
+              "Meta keywords associated with forum"
+            br
+            span.smalltext
+              "In most situations, this should be left blank."
+        dd
+          textarea#meta_keywords [cols="#" name="meta_keywords" rows="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_cache.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_cache.txt
new file mode 100644
index 00000000000..114c6dc7ec3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_cache.txt
@@ -0,0 +1,126 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Caching"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Caching"
+    div.information.noup
+      "SMF supports caching through the use of accelerators. The currently supported accelerators include:"
+      ul.normallist
+        li
+          "APCu"
+        li
+          "Memcached"
+        li
+          "SQLite#"
+        li
+          "PostgreSQL"
+        li
+          "Zend Platform/Performance Suite (Not Zend Optimizer)"
+      "Caching will work best if you have PHP compiled with one of the above optimizers, or have memcached available. If you do not have any optimizer installed SMF will do file based caching."
+    snapshot-ignored [selector="#admin_content .information + .information"]
+    snapshot-ignored [selector="#admin_form_wrapper .windowbg"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+  script
+    | $(document).ready(function() { $("#cache_accelerator").change(); }); $("#cache_accelerator").change(function (e) { var cache_type = e.currentTarget.value; $("#cachedir").prop("disabled", cache_type != "FileBased"); }); $("#cache_accelerator").change(function (e) { var cache_type = e.currentTarget.value; $("#cachedir_sqlite").prop("disabled", cache_type != "Sqlite"); });
+  div.cat_bar
+    h3.catbg
+      "Empty SMF’s cache"
+  div.windowbg
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=maintain;sa=routine;activity=cleancache" method="post"]
+      p
+        "This function will empty out the cache should you need it to be cleared."
+      span
+        input.button [type="submit" value="Run task now"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_cookie.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_cookie.txt
new file mode 100644
index 00000000000..51c575089eb
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_cookie.txt
@@ -0,0 +1,215 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Cookies and Sessions"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Cookies and Sessions"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_cookiename
+          span
+            label [for="cookiename"]
+              "Cookie name"
+        dd
+          input#cookiename [name="cookiename" size="#" type="text" value="SMFCookie#"]
+        dt
+          a#setting_localCookies_help [href="{boardurl}/index.php?action=helpadmin;help=localCookies" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_localCookies
+          span
+            label [for="localCookies"]
+              "Enable local storage of cookies"
+        dd
+          input#localCookies [name="localCookies" type="checkbox" value="#"]
+        dt
+          a#setting_globalCookies_help [href="{boardurl}/index.php?action=helpadmin;help=globalCookies" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_globalCookies
+          span
+            label [for="globalCookies"]
+              "Use subdomain independent cookies"
+        dd
+          input#globalCookies [name="globalCookies" type="checkbox" value="#"]
+        dt
+          a#setting_globalCookiesDomain_help [href="{boardurl}/index.php?action=helpadmin;help=globalCookiesDomain" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_globalCookiesDomain
+          span
+            label [for="globalCookiesDomain"]
+              "Main domain used for subdomain independent cookies"
+        dd
+          input#globalCookiesDomain [name="globalCookiesDomain" type="text" value]
+        dt
+          a#setting_secureCookies_help [href="{boardurl}/index.php?action=helpadmin;help=secureCookies" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_secureCookies
+          span [style="color: ##;"]
+            label [for="secureCookies"]
+              "Force cookies to be secure"
+        dd
+          input#secureCookies [disabled name="secureCookies" type="checkbox" value="#"]
+        dt
+          a#setting_httponlyCookies_help [href="{boardurl}/index.php?action=helpadmin;help=httponlyCookies" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_httponlyCookies
+          span
+            label [for="httponlyCookies"]
+              "Force cookies to be made accessible only through the HTTP protocol"
+        dd
+          input#httponlyCookies [checked name="httponlyCookies" type="checkbox" value="#"]
+        dt
+          a#setting_samesiteCookies_help [href="{boardurl}/index.php?action=helpadmin;help=samesiteCookies" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_samesiteCookies
+          span
+            label [for="samesiteCookies"]
+              "Force cookies to be sent only to first parties"
+        dd
+          select#samesiteCookies [name="samesiteCookies" size="#"]
+            option [value="none"]
+              "None"
+            option [selected value="lax"]
+              "Lax"
+            option [value="strict"]
+              "Strict"
+      hr
+      dl.settings
+        dt
+          a#setting_databaseSession_enable_help [href="{boardurl}/index.php?action=helpadmin;help=databaseSession_enable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_databaseSession_enable
+          span
+            label [for="databaseSession_enable"]
+              "Use database driven sessions"
+        dd
+          input#databaseSession_enable [name="databaseSession_enable" type="checkbox" value="#"]
+        dt
+          a#setting_databaseSession_loose_help [href="{boardurl}/index.php?action=helpadmin;help=databaseSession_loose" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_databaseSession_loose
+          span
+            label [for="databaseSession_loose"]
+              "Allow browsers to go back to cached pages"
+        dd
+          input#databaseSession_loose [checked name="databaseSession_loose" type="checkbox" value="#"]
+        dt
+          a#setting_databaseSession_lifetime_help [href="{boardurl}/index.php?action=helpadmin;help=databaseSession_lifetime" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_databaseSession_lifetime
+          span
+            label [for="databaseSession_lifetime"]
+              "Seconds before an unused session timeout"
+        dd
+          input#databaseSession_lifetime [min="#" name="databaseSession_lifetime" type="number" value="#"]
+          "seconds"
+      hr
+      dl.settings
+        dt
+          a#setting_tfa_mode_help [href="{boardurl}/index.php?action=helpadmin;help=tfa_mode" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_tfa_mode
+          span
+            label [for="tfa_mode"]
+              "Two-Factor Authentication"
+            br
+            span.smalltext
+              "Allows users to have a second layer of security while logging in, users would need an app like Google Authenticator paired with their account"
+        dd
+          select#tfa_mode [name="tfa_mode" size="#"]
+            option [value="#"]
+              "Disabled"
+            option [selected value="#"]
+              "Enabled"
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_database.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_database.txt
new file mode 100644
index 00000000000..851659ffa92
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_database.txt
@@ -0,0 +1,148 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Database"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=database;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Database"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_db_persist_help [href="{boardurl}/index.php?action=helpadmin;help=db_persist" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_db_persist
+          span
+            label [for="db_persist"]
+              "Use a persistent connection"
+        dd
+          input#db_persist [name="db_persist" type="checkbox" value="#"]
+        dt
+          a#setting_db_error_send
+          span
+            label [for="db_error_send"]
+              "Send emails on database connection errors"
+        dd
+          input#db_error_send [name="db_error_send" type="checkbox" value="#"]
+        dt
+          a#setting_ssi_db_user_help [href="{boardurl}/index.php?action=helpadmin;help=ssi_db_user" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_ssi_db_user
+          span
+            label [for="ssi_db_user"]
+              "Database username to use in SSI mode"
+        dd
+          input#ssi_db_user [name="ssi_db_user" type="text" value]
+        dt
+          a#setting_ssi_db_passwd
+          span
+            label [for="ssi_db_passwd"]
+              "Database password to use in SSI mode"
+            br
+            em
+              "(confirm)"
+        dd
+          input [name="ssi_db_passwd[#]" onfocus="this.value = ''; this.form.ssi_db_passwd.disabled = false;" type="password" value="*#fakepass#*"]
+          br
+          input#ssi_db_passwd [disabled name="ssi_db_passwd[#]" type="password"]
+      hr
+      dl.settings
+        dt
+          a#setting_autoFixDatabase_help [href="{boardurl}/index.php?action=helpadmin;help=autoFixDatabase" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_autoFixDatabase
+          span
+            label [for="autoFixDatabase"]
+              "Automatically fix broken tables"
+        dd
+          input#autoFixDatabase [checked name="autoFixDatabase" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_export.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_export.txt
new file mode 100644
index 00000000000..e9c43531fc2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_export.txt
@@ -0,0 +1,140 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Data Export"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=export;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Data Export"
+    div.information.noup
+      "Members can export copies of their profile data, optionally including their posts and personal messages."
+      br
+      "To avoid overtaxing server resources, SMF slowly compiles the exported data to a downloadable file stored in a secured directory."
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_export_dir
+          span
+            label [for="export_dir"]
+              "Directory for profile data export files"
+        dd
+          input#export_dir [name="export_dir" size="#" type="text" value="{boarddir}/exports"]
+        dt
+          a#setting_export_expiry
+          span
+            label [for="export_expiry"]
+              "Automatically delete profile data export files after"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#export_expiry [min="#" name="export_expiry" size="#" type="number" value="#"]
+          "days"
+        dt
+          a#setting_export_min_diskspace_pct
+          span
+            label [for="export_min_diskspace_pct"]
+              "Pause exports if free space on disk is less than"
+        dd
+          input#export_min_diskspace_pct [max="#" min="#" name="export_min_diskspace_pct" size="#" type="number" value="#"]
+          "%"
+        dt
+          a#setting_export_rate
+          span
+            label [for="export_rate"]
+              "Rate at which to process posts & personal messages for export"
+            br
+            span.smalltext
+              "Higher values will compile exports more quickly, but could affect forum performance."
+        dd
+          input#export_rate [max="#" min="#" name="export_rate" size="#" step="#" type="number" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_general.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_general.txt
new file mode 100644
index 00000000000..a6bc6848681
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_general.txt
@@ -0,0 +1,212 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "General"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=general;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "General"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_mbname
+          span
+            label [for="mbname"]
+              "Forum Title"
+        dd
+          input#mbname [name="mbname" size="#" type="text" value="{forum_name}"]
+      hr
+      dl.settings
+        dt
+          a#setting_maintenance
+          span
+            label [for="maintenance"]
+              "Enable Maintenance Mode"
+        dd
+          input#maintenance [name="maintenance" type="checkbox" value="#"]
+        dt
+          a#setting_mtitle
+          span
+            label [for="mtitle"]
+              "Subject for display"
+        dd
+          input#mtitle [name="mtitle" size="#" type="text" value="Maintenance Mode"]
+        dt
+          a#setting_mmessage
+          span
+            label [for="mmessage"]
+              "Message for display"
+        dd
+          input#mmessage [name="mmessage" size="#" type="text" value="Okay faithful users...we're attempting to restore an older backup of the database...news will be posted once we're back!"]
+      hr
+      dl.settings
+        dt
+          a#setting_webmaster_email
+          span
+            label [for="webmaster_email"]
+              "Webmaster email address"
+        dd
+          input#webmaster_email [name="webmaster_email" size="#" type="text" value="{email}"]
+      hr
+      dl.settings
+        dt
+          a#setting_enableCompressedOutput_help [href="{boardurl}/index.php?action=helpadmin;help=enableCompressedOutput" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableCompressedOutput
+          span
+            label [for="enableCompressedOutput"]
+              "Enable compressed output"
+        dd
+          input#enableCompressedOutput [name="enableCompressedOutput" type="checkbox" value="#"]
+        dt
+          a#setting_disableHostnameLookup_help [href="{boardurl}/index.php?action=helpadmin;help=disableHostnameLookup" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_disableHostnameLookup
+          span
+            label [for="disableHostnameLookup"]
+              "Disable hostname lookups"
+        dd
+          input#disableHostnameLookup [name="disableHostnameLookup" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_force_ssl_help [href="{boardurl}/index.php?action=helpadmin;help=force_ssl" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_force_ssl
+          span [style="color: ##;"]
+            label [for="force_ssl"]
+              "Forum SSL mode"
+        dd
+          select#force_ssl [disabled name="force_ssl" size="#"]
+            option [value="#"]
+              "Disable SSL"
+            option [value="#"]
+              "Force SSL throughout the forum"
+        dt
+          a#setting_image_proxy_enabled_help [href="{boardurl}/index.php?action=helpadmin;help=image_proxy_enabled" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_image_proxy_enabled
+          span
+            label [for="image_proxy_enabled"]
+              "Enable Image Proxy"
+        dd
+          input#image_proxy_enabled [name="image_proxy_enabled" type="checkbox" value="#"]
+        dt
+          a#setting_image_proxy_secret_help [href="{boardurl}/index.php?action=helpadmin;help=image_proxy_secret" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_image_proxy_secret
+          span
+            label [for="image_proxy_secret"]
+              "Image Proxy Secret"
+        dd
+          input#image_proxy_secret [name="image_proxy_secret" size="#" type="text" value="{secret}"]
+        dt
+          a#setting_image_proxy_maxsize_help [href="{boardurl}/index.php?action=helpadmin;help=image_proxy_maxsize" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_image_proxy_maxsize
+          span
+            label [for="image_proxy_maxsize"]
+              "Maximum file size of images to cache (in KB)"
+        dd
+          input#image_proxy_maxsize [min="#" name="image_proxy_maxsize" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_enable_sm_stats_help [href="{boardurl}/index.php?action=helpadmin;help=enable_sm_stats" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enable_sm_stats
+          span
+            label [for="enable_sm_stats"]
+              "Allow Stat Collection"
+        dd
+          input#enable_sm_stats [name="enable_sm_stats" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_loads.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_loads.txt
new file mode 100644
index 00000000000..94e0286ef93
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_loads.txt
@@ -0,0 +1,177 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Load Balancing"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Load Balancing"
+    div.information.noup
+      span.error
+        "Please note: the settings below are to be edited with care. Setting any of them too low may render your forum"
+        strong
+          "unusable"
+        "!"
+    div.information.noup
+      "The current load average is"
+      strong
+        "#%"
+    div.information.noup
+      "CPU(s) detected: #"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_loadavg_enable
+          span
+            label [for="loadavg_enable"]
+              "Enable load balancing by load averages"
+        dd
+          input#loadavg_enable [name="loadavg_enable" type="checkbox" value="#"]
+        dt
+          a#setting_loadavg_auto_opt
+          span
+            label [for="loadavg_auto_opt"]
+              "Threshold to disabling automatic database optimization"
+        dd
+          input#loadavg_auto_opt [min="#" name="loadavg_auto_opt" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_search
+          span
+            label [for="loadavg_search"]
+              "Threshold to disabling search"
+        dd
+          input#loadavg_search [min="#" name="loadavg_search" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_allunread
+          span
+            label [for="loadavg_allunread"]
+              "Threshold to disabling all unread topics"
+        dd
+          input#loadavg_allunread [min="#" name="loadavg_allunread" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_unreadreplies
+          span
+            label [for="loadavg_unreadreplies"]
+              "Threshold to disabling unread replies"
+        dd
+          input#loadavg_unreadreplies [min="#" name="loadavg_unreadreplies" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_show_posts
+          span
+            label [for="loadavg_show_posts"]
+              "Threshold to disabling showing user posts"
+        dd
+          input#loadavg_show_posts [min="#" name="loadavg_show_posts" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_userstats
+          span
+            label [for="loadavg_userstats"]
+              "Threshold to disabling showing user statistics"
+        dd
+          input#loadavg_userstats [min="#" name="loadavg_userstats" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_bbc
+          span
+            label [for="loadavg_bbc"]
+              "Threshold to disabling BBC formatting when showing posts"
+        dd
+          input#loadavg_bbc [min="#" name="loadavg_bbc" size="#" step="#" type="number" value="#"]
+        dt
+          a#setting_loadavg_forum
+          span
+            label [for="loadavg_forum"]
+              "Threshold to disabling the forum"
+              strong
+                "completely"
+        dd
+          input#loadavg_forum [min="#" name="loadavg_forum" size="#" step="#" type="number" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/server_security.txt b/tests/Integration/Http/Snapshot/snapshots/admin/server_security.txt
new file mode 100644
index 00000000000..b7026ace782
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/server_security.txt
@@ -0,0 +1,277 @@
+status 200
+@ title
+title
+  "Server Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Server Settings"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Security"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=serversettings" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Server Settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the basic settings for your forum. Be very careful with these settings, as they may render the forum dysfunctional."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Server Settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Server Settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=general;{session_var}={session_id}"]
+                "General"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=database;{session_var}={session_id}"]
+                "Database"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cookie;{session_var}={session_id}"]
+                "Cookies and Sessions"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=serversettings;sa=security;{session_var}={session_id}"]
+                "Security"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=cache;{session_var}={session_id}"]
+                "Caching"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=export;{session_var}={session_id}"]
+                "Data Export"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=loads;{session_var}={session_id}"]
+                "Load Balancing"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=serversettings;sa=phpinfo;{session_var}={session_id}"]
+                "PHP Info"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=serversettings;save;sa=security" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Security"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_failed_login_threshold_help [href="{boardurl}/index.php?action=helpadmin;help=failed_login_threshold" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_failed_login_threshold
+          span
+            label [for="failed_login_threshold"]
+              "Failed login threshold"
+        dd
+          input#failed_login_threshold [min="#" name="failed_login_threshold" size="#" type="number" value="#"]
+        dt
+          a#setting_loginHistoryDays_help [href="{boardurl}/index.php?action=helpadmin;help=loginHistoryDays" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_loginHistoryDays
+          span
+            label [for="loginHistoryDays"]
+              "Days to keep login history"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+        dd
+          input#loginHistoryDays [min="#" name="loginHistoryDays" size="#" type="number" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_securityDisable_help [href="{boardurl}/index.php?action=helpadmin;help=securityDisable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_securityDisable
+          span
+            label [for="securityDisable"]
+              "Disable administration security"
+        dd
+          input#securityDisable [name="securityDisable" type="checkbox" value="#"]
+        dt
+          a#setting_securityDisable_moderate_help [href="{boardurl}/index.php?action=helpadmin;help=securityDisable_moderate" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_securityDisable_moderate
+          span
+            label [for="securityDisable_moderate"]
+              "Disable moderation security"
+        dd
+          input#securityDisable_moderate [checked name="securityDisable_moderate" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_send_validation_onChange_help [href="{boardurl}/index.php?action=helpadmin;help=send_validation_onChange" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_send_validation_onChange
+          span
+            label [for="send_validation_onChange"]
+              "Require reactivation after email change"
+        dd
+          input#send_validation_onChange [name="send_validation_onChange" type="checkbox" value="#"]
+        dt
+          a#setting_approveAccountDeletion_help [href="{boardurl}/index.php?action=helpadmin;help=approveAccountDeletion" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_approveAccountDeletion
+          span
+            label [for="approveAccountDeletion"]
+              "Require admin approval when member deletes account"
+        dd
+          input#approveAccountDeletion [name="approveAccountDeletion" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_password_strength_help [href="{boardurl}/index.php?action=helpadmin;help=password_strength" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_password_strength
+          span
+            label [for="password_strength"]
+              "Required strength for user passwords"
+        dd
+          select#password_strength [name="password_strength" size="#"]
+            option [value="#"]
+              "Low"
+            option [value="#"]
+              "Medium"
+            option [value="#"]
+              "High"
+        dt
+          a#setting_enable_password_conversion_help [href="{boardurl}/index.php?action=helpadmin;help=enable_password_conversion" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enable_password_conversion
+          span
+            label [for="enable_password_conversion"]
+              "Allow password hash conversion"
+        dd
+          input#enable_password_conversion [name="enable_password_conversion" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_enableReportPM_help [href="{boardurl}/index.php?action=helpadmin;help=enableReportPM" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_enableReportPM
+          span
+            label [for="enableReportPM"]
+              "Enable reporting of personal messages"
+        dd
+          input#enableReportPM [name="enableReportPM" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_allow_cors_help [href="{boardurl}/index.php?action=helpadmin;help=allow_cors" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_allow_cors
+          span
+            label [for="allow_cors"]
+              "Allow CORS (Cross Origin Resource Sharing)"
+        dd
+          input#allow_cors [name="allow_cors" type="checkbox" value="#"]
+        dt
+          a#setting_allow_cors_credentials
+          span
+            label [for="allow_cors_credentials"]
+              "Allow sending credentials over CORS"
+        dd
+          input#allow_cors_credentials [name="allow_cors_credentials" type="checkbox" value="#"]
+        dt
+          a#setting_cors_domains
+          span
+            label [for="cors_domains"]
+              "Additional CORS domains"
+        dd
+          input#cors_domains [name="cors_domains" type="text" value]
+        dt
+          a#setting_cors_headers
+          span
+            label [for="cors_headers"]
+              "Additional CORS headers"
+        dd
+          input#cors_headers [name="cors_headers" type="text" value]
+      hr
+      dl.settings
+        dt
+          a#setting_frame_security_help [href="{boardurl}/index.php?action=helpadmin;help=frame_security" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_frame_security
+          span
+            label [for="frame_security"]
+              "Frame Security Options"
+        dd
+          select#frame_security [name="frame_security" size="#"]
+            option [value="SAMEORIGIN"]
+              "Allow Same Origin"
+            option [value="DENY"]
+              "Deny all frames"
+            option [value="DISABLE"]
+              "Disabled"
+      hr
+      dl.settings
+        dt
+          a#setting_proxy_ip_header_help [href="{boardurl}/index.php?action=helpadmin;help=proxy_ip_header" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_proxy_ip_header
+          span
+            label [for="proxy_ip_header"]
+              "Reverse Proxy IP Header"
+        dd
+          select#proxy_ip_header [name="proxy_ip_header" size="#"]
+            option [value="disabled"]
+              "Do not allow any Proxy IP Headers"
+            option [selected value="autodetect"]
+              "Auto-detect Proxy IP header"
+            option [value="HTTP_X_FORWARDED_FOR"]
+              "X-Forwarded-For"
+            option [value="HTTP_CLIENT_IP"]
+              "Client-IP"
+            option [value="HTTP_X_REAL_IP"]
+              "X-Real-IP"
+            option [value="HTTP_CF_CONNECTING_IP"]
+              "CF-Connecting-IP"
+        dt
+          a#setting_proxy_ip_servers
+          span
+            label [for="proxy_ip_servers"]
+              "Reverse Proxy Servers IPs"
+        dd
+          input#proxy_ip_servers [name="proxy_ip_servers" type="text" value]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/smileys.txt b/tests/Integration/Http/Snapshot/snapshots/admin/smileys.txt
new file mode 100644
index 00000000000..8b40fe2438d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/smileys.txt
@@ -0,0 +1,138 @@
+status 200
+@ title
+title
+  "Smileys and Message Icons"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smileys and Message Icons"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smiley Sets"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=smileys" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Smileys and Message Icons"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Smiley Sets are groups of smileys your users can choose between. For example, you might have yellow and red smileys."
+    br
+    "Here you can change the name and location of each smiley set - remember, however, that all sets share the same smileys."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Smileys and Message Icons Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Smileys and Message Icons Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}"]
+                "Smiley Sets"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=smileys;sa=editsets" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Smiley Sets"
+    div.additional_row
+      input [name="smiley_save" type="hidden"]
+      input.button.you_sure [data-confirm="Are you sure you want to remove these smiley sets?-n-Note: This won't remove the images, just the choices." name="delete" type="submit" value="Delete selected"]
+      a.button [href="{boardurl}/index.php?action=admin;area=smileys;sa=modifyset"]
+        "New smiley Set"
+    table#smiley_set_list.table_grid
+      thead
+        tr.title_bar
+          th#header_smiley_set_list_default.centercol.default [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;sort=default" rel="nofollow"]
+              "Default"
+          th#header_smiley_set_list_name.name [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;sort=name;desc" rel="nofollow"]
+              "Name"
+              span.main_icons.sort_up
+          th#header_smiley_set_list_url.url [scope="col"]
+            a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;sort=url" rel="nofollow"]
+              "URL"
+          th#header_smiley_set_list_modify.centercol.modify [scope="col"]
+            "Modify"
+          th#header_smiley_set_list_check.centercol.check [scope="col"]
+            input [onclick="invertAll(this, this.form);" type="checkbox"]
+      tbody
+        tr#list_smiley_set_list_#.windowbg
+          td.centercol.default
+          td.name
+            "Alienine’s Set"
+          td.url
+            "{boardurl}/Smileys/"
+            strong
+              "alienine"
+            "/..."
+          td.centercol.modify
+            a [href="{boardurl}/index.php?action=admin;area=smileys;sa=modifyset;set=alienine"]
+              "Modify"
+          td.centercol.check
+            input [name="smiley_set[alienine]" type="checkbox"]
+        tr#list_smiley_set_list_#.windowbg
+          td.centercol.default
+            span.main_icons.valid
+          td.name
+            "Fugue’s Set"
+          td.url
+            "{boardurl}/Smileys/"
+            strong
+              "fugue"
+            "/..."
+          td.centercol.modify
+            a [href="{boardurl}/index.php?action=admin;area=smileys;sa=modifyset;set=fugue"]
+              "Modify"
+          td.centercol.check
+    div.flow_auto
+      div.additional_row
+        input [name="smiley_save" type="hidden"]
+        input.button.you_sure [data-confirm="Are you sure you want to remove these smiley sets?-n-Note: This won't remove the images, just the choices." name="delete" type="submit" value="Delete selected"]
+        a.button [href="{boardurl}/index.php?action=admin;area=smileys;sa=modifyset"]
+          "New smiley Set"
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/smileys_new_set.txt b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_new_set.txt
new file mode 100644
index 00000000000..4e65934f665
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_new_set.txt
@@ -0,0 +1,105 @@
+status 200
+@ title
+title
+  "Smileys and Message Icons"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smileys and Message Icons"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smiley Sets"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=smileys" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Smileys and Message Icons"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Smiley Sets are groups of smileys your users can choose between. For example, you might have yellow and red smileys."
+    br
+    "Here you can change the name and location of each smiley set - remember, however, that all sets share the same smileys."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Smileys and Message Icons Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Smileys and Message Icons Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}"]
+                "Smiley Sets"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=smileys;sa=editsets" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Create new Smiley set"
+    div.noup.windowbg
+      dl.settings
+        dt
+          strong
+            label [for="smiley_sets_name"]
+              "Name"
+        dd
+          input#smiley_sets_name [name="smiley_sets_name" type="text" value]
+        dt
+          strong
+            label [for="smiley_sets_path"]
+              "URL"
+        dd
+          "{boardurl}/Smileys/"
+          input#smiley_sets_path [name="smiley_sets_path" type="text" value]
+          "/.."
+        dt
+          strong
+            label [for="smiley_sets_default"]
+              "Default Smiley set"
+        dd
+          input#smiley_sets_default [name="smiley_sets_default" type="checkbox" value="#"]
+      input.button [name="smiley_save" type="submit" value="Save Changes"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="set" type="hidden" value]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/smileys_set.txt b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_set.txt
new file mode 100644
index 00000000000..9a6e7548bac
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_set.txt
@@ -0,0 +1,109 @@
+status 200
+@ title
+title
+  "Smileys and Message Icons"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smileys and Message Icons"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smiley Sets"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=smileys" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Smileys and Message Icons"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Smiley Sets are groups of smileys your users can choose between. For example, you might have yellow and red smileys."
+    br
+    "Here you can change the name and location of each smiley set - remember, however, that all sets share the same smileys."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Smileys and Message Icons Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Smileys and Message Icons Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}"]
+                "Smiley Sets"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=smileys;sa=editsets" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Modify existing Smiley set"
+    div.noup.windowbg
+      dl.settings
+        dt
+          strong
+            label [for="smiley_sets_name"]
+              "Name"
+        dd
+          input#smiley_sets_name [name="smiley_sets_name" type="text" value="Fugue’s Set"]
+        dt
+          strong
+            label [for="smiley_sets_path"]
+              "URL"
+        dd
+          "{boardurl}/Smileys/"
+          select#smiley_sets_path [name="smiley_sets_path"]
+            option [disabled value="alienine"]
+              "alienine"
+            option [selected value="fugue"]
+              "fugue"
+          "/.."
+        dt
+          strong
+            label [for="smiley_sets_default"]
+              "Default Smiley set"
+        dd
+          input#smiley_sets_default [checked name="smiley_sets_default" type="checkbox" value="#"]
+      input.button [name="smiley_save" type="submit" value="Save Changes"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="set" type="hidden" value="fugue"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/smileys_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_settings.txt
new file mode 100644
index 00000000000..37974a2df2b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/smileys_settings.txt
@@ -0,0 +1,175 @@
+status 200
+@ title
+title
+  "Smileys and Message Icons"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Smileys and Message Icons"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=smileys" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Smileys and Message Icons"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "These settings allow you to change the default smiley set, allow people to select their own smileys, and set paths and configuration data."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Smileys and Message Icons Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Smileys and Message Icons Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=smileys;sa=editsets;{session_var}={session_id}"]
+                "Smiley Sets"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=smileys;sa=settings;{session_var}={session_id}"]
+                "Settings"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=smileys;save;sa=settings" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_manage_smileys
+          span
+            label
+              "Groups allowed to manage smileys and message icons"
+        dd
+          fieldset#manage_smileys
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('manage_smileys').style.display = 'none';document.getElementById('manage_smileys_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="manage_smileys[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="manage_smileys[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'manage_smileys[');" type="checkbox"]
+                span
+                  "Select all"
+          a#manage_smileys_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('manage_smileys').style.display = 'block'; document.getElementById('manage_smileys_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("manage_smileys").style.display = "none"; document.getElementById("manage_smileys_groups_link").style.display = "";
+      hr
+      dl.settings
+        dt
+          a#setting_smiley_sets_default
+          span
+            label [for="smiley_sets_default"]
+              "Default Smiley Set"
+        dd
+          select#smiley_sets_default [name="smiley_sets_default" size="#"]
+            option [selected value="fugue"]
+              "Fugue’s Set"
+            option [value="alienine"]
+              "Alienine’s Set"
+        dt
+          a#setting_smiley_sets_enable
+          span
+            label [for="smiley_sets_enable"]
+              "Enable smiley set selection by members"
+        dd
+          input#smiley_sets_enable [name="smiley_sets_enable" type="checkbox" value="#"]
+        dt
+          a#setting_smiley_enable
+          span
+            label [for="smiley_enable"]
+              "Enable customized smileys"
+            br
+            span.smalltext
+              "(otherwise, the default smileys will be used.)"
+        dd
+          input#smiley_enable [name="smiley_enable" type="checkbox" value="#"]
+        dt
+          a#setting_smileys_url
+          span
+            label [for="smileys_url"]
+              "Base URL to all smiley sets"
+        dd
+          input#smileys_url [name="smileys_url" size="#" type="text" value="{boardurl}/Smileys"]
+        dt
+          a#setting_smileys_dir
+          span
+            label [for="smileys_dir"]
+              "Absolute path to all smiley sets"
+        dd
+          input#smileys_dir [name="smileys_dir" size="#" type="text" value="{boarddir}/Smileys"]
+      hr
+      dl.settings
+        dt
+          a#setting_messageIcons_enable
+          span
+            label [for="messageIcons_enable"]
+              "Enable customized message icons"
+            br
+            span.smalltext
+              "(otherwise, the default message icons will be used.)"
+        dd
+          input#messageIcons_enable [name="messageIcons_enable" type="checkbox" value="#"]
+        dt
+          a#setting_messageIconChecks_enable
+          span
+            label [for="messageIconChecks_enable"]
+              "Enable check for message icons"
+            br
+            span.smalltext
+              "If the check is disabled, icons will be used from the current theme. If the check is enabled, the existence of the icon file in the current theme will be checked first. If there is no file, the same file from the default theme will be used."
+        dd
+          input#messageIconChecks_enable [name="messageIconChecks_enable" type="checkbox" value="#"]
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/split_topic.txt b/tests/Integration/Http/Snapshot/snapshots/admin/split_topic.txt
new file mode 100644
index 00000000000..620d4d9b14a
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/split_topic.txt
@@ -0,0 +1,185 @@
+status 200
+@ title
+title
+  "Select posts to split."
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#split_topics
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=splittopics;sa=splitSelection;board=#" method="post"]
+        div#not_selected.floatleft
+          div.cat_bar
+            h3.catbg
+              "Select posts to split."
+          div.information
+            "Please select which posts you wish to split."
+          div.pagesection
+            div#pageindex_not_selected.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+          ul#messages_not_selected.smalltext.split_messages
+            li#not_selected_#.windowbg
+              div.message_header
+                a.floatright.split_icon [href="{boardurl}/index.php?action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=down;msg=#" onclick="return select('down', #);"]
+                  span.main_icons.split_sel [title="->"]
+                strong
+                  "Re: Snapshot topic"
+                "by"
+                strong
+                  "Snapshot Admin"
+                br
+                em
+                  "{date}"
+              div.post
+                blockquote.bbc_standard_quote
+                  cite
+                    "Quote from: Snapshot Member"
+                  "The quoted text."
+                "A reply from an administrator."
+            li#not_selected_#.windowbg
+              div.message_header
+                a.floatright.split_icon [href="{boardurl}/index.php?action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=down;msg=#" onclick="return select('down', #);"]
+                  span.main_icons.split_sel [title="->"]
+                strong
+                  "Re: Snapshot topic"
+                "by"
+                strong
+                  "Snapshot Guest"
+                br
+                em
+                  "{date}"
+              div.post
+                "A reply from a guest."
+            li#not_selected_#.windowbg
+              div.message_header
+                a.floatright.split_icon [href="{boardurl}/index.php?action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=down;msg=#" onclick="return select('down', #);"]
+                  span.main_icons.split_sel [title="->"]
+                strong
+                  "Re: Snapshot topic"
+                "by"
+                strong
+                  "Snapshot Other"
+                br
+                em
+                  "{date}"
+              div.post
+                "A reply from another member, with a smiley"
+                img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+            li#not_selected_#.windowbg
+              div.message_header
+                a.floatright.split_icon [href="{boardurl}/index.php?action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=down;msg=#" onclick="return select('down', #);"]
+                  span.main_icons.split_sel [title="->"]
+                strong
+                  "Snapshot topic"
+                "by"
+                strong
+                  "Snapshot Member"
+                br
+                em
+                  "{date}"
+              div.post
+                "The first post, with"
+                strong
+                  "bold"
+                ","
+                em
+                  "italic"
+                ","
+                u
+                  "underlined"
+                "and"
+                s
+                  "struck"
+                "text."
+                br
+                a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+                  "A link"
+                "and"
+                a.bbc_email [href="mailto:{email}"]
+                  "{email}"
+                "."
+                br
+                blockquote.bbc_standard_quote
+                  cite
+                    "Quote"
+                  "An unattributed quote."
+                div.codeheader
+                  "Code"
+                pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+                  code
+                    "echo \"code\";"
+                ul.bbc_list
+                  li
+                    "One"
+                  li
+                    "Two"
+                span.bbc_color [style="color: red;"]
+                  "Red"
+                span.bbc_size [style="font-size: #pt;"]
+                  "Sized"
+                div.centertext
+                  "Centred"
+                table.bbc_table
+                  thead
+                    tr
+                      th
+                        "A"
+                      th
+                        "B"
+                  tbody
+                span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+                  button [tabindex="#" title="Show or hide spoiler content" type="button"]
+                  span
+                    "Hidden"
+                hr.bbc_hr
+                "Smileys:"
+                img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+                img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+        div#selected.floatright
+          div.cat_bar
+            h3.catbg
+              "Selected posts ("
+              a [href="{boardurl}/index.php?action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=reset;msg=#" onclick="return select('reset', #);"]
+                "reset selection"
+              ")"
+          div.information
+            "The posts below will form a new topic after splitting."
+          div.pagesection
+            div#pageindex_selected.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+          ul#messages_selected.smalltext.split_messages
+        br.clear
+        div.flow_auto
+          input [name="topic" type="hidden" value="#"]
+          input [name="subname" type="hidden" value="Snapshot topic"]
+          input.button [type="submit" value="Split Topic"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+    script
+      | var start = new Array(); start[#] = #; start[#] = #; function select(direction, msg_id) { getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#." + start[#] + ";start#=" + start[#] + ";move=" + direction + ";msg=" + msg_id + ";xml;splitjs", onDocReceived); return false; } function onDocReceived(XMLDoc) { var i, j, pageIndex; for (i = #; i < #; i++) { pageIndex = XMLDoc.getElementsByTagName("pageIndex")[i]; setInnerHTML(document.getElementById("pageindex_" + pageIndex.getAttribute("section")), pageIndex.firstChild.nodeValue); start[i] = pageIndex.getAttribute("startFrom"); } var numChanges = XMLDoc.getElementsByTagName("change").length; var curChange, curSection, curAction, curId, curList, curData, newItem, sInsertBeforeId; for (i = #; i < numChanges; i++) { curChange = XMLDoc.getElementsByTagName("change")[i]; curSection = curChange.getAttribute("section"); curAction = curChange.getAttribute("curAction"); curId = curChange.getAttribute("id"); curList = document.getElementById("messages_" + curSection); if (curAction == "remove") curList.removeChild(document.getElementById(curSection + "_" + curId)); // Insert a message. else { // By default, insert the element at the end of the list. sInsertBeforeId = null; // Loop through the list to try to find an item to insert after. oListItems = curList.getElementsByTagName("LI"); for (j = #; j < oListItems.length; j++) { if (parseInt(oListItems[j].id.substr(curSection.length + #)) > curId) { // This would be a nice place to insert the row. sInsertBeforeId = oListItems[j].id; // We're done for now. Escape the loop. j = oListItems.length + #; } } // Let's create a nice container for the message. newItem = document.createElement("LI"); newItem.className = "windowbg"; newItem.id = curSection + "_" + curId; newItem.innerHTML = "<div class=\"message_header\"><a class=\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\" href=\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=Snapshot+topic;topic=#;start#=#;move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\" onclick=\"return select('" + (curSection == "selected" ? "up" : "down") + "', " + curId + ");\"><span class=\"main_icons split_" + (curSection == "selected" ? "de" : "") + "sel\" title=\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\"></span></a><strong>" + curChange.getElementsByTagName("subject")[#].firstChild.nodeValue + "</strong> by <strong>" + curChange.getElementsByTagName("poster")[#].firstChild.nodeValue + "</strong><br><em>" + curChange.getElementsByTagName("time")[#].firstChild.nodeValue + "</em></div><div class=\"post\">" + curChange.getElementsByTagName("body")[#].firstChild.nodeValue + "</div>"; // So, where do we insert it? if (typeof sInsertBeforeId == "string") curList.insertBefore(newItem, document.getElementById(sInsertBeforeId)); else curList.appendChild(newItem); } } }
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes.txt
new file mode 100644
index 00000000000..eb975c109c4
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes.txt
@@ -0,0 +1,180 @@
+status 200
+@ title
+title
+  "Themes and Layout settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Manage and Install"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This page allows you to change the default theme, reset members to all use a certain theme, and choose other settings related to theme selection. You are also able to install themes from here."
+    br
+    "Do not forget to look at the theme settings for your themes for layout options."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      a.help [href="{boardurl}/index.php?action=helpadmin;help=themes_manage" onclick="return reqOverlayDiv(this.href);"]
+        span.help.main_icons [title="Help"]
+      "Manage and Install themes"
+  div.information
+    "Themes are the different looks and feels of your forum. These settings affect the selection of themes, and which themes guests and other members use."
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;sa=admin" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Settings"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="options-theme_allow"]
+            "Allow members to select their own themes."
+        dd
+          input [name="options[theme_allow]" type="hidden" value="#"]
+          input#options-theme_allow [checked name="options[theme_allow]" type="checkbox" value="#"]
+        dt
+          label [for="known_themes_list"]
+            "Themes that the user is able to select"
+        dd
+          div#known_themes_list
+            label [for="options-known_themes_#"]
+              input#options-known_themes_# [checked name="options[known_themes][]" type="checkbox" value="#"]
+              "SMF Default Theme - Curve#"
+            br
+          a#known_themes_link.button.floatnone.hidden [href="javascript:void(#);" onclick="document.getElementById('known_themes_list').classList.remove('hidden'); document.getElementById('known_themes_link').classList.add('hidden'); return false; "]
+            "Show the list of themes"
+          script
+            | document.getElementById("known_themes_list").classList.add('hidden'); document.getElementById("known_themes_link").classList.remove('hidden');
+        dt
+          label [for="theme_guests"]
+            "Overall forum default"
+        dd
+          select#theme_guests [name="options[theme_guests]"]
+            option [selected value="#"]
+              "SMF Default Theme - Curve#"
+          span.pick_theme.smalltext
+            a.button.floatnone [href="{boardurl}/index.php?action=themechooser;u=-#;{session_var}={session_id}"]
+              "choose..."
+        dt
+          label [for="theme_reset"]
+            "Reset everyone to"
+        dd
+          select#theme_reset [name="theme_reset"]
+            option [selected value="-#"]
+              "No change"
+            option [value="#"]
+              "Forum Default"
+            option [value="#"]
+              "SMF Default Theme - Curve#"
+          span.pick_theme.smalltext
+            a.button.floatnone [href="{boardurl}/index.php?action=themechooser;u=#;{session_var}={session_id}"]
+              "choose..."
+      input.button [name="save" type="submit" value="Save"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
+  div.cat_bar
+    h3.catbg
+      "Obtaining Themes"
+  div.windowbg
+    "You can always find new themes for your forum from the SMF themes area -"
+    strong
+      a [href="https://custom.simplemachines.org/themes/" rel="noopener" target="_blank"]
+        "https://custom.simplemachines.org/themes/"
+    ". You can browse them on the website, read the comments, and download them to your computer and then upload them to your forum from there."
+    br
+    "If you run into any questions with themes, each theme published on simplemachines.org has a dedicated topic about it where support and comments should be directed to."
+  div#admin_form_wrapper
+    div.cat_bar
+      h3.catbg
+        "Install a New Theme"
+    div.windowbg
+      fieldset
+        legend
+          "From an archive (e.g. .zip, .tar.gz)"
+        form.padding [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;sa=install;do=file" enctype="multipart/form-data" method="post"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input#theme_gz [name="theme_gz" onchange="this.form.copy.disabled = this.value != ''; this.form.theme_dir.disabled = this.value != '';" size="#" type="file" value="theme_gz"]
+          input.button [name="save_file" type="submit" value="Upload"]
+      fieldset
+        legend
+          "Create a copy of Default named"
+        form.padding [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;sa=install;do=copy" method="post"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input#copy [name="copy" size="#" type="text" value="theme#"]
+          input.button [name="save_copy" type="submit" value="Save"]
+      fieldset
+        legend
+          "From a directory on the server"
+        form.padding [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;sa=install;do=dir" method="post"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input#theme_dir [name="theme_dir" size="#" type="text" value="{boarddir}/Themes/"]
+          input.button [name="save_dir" type="submit" value="Save"]
+  script
+    | window.smfForum_scripturl = smf_scripturl; window.smfForum_sessionid = smf_session_id; window.smfForum_sessionvar = smf_session_var; window.smfThemes_writable = true;
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_copy.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_copy.txt
new file mode 100644
index 00000000000..0b28b9a9b68
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_copy.txt
@@ -0,0 +1,526 @@
+status 200
+@ title
+title
+  "Themes and Layout settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Manage and Install"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Modify the stylesheet and source code of your installed themes. Please consult the documentation for more information."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Filename"
+  div.information
+    "When SMF needs a template or language file which is not in the current theme, it looks in the theme it is based on, or the default theme."
+    br
+    "Unless you need to modify a template, it is better not to copy it."
+  div.windowbg
+    ul.theme_options
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Admin/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Agreement/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/BoardIndex/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Calendar/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Display/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/EditHistory/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Errors/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/EventEditor/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/GenericControls/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/GenericList/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/GenericMenu/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Help/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/index/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Likes/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Login/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageAttachments/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageBans/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageBoards/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageCalendar/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageLanguages/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageMail/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageMaintenance/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageMembergroups/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageMembers/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageNews/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManagePaid/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManagePermissions/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageScheduledTasks/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageSearch/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ManageSmileys/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Memberlist/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/MessageIndex/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ModerationCenter/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/MoveTopic/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Notify/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Packages/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/PersonalMessage/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Poll/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Post/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Printpage/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Profile/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Recent/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Register/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Reminder/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ReportedContent/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Reports/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/ReportToMod/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Search/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Settings/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/SplitTopics/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Stats/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Themes/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/TimeZoneSelect/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Who/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
+      li.flow_hidden.windowbg
+        span.floatleft
+          "templates/Xml/"
+          span.error
+            "(already exists)"
+        span.floatright
+          em
+            "(can’t copy)"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_edit.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_edit.txt
new file mode 100644
index 00000000000..f2f6ba049ff
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_edit.txt
@@ -0,0 +1,96 @@
+status 200
+@ title
+title
+  "Themes and Layout settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Modify Themes"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Modify the stylesheet and source code of your installed themes. Please consult the documentation for more information."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    div.cat_bar
+      h3.catbg
+        "Modify Themes"
+    div.windowbg
+      fieldset
+        legend
+          a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=edit"]
+            "SMF Default Theme - Curve#"
+        ul
+          li
+            a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=edit"]
+              "Browse the templates and files in this theme."
+          li
+            a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=edit;directory=css"]
+              "Edit this theme’s stylesheets."
+          li
+            a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=copy"]
+              "Copy a template from the theme this is based on."
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_list.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_list.txt
new file mode 100644
index 00000000000..035cfdbf7b8
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_list.txt
@@ -0,0 +1,126 @@
+status 200
+@ title
+title
+  "Themes and Layout settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Theme Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here, you can view the list of themes you currently have installed, change their paths and settings, and uninstall them."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Theme Settings overview"
+  div.information
+    "Remember, the layout settings may be different between one theme and another. Click on the settings icon for a theme below to set their options, change their directory or URL settings, or to find other options."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id};sa=list" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Theme Settings"
+    br
+    div.cat_bar
+      h3.catbg
+        span.floatleft
+          "SMF Default Theme - Curve#"
+        span.floatright
+          a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=list"]
+            span.main_icons.settings
+    div.windowbg
+      dl.settings.themes_list
+        dt
+          "Theme directory (templates)"
+        dd
+          "{boarddir}/Themes/default"
+        dt
+          "URL to above directory"
+        dd
+          "{boardurl}/Themes/default"
+        dt
+          "URL to images directory"
+        dd
+          "{boardurl}/Themes/default/images"
+    div.cat_bar
+      h3.catbg
+        "Reset Theme URLs and Directories"
+    div.windowbg
+      dl.settings
+        dt
+          label [for="reset_dir"]
+            "Base path to Themes directory"
+        dd
+          input#reset_dir [name="reset_dir" size="#" type="text" value="{boarddir}/Themes"]
+        dt
+          label [for="reset_url"]
+            "Base URL to the same directory"
+        dd
+          input#reset_url [name="reset_url" size="#" type="text" value="{boardurl}/Themes"]
+      input.button [name="save" type="submit" value="Attempt to reset all themes"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset.txt
new file mode 100644
index 00000000000..82bb49b6cb0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset.txt
@@ -0,0 +1,103 @@
+status 200
+@ title
+title
+  "Themes and Layout settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Member Options"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Below you will see an interface to change the current theme-specific options for all your members. You will only see those themes that have their own set of settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div.cat_bar
+    h3.catbg
+      "Member Options"
+  div.information
+    "Each theme may have its own custom options for selection by your members. These include things like avatars, signatures, layout options and other similar options. Here you can change the defaults or reset everyone’s options."
+    br
+    "Please note that some themes may use the default options, in which case they will not have their own options."
+  div#admin_form_wrapper
+    div.cat_bar
+      h3.catbg
+        "SMF Default Theme - Curve#"
+    div.windowbg
+      ul
+        li
+          a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=reset"]
+            "Configure guest and new user options for this theme"
+          em.smalltext
+            "(# option(s) currently set.)"
+        li
+          a [href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=reset;who=#"]
+            "Change current options for all members using this theme"
+        li
+          a.you_sure [data-confirm="Are you sure you want to remove all theme options?-n-This may reset some custom profile fields as well." href="{boardurl}/index.php?action=admin;area=theme;th=#;{session_var}={session_id};sa=reset;who=#;{token}"]
+            "Remove all members’ options and use the defaults"
+          em.smalltext
+            "(# member(s) currently using their own options.)"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset_options.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset_options.txt
new file mode 100644
index 00000000000..4eb0417ca23
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_reset_options.txt
@@ -0,0 +1,362 @@
+status 200
+@ title
+title
+  "Theme Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Member Options"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "Below you will see an interface to change the current theme-specific options for all your members. You will only see those themes that have their own set of settings."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;th=#;sa=reset" method="post"]
+    input [name="who" type="hidden" value="#"]
+    div.cat_bar
+      h3.catbg
+        "Change or reset user options for SMF Default Theme - Curve#"
+    div.information.noup
+      "The options below will reset options for"
+      em
+        "everyone"
+      ". To change an option, select \"change\" in the box next to it, and then select a value for it. To use the default, select \"default\". Otherwise, use \"do not change\" to keep it as-is."
+    div.noup.windowbg
+      dl.settings
+        dt
+          strong
+            "Theme Color Mode"
+        dd
+        dt
+          select [name="default_options_master[theme_colormode]" onchange="this.form.options_theme_colormode.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_theme_colormode"]
+            "Select Color Mode"
+        dd
+          select#options_theme_colormode.floatleft [disabled name="default_options[theme_colormode]"]
+            option [value="light"]
+              "Light"
+            option [value="system"]
+              "System Default"
+            option [value="dark"]
+              "Dark"
+      hr
+      dl.settings
+        dt
+          strong
+            "Board and Topic display"
+        dd
+        dt
+          select [name="default_options_master[show_children]" onchange="this.form.options_show_children.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_show_children"]
+            "Show sub-boards on every page inside boards, not just the first"
+        dd
+          input [name="default_options[show_children]" type="hidden" value="#"]
+          input#options_show_children.floatleft [disabled name="default_options[show_children]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[topics_per_page]" onchange="this.form.options_topics_per_page.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_topics_per_page"]
+            "Topics to display per page"
+        dd
+          select#options_topics_per_page.floatleft [disabled name="default_options[topics_per_page]"]
+            option [value="#"]
+              "forum default"
+            option [value="#"]
+              "#"
+        dt
+          select [name="default_options_master[messages_per_page]" onchange="this.form.options_messages_per_page.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_messages_per_page"]
+            "Messages to display per page"
+        dd
+          select#options_messages_per_page.floatleft [disabled name="default_options[messages_per_page]"]
+            option [value="#"]
+              "forum default"
+            option [value="#"]
+              "#"
+        dt
+          select [name="default_options_master[view_newest_first]" onchange="this.form.options_view_newest_first.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_view_newest_first"]
+            "Show most recent posts at the top in topic view"
+        dd
+          input [name="default_options[view_newest_first]" type="hidden" value="#"]
+          input#options_view_newest_first.floatleft [disabled name="default_options[view_newest_first]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[show_no_avatars]" onchange="this.form.options_show_no_avatars.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_show_no_avatars"]
+            "Don’t show users’ avatars"
+        dd
+          input [name="default_options[show_no_avatars]" type="hidden" value="#"]
+          input#options_show_no_avatars.floatleft [disabled name="default_options[show_no_avatars]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[show_no_signatures]" onchange="this.form.options_show_no_signatures.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_show_no_signatures"]
+            "Don’t show users’ signatures"
+        dd
+          input [name="default_options[show_no_signatures]" type="hidden" value="#"]
+          input#options_show_no_signatures.floatleft [disabled name="default_options[show_no_signatures]" type="checkbox" value="#"]
+        dt
+          select [name="options_master[posts_apply_ignore_list]" onchange="this.form.options_posts_apply_ignore_list.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_posts_apply_ignore_list"]
+            "Hide messages posted by members on my ignore list"
+        dd
+          input [name="options[posts_apply_ignore_list]" type="hidden" value="#"]
+          input#options_posts_apply_ignore_list.floatleft [disabled name="options[posts_apply_ignore_list]" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          strong
+            "Posting"
+        dd
+        dt
+          select [name="default_options_master[return_to_post]" onchange="this.form.options_return_to_post.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_return_to_post"]
+            "Return to topics after posting by default"
+        dd
+          input [name="default_options[return_to_post]" type="hidden" value="#"]
+          input#options_return_to_post.floatleft [disabled name="default_options[return_to_post]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[no_new_reply_warning]" onchange="this.form.options_no_new_reply_warning.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_no_new_reply_warning"]
+            "Don’t warn on new replies made while posting."
+        dd
+          input [name="default_options[no_new_reply_warning]" type="hidden" value="#"]
+          input#options_no_new_reply_warning.floatleft [disabled name="default_options[no_new_reply_warning]" type="checkbox" value="#"]
+        dt
+          select [name="options_master[wysiwyg_default]" onchange="this.form.options_wysiwyg_default.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_wysiwyg_default"]
+            "Load editor in"
+            abbr [title="What You See Is What You Get"]
+              "WYSIWYG"
+            "mode by default"
+        dd
+          input [name="options[wysiwyg_default]" type="hidden" value="#"]
+          input#options_wysiwyg_default.floatleft [disabled name="options[wysiwyg_default]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[drafts_autosave_enabled]" onchange="this.form.options_drafts_autosave_enabled.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_drafts_autosave_enabled"]
+            "Enable automatic saving of drafts"
+        dd
+          input [name="default_options[drafts_autosave_enabled]" type="hidden" value="#"]
+          input#options_drafts_autosave_enabled.floatleft [disabled name="default_options[drafts_autosave_enabled]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[drafts_show_saved_enabled]" onchange="this.form.options_drafts_show_saved_enabled.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_drafts_show_saved_enabled"]
+            "Enable the selection of drafts from the posting screen"
+        dd
+          input [name="default_options[drafts_show_saved_enabled]" type="hidden" value="#"]
+          input#options_drafts_show_saved_enabled.floatleft [disabled name="default_options[drafts_show_saved_enabled]" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          strong
+            "Moderation"
+        dd
+        dt
+          select [name="default_options_master[display_quick_mod]" onchange="this.form.options_display_quick_mod.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_display_quick_mod"]
+            "Show quick-moderation as"
+        dd
+          select#options_display_quick_mod.floatleft [disabled name="default_options[display_quick_mod]"]
+            option [value="#"]
+              "don’t show"
+            option [value="#"]
+              "checkboxes"
+            option [value="#"]
+              "icons"
+      hr
+      dl.settings
+        dt
+          strong
+            "Personal Messages"
+        dd
+        dt
+          select [name="default_options_master[popup_messages]" onchange="this.form.options_popup_messages.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_popup_messages"]
+            "Show a popup when I receive new messages."
+        dd
+          input [name="default_options[popup_messages]" type="hidden" value="#"]
+          input#options_popup_messages.floatleft [disabled name="default_options[popup_messages]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[view_newest_pm_first]" onchange="this.form.options_view_newest_pm_first.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_view_newest_pm_first"]
+            "Show most recent personal messages at top"
+        dd
+          input [name="default_options[view_newest_pm_first]" type="hidden" value="#"]
+          input#options_view_newest_pm_first.floatleft [disabled name="default_options[view_newest_pm_first]" type="checkbox" value="#"]
+        dt
+          select [name="default_options_master[pm_remove_inbox_label]" onchange="this.form.options_pm_remove_inbox_label.disabled = this.selectedIndex != #;"]
+            option [selected value="#"]
+              "Do not change"
+            option [value="#"]
+              "Change"
+            option [value="#"]
+              "Default"
+          label [for="options_pm_remove_inbox_label"]
+            "Remove the inbox label when applying another label"
+        dd
+          input [name="default_options[pm_remove_inbox_label]" type="hidden" value="#"]
+          input#options_pm_remove_inbox_label.floatleft [disabled name="default_options[pm_remove_inbox_label]" type="checkbox" value="#"]
+      hr
+      dl.settings
+      input.button [name="submit" type="submit" value="Save"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/themes_settings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/themes_settings.txt
new file mode 100644
index 00000000000..c93822c97f6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/themes_settings.txt
@@ -0,0 +1,264 @@
+status 200
+@ title
+title
+  "Theme Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Themes and Layout"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Theme Settings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Themes and Layout settings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "From here, you can view the list of themes you currently have installed, change their paths and settings, and uninstall them."
+  a.mobile_generic_menu_1_tabs
+    span.menu_icon
+    span.text_menu
+      "Themes and Layout settings Menu"
+  div#adm_submenus
+    div#mobile_generic_menu_#_tabs.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Themes and Layout settings Menu"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.generic_menu
+          ul.dropdown_menu_1_tabs.dropmenu
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=admin;{session_var}={session_id}"]
+                "Manage and Install"
+            li
+              a.active [href="{boardurl}/index.php?action=admin;area=theme;sa=list;{session_var}={session_id}"]
+                "Theme Settings"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=reset;{session_var}={session_id}"]
+                "Member Options"
+            li
+              a [href="{boardurl}/index.php?action=admin;area=theme;sa=edit;{session_var}={session_id}"]
+                "Modify Themes"
+  script
+    | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+  div#admin_form_wrapper
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=theme;sa=list;th=#" method="post"]
+      div.cat_bar
+        h3.catbg
+          a.help [href="{boardurl}/index.php?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          "Theme Settings for SMF Default Theme - Curve#"
+      div.windowbg
+        div.title_bar
+          h3.config_hd.titlebg
+            "Theme URLs and Configuration"
+        dl.settings
+          dt
+            label [for="theme_name"]
+              "This theme’s name:"
+          dd
+            input#theme_name [name="options[name]" size="#" type="text" value="SMF Default Theme - Curve#"]
+          dt
+            label [for="theme_url"]
+              "This theme’s URL:"
+          dd
+            input#theme_url [name="options[theme_url]" size="#" type="text" value="{boardurl}/Themes/default"]
+          dt
+            label [for="images_url"]
+              "This theme’s images URL:"
+          dd
+            input#images_url [name="options[images_url]" size="#" type="text" value="{boardurl}/Themes/default/images"]
+          dt
+            label [for="theme_dir"]
+              "This theme’s directory:"
+          dd
+            input#theme_dir [name="options[theme_dir]" size="#" type="text" value="{boarddir}/Themes/default"]
+        div.title_bar
+          h3.config_hd.titlebg
+            "Theme Color Modes"
+        dl.settings
+          dt
+            label [for="colormode"]
+              "Default color mode"
+          dd
+            select#colormode [name="options[default_colormode]"]
+              option [value="light"]
+                "Light"
+              option [value="system"]
+                "System Default"
+              option [value="dark"]
+                "Dark"
+          dt
+            label [for="disable_user_mode"]
+              "Disable user color mode selection"
+          dd
+            input [name="options[disable_user_mode]" type="hidden" value="#"]
+            input#disable_user_mode [name="options[disable_user_mode]" type="checkbox" value="#"]
+        div.title_bar
+          h3.config_hd.titlebg
+            "Theme Options and Preferences"
+        dl.settings
+          dt
+            label [for="options_header_logo_url"]
+              strong
+                "Logo image URL"
+            ":"
+            br
+            span.smalltext
+              "Leave blank to show forum name or default logo."
+          dd
+            input#options_header_logo_url [name="options[header_logo_url]" size="#" type="text" value]
+          dt
+            label [for="options_site_slogan"]
+              strong
+                "Site slogan"
+            ":"
+            br
+            span.smalltext
+              "Add your own text for a slogan here. It will replace the SMF logo."
+          dd
+            input#options_site_slogan [name="options[site_slogan]" size="#" type="text" value]
+          dt
+            label [for="options_og_image"]
+              strong
+                "Open Graph image"
+            ":"
+            br
+            span.smalltext
+              "Suggested size: #x#px."
+              a.bbc_link [href="https://ogp.me/" target="_blank"]
+                "Open Graph"
+              "is used for social media sharing."
+          dd
+            input#options_og_image [name="options[og_image]" size="#" type="url" value]
+        hr
+        dl.settings
+          dt
+            label [for="options_smiley_sets_default"]
+              strong
+                "Select default smiley set for this theme"
+            ":"
+          dd
+            select#options_smiley_sets_default [name="options[smiley_sets_default]"]
+              option [selected value]
+                "(use global default smiley set)"
+              option [value="none"]
+                "No smileys"
+              option [value="fugue"]
+                "Fugue’s Set"
+              option [value="alienine"]
+                "Alienine’s Set"
+        hr
+        dl.settings
+          dt
+            label [for="options_enable_news"]
+              strong
+                "Enable random news line in the forum header"
+            ":"
+          dd
+            input [name="options[enable_news]" type="hidden" value="#"]
+            input#options_enable_news [checked name="options[enable_news]" type="checkbox" value="#"]
+          dt
+            label [for="options_show_newsfader"]
+              strong
+                "Show news fader on board index"
+            ":"
+          dd
+            input [name="options[show_newsfader]" type="hidden" value="#"]
+            input#options_show_newsfader [name="options[show_newsfader]" type="checkbox" value="#"]
+          dt
+            label [for="options_newsfader_time"]
+              strong
+                "Fading delay between items for the news fader, in milliseconds"
+            ":"
+          dd
+            input#options_newsfader_time [min="#" name="options[newsfader_time]" type="number" value="#"]
+        hr
+        dl.settings
+          dt
+            label [for="options_number_recent_posts"]
+              strong
+                "Number of recent posts to display on board index"
+            ":"
+            br
+            span.smalltext
+              "(Set to # to(s) disable.)"
+          dd
+            input#options_number_recent_posts [min="#" name="options[number_recent_posts]" type="number" value="#"]
+          dt
+            label [for="options_show_stats_index"]
+              strong
+                "Show statistics on board index"
+            ":"
+          dd
+            input [name="options[show_stats_index]" type="hidden" value="#"]
+            input#options_show_stats_index [checked name="options[show_stats_index]" type="checkbox" value="#"]
+          dt
+            label [for="options_show_latest_member"]
+              strong
+                "Show latest member on board index"
+            ":"
+          dd
+            input [name="options[show_latest_member]" type="hidden" value="#"]
+            input#options_show_latest_member [checked name="options[show_latest_member]" type="checkbox" value="#"]
+          dt
+            label [for="options_show_group_key"]
+              strong
+                "Show group key on board index"
+            ":"
+          dd
+            input [name="options[show_group_key]" type="hidden" value="#"]
+            input#options_show_group_key [name="options[show_group_key]" type="checkbox" value="#"]
+          dt
+            label [for="options_display_who_viewing"]
+              strong
+                "Show who is viewing boards and topics"
+            ":"
+          dd
+            select#options_display_who_viewing [name="options[display_who_viewing]"]
+              option [value="#"]
+                "Do not show"
+              option [value="#"]
+                "Show only numbers"
+              option [value="#"]
+                "Show member names"
+        input.button [name="save" type="submit" value="Save"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+
+= errors logged
+[undefined_vars] #: Undefined array key "default_colormode"
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/track_ip.txt b/tests/Integration/Http/Snapshot/snapshots/admin/track_ip.txt
new file mode 100644
index 00000000000..fd52cf7dec7
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/track_ip.txt
@@ -0,0 +1,101 @@
+status 200
+@ title
+title
+  "Track IP Address #"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.cat_bar
+      h3.catbg
+        "IP Address"
+    div.windowbg
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=trackip" method="post"]
+        dl.settings
+          dt
+            label [for="searchip"]
+              strong
+                "Enter IP (range)"
+          dd
+            input#searchip [name="searchip" type="text" value="#"]
+        input.button [type="submit" value="IP Address"]
+    br
+    div.cat_bar
+      h3.catbg
+        "Look up # on(s) a regional whois-server"
+    div.windowbg
+      a [href="https://wq.apnic.net/apnic-bin/whois.pl?searchtext=#" rel="noopener" target="_blank"]
+        "APNIC (Asia Pacific region)"
+      br
+      a [href="https://whois.arin.net/rest/ip/#" rel="noopener" target="_blank"]
+        "ARIN (North America, a portion of the Caribbean and sub-Saharan Africa)"
+      br
+      a [href="https://query.milacnic.lacnic.net/search?id=#" rel="noopener" target="_blank"]
+        "LACNIC (Latin American and Caribbean region)"
+      br
+      a [href="https://apps.db.ripe.net/db-web-ui/query?searchtext=#" rel="noopener" target="_blank"]
+        "RIPE (Europe, the Middle East and parts of Africa and Asia)"
+      br
+    br
+    div.cat_bar
+      h3.catbg
+        "Members from IP range #"
+    table.table_grid
+      thead
+        tr.title_bar
+          th [scope="col"]
+            "IP address"
+          th [scope="col"]
+            "Display name"
+      snapshot-ignored [selector="table.table_grid tbody"]
+    br
+    div.cat_bar
+      h3.catbg
+        "Messages posted from IP range #"
+    div.flow_hidden.information
+      div.additional_row
+        "Below is a list of all messages posted from this IP (range)."
+    table#track_message_list.table_grid
+      thead
+        tr.title_bar
+          th#header_track_message_list_ip_address.ip_address [scope="col"]
+            a [href="{boardurl}/index.php?action=trackip;searchip=#;sort=ip_address" rel="nofollow"]
+              "IP address"
+          th#header_track_message_list_poster.poster [scope="col"]
+            "Poster"
+          th#header_track_message_list_subject.subject [scope="col"]
+            "Subject"
+          th#header_track_message_list_date.date [scope="col"]
+            a [href="{boardurl}/index.php?action=trackip;searchip=#;sort=date;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+      snapshot-ignored [selector="table.table_grid tbody"]
+    br
+    div.cat_bar
+      h3.catbg
+        "Error messages from IP range #"
+    div.flow_hidden.information
+      div.additional_row
+        "Below is a list of all recent error messages generated by this IP (range)."
+    table#track_user_list.table_grid
+      thead
+        tr.title_bar
+          th#header_track_user_list_ip_address#.ip_address2 [scope="col"]
+            a [href="{boardurl}/index.php?action=trackip;searchip=#;sort=ip_address#" rel="nofollow"]
+              "IP address"
+          th#header_track_user_list_display_name.display_name [scope="col"]
+            "Display name"
+          th#header_track_user_list_message.message [scope="col"]
+            "Message"
+          th#header_track_user_list_date#.date2 [scope="col"]
+            a [href="{boardurl}/index.php?action=trackip;searchip=#;sort=date#;desc" rel="nofollow"]
+              "Date"
+              span.main_icons.sort_up
+      snapshot-ignored [selector="table.table_grid tbody"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/admin/warnings.txt b/tests/Integration/Http/Snapshot/snapshots/admin/warnings.txt
new file mode 100644
index 00000000000..9d435c6c1c1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/admin/warnings.txt
@@ -0,0 +1,172 @@
+status 200
+@ title
+title
+  "Warnings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin" itemprop="item"]
+        span [itemprop="name"]
+          "Administration Center"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=admin;area=warnings;{session_var}={session_id}" itemprop="item"]
+        span [itemprop="name"]
+          "Warnings"
+      meta [content="#" itemprop="position"]
+@ #admin_content
+div#admin_content
+  div.cat_bar
+    h3.catbg
+      "Warnings"
+    form.admin_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=search" method="post"]
+      span.centericon.filter.main_icons
+      input [name="search_term" placeholder="Quick Search" type="search"]
+      select [name="search_type"]
+        option [selected value="internal"]
+          "Task/Setting"
+        option [value="member"]
+          "Member"
+        option [value="online"]
+          "Online Manual"
+      input#search_go.button [name="search_go" type="submit" value="Go"]
+  p.information
+    "This system allows administrators and moderators to issue warnings to users, and can automatically remove user rights as their warning level increases. To take full advantage of this system, \"Post Moderation\" should be enabled."
+  form#admin_form_wrapper [accept-charset="UTF-#" action="{boardurl}/index.php?action=admin;area=warnings;save" method="post"]
+    div.cat_bar
+      h3.catbg
+        "Warnings"
+    div.noup.windowbg
+      dl.settings
+        dt
+          a#setting_warning_enable_help [href="{boardurl}/index.php?action=helpadmin;help=warning_enable" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_warning_enable
+          span
+            label [for="warning_enable"]
+              "Enable User Warning system"
+        dd
+          input#warning_enable [checked name="warning_enable" type="checkbox" value="#"]
+      hr
+      dl.settings
+        dt
+          a#setting_warning_watch_help [href="{boardurl}/index.php?action=helpadmin;help=warning_watch" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_warning_watch
+          span
+            label [for="warning_watch"]
+              "Warning level for user watch"
+            br
+            span.smalltext
+              "The user warning level after which a user watch is put in place. (Set to # to(s) disable.)"
+        dd
+          input#warning_watch [min="#" name="warning_watch" size="#" type="number" value="#"]
+        dt
+          a#setting_warning_mute_help [href="{boardurl}/index.php?action=helpadmin;help=warning_mute" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_warning_mute
+          span
+            label [for="warning_mute"]
+              "Warning level for user muting"
+            br
+            span.smalltext
+              "The user warning level after which a user cannot post any further. (Set to # to(s) disable.)"
+        dd
+          input#warning_mute [min="#" name="warning_mute" size="#" type="number" value="#"]
+        dt
+          a#setting_user_limit_help [href="{boardurl}/index.php?action=helpadmin;help=user_limit" onclick="return reqOverlayDiv(this.href);"]
+            span.help.main_icons [title="Help"]
+          a#setting_user_limit
+          span
+            label [for="user_limit"]
+              "Maximum user warning points per day"
+            br
+            span.smalltext
+              "This value is the maximum amount of warning points a single moderator can assign to a user in a {duration} period - # for(s) no limit."
+        dd
+          input#user_limit [min="#" name="user_limit" size="#" type="number" value="#"]
+        dt
+          a#setting_warning_decrement
+          span
+            label [for="warning_decrement"]
+              "Warning points that are decreased every {duration}"
+            br
+            span.smalltext
+              "Only applies to users not warned within last {duration}. (Set to # to(s) disable.)"
+        dd
+          input#warning_decrement [min="#" name="warning_decrement" size="#" type="number" value="#"]
+        dt
+          a#setting_view_warning_any
+          span
+            label
+              "Users who can see any warning status"
+        dd
+          fieldset#view_warning_any
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('view_warning_any').style.display = 'none';document.getElementById('view_warning_any_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="view_warning_any[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="view_warning_any[-#]" type="checkbox" value="on"]
+                span
+                  "Guests"
+              li
+                input [name="view_warning_any[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'view_warning_any[');" type="checkbox"]
+                span
+                  "Select all"
+          a#view_warning_any_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('view_warning_any').style.display = 'block'; document.getElementById('view_warning_any_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("view_warning_any").style.display = "none"; document.getElementById("view_warning_any_groups_link").style.display = "";
+        dt
+          a#setting_view_warning_own
+          span
+            label
+              "Users who can see their own warning status"
+        dd
+          fieldset#view_warning_own
+            legend
+              a.toggle_up [href="javascript:void(#);" onclick="document.getElementById('view_warning_own').style.display = 'none';document.getElementById('view_warning_own_groups_link').style.display = 'block'; return false;"]
+                "Select permissions for each group"
+            ul
+              li
+                input [name="view_warning_own[#]" type="checkbox" value="on"]
+                span
+                  "Regular Members"
+              li
+                input [name="view_warning_own[-#]" type="checkbox" value="on"]
+                span
+                  "Guests"
+              li
+                input [name="view_warning_own[#]" type="checkbox" value="on"]
+                span
+                  "Global Moderator"
+              li
+                input [onclick="invertAll(this, this.form, 'view_warning_own[');" type="checkbox"]
+                span
+                  "Select all"
+          a#view_warning_own_groups_link.toggle_down [href="javascript:void(#);" onclick="document.getElementById('view_warning_own').style.display = 'block'; document.getElementById('view_warning_own_groups_link').style.display = 'none'; return false;" style="display: none;"]
+            "Select permissions for each group"
+          script
+            | document.getElementById("view_warning_own").style.display = "none"; document.getElementById("view_warning_own_groups_link").style.display = "";
+      input.button [type="submit" value="Save"]
+    input [name="{token_var}" type="hidden" value="{hash}"]
+    input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/activate.txt b/tests/Integration/Http/Snapshot/snapshots/guest/activate.txt
new file mode 100644
index 00000000000..c4bdabd5697
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/activate.txt
@@ -0,0 +1,25 @@
+status 403
+@ title
+title
+  "An error has occurred"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#fatal_error
+      div.cat_bar
+        h3.catbg
+          "An error has occurred"
+      div.windowbg
+        div#no_access.padding
+          "You are not allowed to access this section"
+    div.centertext
+      a.button.floatnone [href="javascript:document.location=document.referrer"]
+        "Back"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/agreement.txt b/tests/Integration/Http/Snapshot/snapshots/guest/agreement.txt
new file mode 100644
index 00000000000..669e4ba537c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/agreement.txt
@@ -0,0 +1,39 @@
+status 200
+@ title
+title
+  "Registration Agreement"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=agreement" itemprop="item"]
+        span [itemprop="name"]
+          "Registration Agreement"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.cat_bar
+      h3.catbg
+        "Registration Agreement"
+    div.noup.windowbg
+      "You agree, through your use of this forum, that you will not post any material which is false, defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person's privacy, adult material, or otherwise in violation of any International or United States Federal law. You also agree not to post any copyrighted material unless you own the copyright or you have written consent from the owner of the copyrighted material. Spam, flooding, advertisements, chain letters, pyramid schemes, and solicitations are also forbidden on this forum."
+      br
+      "Note that it is impossible for the staff or the owners of this forum to confirm the validity of posts. Please remember that we do not actively monitor the posted messages, and as such, are not responsible for the content contained within. We do not warrant the accuracy, completeness, or usefulness of any information presented. The posted messages express the views of the author, and not necessarily the views of this forum, its staff, its subsidiaries, or this forum's owner. Anyone who feels that a posted message is objectionable is encouraged to notify an administrator or moderator of this forum immediately. The staff and the owner of this forum reserve the right to remove objectionable content, within a reasonable time frame, if they determine that removal is necessary. This is a manual process, however, please realize that they may not be able to remove or edit particular messages immediately. This policy applies to member profile information as well."
+      br
+      "You remain solely responsible for the content of your posted messages. Furthermore, you agree to indemnify and hold harmless the owners of this forum, any related websites to this forum, its staff, and its subsidiaries. The owners of this forum also reserve the right to reveal your identity (or any other related information collected on this service) in the event of a formal complaint or legal action arising from any situation caused by your use of this forum."
+      br
+      "You have the ability, as you register, to choose your username. We advise that you keep the name appropriate. With this user account you are about to register, you agree to never give your password out to another person except an administrator, for your protection and for validity reasons. You also agree to NEVER use another person's account for any reason. We also HIGHLY recommend you use a complex and unique password for your account, to prevent account theft."
+      br
+      "After you register and login to this forum, you will be able to fill out a detailed profile. It is your responsibility to present clean and accurate information. Any information the forum owner or staff determines to be inaccurate or vulgar in nature will be removed, with or without prior notice. Appropriate sanctions may be applicable."
+      br
+      "Please note that with each post, your IP address is recorded, in the event that you need to be banned from this forum or your ISP contacted. This will only happen in the event of a major violation of this agreement."
+      br
+      "Also note that the software places a cookie, a text file containing bits of information (such as your username and password), in your browser's cache. This is ONLY used to keep you logged in/out. The software does not collect or send any other form of information to your computer."
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/board_index.txt b/tests/Integration/Http/Snapshot/snapshots/guest/board_index.txt
new file mode 100644
index 00000000000..871417f6cdf
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/board_index.txt
@@ -0,0 +1,92 @@
+status 200
+@ title
+title
+  "{forum_name} - Index"
+@ #category_#
+div#category_#.cat_bar
+  h3.catbg
+    a#c#
+    "Snapshot fixtures"
+  div.desc
+    "Content for the template snapshot tests, version #."
+@ #category_#_boards
+div#category_#_boards
+  div#board_#.up_contain
+    div.board_icon
+      a.board_on [href="{boardurl}/index.php?board=#" title="New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "Topics, replies and a poll for the snapshot tests."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+      p
+        strong
+          "Last post:"
+        "{date}"
+        span.postby
+          a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+            "{subject}"
+          "by"
+          a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+            "{member}"
+    div#board_#_children.children
+      p
+        strong#child_list_#
+          "Sub-Boards"
+        span
+          a [href="{boardurl}/index.php?board=#" title="No New Posts (# topic(s), # post(s))"]
+            "{board}"
+  div#board_#.up_contain
+    div.board_icon
+      a.board_on [href="{boardurl}/index.php?board=#" title="New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "A board with nothing in it."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+@ #info_center
+div#info_center.roundframe
+  div.title_bar
+    h3.titlebg
+      a#upshrink_link [href="#"]
+        "{forum_name} - Info Center"
+    span#upshrink_ic.toggle_up [style="display: none;" title="Hide Info Center"]
+  div#upshrink_stats
+    div.sub_bar
+      h4.subbg
+        a [href="{boardurl}/index.php?action=stats" title="[More Stats]"]
+          span.main_icons.stats
+          "Forum Stats"
+    p.inline
+      "# post(s) in # topic(s) by # member(s) - Latest Member:"
+      strong
+        a [href="{boardurl}/index.php?action=profile;u=#"]
+          "{member}"
+      br
+      "Latest Post:"
+      strong
+        "\""
+        a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+          "{subject}"
+        "\""
+      "({date})"
+      br
+      a [href="{boardurl}/index.php?action=recent"]
+        "View the most recent posts on the forum."
+    div.sub_bar
+      h4.subbg
+        span.main_icons.people
+        "Users Online"
+    snapshot-ignored [selector="#upshrink_stats > p:nth-of-type(#)"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/chrome.txt b/tests/Integration/Http/Snapshot/snapshots/guest/chrome.txt
new file mode 100644
index 00000000000..63fef5af379
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/chrome.txt
@@ -0,0 +1,124 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  link [href="https://use.fontawesome.com/releases/v#/css/all.css" rel="stylesheet"]
+  style
+    | img.avatar { max-width: #px !important; max-height: #px !important; }
+  noscript
+    link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  script
+    | var smf_theme_url = "{boardurl}/Themes/default"; var smf_default_theme_url = "{boardurl}/Themes/default"; var smf_images_url = "{boardurl}/Themes/default/images"; var smf_smileys_url = "{boardurl}/Smileys"; var smf_smiley_sets = "fugue,alienine"; var smf_smiley_sets_default = "fugue"; var smf_avatars_url = "{boardurl}/avatars"; var smf_scripturl = "{boardurl}/index.php"; var smf_charset = "UTF-#"; var smf_session_id = "{session_id}"; var smf_session_var = "{session_var}"; var smf_member_id = #; var ajax_notification_text = 'Loading...'; var help_popup_heading_text = 'A little lost? Let me explain:'; var banned_text = 'Sorry Guest, you are banned from using this forum!'; var smf_txt_expand = 'Expand'; var smf_txt_shrink = 'Shrink'; var smf_collapseAlt = 'Hide Category'; var smf_expandAlt = 'Show Category'; var smf_quote_expand = false; var allow_xhjr_credentials = false;
+  script [src="https://ajax.googleapis.com/ajax/libs/jquery/#/jquery.min.js"]
+  script [src="{boardurl}/Themes/default/scripts/minified_{hash}.js?smf#alpha#dev_#"]
+  script [defer src="{boardurl}/Themes/default/scripts/minified_{hash}.js?smf#alpha#dev_#"]
+  script
+    | var smf_you_sure ='Are you sure you want to do this?';
+  title
+    "{forum_name} - Index"
+  meta [content="width=device-width, initial-scale=#" name="viewport"]
+  meta [content="{forum_name}" property="og:site_name"]
+  meta [content="{forum_name} - Index" property="og:title"]
+  meta [content="{boardurl}/index.php" property="og:url"]
+  meta [content="{forum_name} - Index" property="og:description"]
+  meta [content="{forum_name} - Index" name="description"]
+  meta [content="##EA#" name="theme-color"]
+  link [href="{boardurl}/index.php" rel="canonical"]
+  link [href="{boardurl}/index.php?action=help" rel="help"]
+  link [href="{boardurl}/index.php" rel="contents"]
+  link [href="{boardurl}/index.php?action=search" rel="search"]
+  link [href="{boardurl}/index.php?action=feed;type=rss#" rel="alternate" title="{forum_name} - RSS" type="application/rss+xml"]
+  link [href="{boardurl}/index.php?action=feed;type=atom" rel="alternate" title="{forum_name} - Atom" type="application/atom+xml"]
+@ body
+body#smf.action_home
+  div#footerfix
+    div#top_section
+      div.content_wrapper.inner_wrap
+        ul#top_info.floatleft
+          li.welcome
+            "Welcome to"
+            strong
+              "{forum_name}"
+            "."
+          li.button_login
+            a.open [href="{boardurl}/index.php?action=login" onclick="return reqOverlayDiv(this.href, 'Log in', 'login');"]
+              span.login.main_icons
+              span.textmenu
+                "Log in"
+          li.button_signup
+            a.open [href="{boardurl}/index.php?action=signup"]
+              span.main_icons.regcenter
+              span.textmenu
+                "Sign up"
+        form#search_form.floatright [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post"]
+          input [name="search" type="search" value]
+          select [name="search_selection"]
+            option [selected value="all"]
+              "Entire forum"
+          input.button [name="search#" type="submit" value="Search"]
+          input [name="advanced" type="hidden" value="#"]
+    header#header.content_wrapper
+      h1.forumtitle
+        a#top [href="{boardurl}/index.php"]
+          "{forum_name}"
+      img#smflogo [alt="Simple Machines Forum" src="{boardurl}/Themes/default/images/smflogo.svg" title="Simple Machines Forum"]
+    nav#main_menu [aria-label="Main Menu"]
+      div.content_wrapper
+        a.mobile_user_menu
+          span.menu_icon
+          span.text_menu
+            "Main Menu"
+        div#mobile_user_menu.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Main Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            ul.dropmenu.menu_nav
+              li.button_home
+                a.active [href="{boardurl}/index.php"]
+                  span.home.main_icons
+                  span.textmenu
+                    "Home"
+              li.button_search
+                a [href="{boardurl}/index.php?action=search"]
+                  span.main_icons.search
+                  span.textmenu
+                    "Search"
+    div#wrapper.content_wrapper
+      div#inner_wrap.hide_720
+        div.user
+          time [datetime="{date}"]
+            "{date}"
+        div.news
+          h2
+            "News:"
+          p
+            "SMF - Just Installed!"
+      nav.navigate_section [aria-label="Breadcrumb"]
+        ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+          li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+            a [href="{boardurl}/index.php" itemprop="item"]
+              span [itemprop="name"]
+                "{forum_name}"
+            meta [content="#" itemprop="position"]
+      div#content_section
+        snapshot-ignored [selector="#main_content_section"]
+  footer#footer
+    div.content_wrapper
+      ul
+        li.copyright
+          a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+            "SMF # Alpha(s) #-dev © #"
+          ","
+          a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+            "Simple Machines"
+        li.helplinks
+          a [href="{boardurl}/index.php?action=help"]
+            "Help"
+          a [href="{boardurl}/index.php?action=agreement"]
+            "Terms and Rules"
+          a [href="#top_section"]
+            "Go Up ▲"
+  script
+    | window.addEventListener("DOMContentLoaded", function() { function triggerCron() { $.get('{boardurl}' + "/cron.php?ts=#"); } window.setTimeout(triggerCron, #); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/credits.txt b/tests/Integration/Http/Snapshot/snapshots/guest/credits.txt
new file mode 100644
index 00000000000..ed5274d7367
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/credits.txt
@@ -0,0 +1,241 @@
+status 200
+@ title
+title
+  "Credits"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#credits.main_section
+      div.cat_bar
+        h3.catbg
+          "Credits"
+      div.windowbg
+        p
+          "Simple Machines wants to thank everyone who helped make SMF # Alpha(s) #-dev what it is today; shaping and directing our project, all through the thick and the thin. It wouldn’t have been possible without you. This includes our users and especially Charter Members - thanks for installing and using our software as well as providing valuable feedback, bug reports, and opinions."
+      div.cat_bar
+        h3.catbg
+          "The Team"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Project Management"
+          dd
+            "Aleksi \"Lex\" Kilpinen, Michele \"Illori\" Davis, Jessica \"Suki\" González, and Will \"Kindred\" Wagner."
+          dt
+            strong
+              "Developers"
+          dd
+            "Shawn Bulen, John \"live#\" Rayes, Oscar \"Ozp\" Rydhé, Aaron van Geffen, Antechinus, Bjoern \"Bloc\" Kristiansen, Brad \"IchBin™\" Grow, Colin Schoen, emanuele, Hendrik Jan \"Compuart\" Visser, Jessica \"Suki\" González, Jon \"Sesquipedalian\" Stovell, Juan \"JayBachatero\" Hernandez, Karl \"RegularExpression\" Benson, Matthew \"Labradoodle-#\" Kerle, Grudge, Michael \"Oldiesmann\" Eshom, Michael \"Thantos\" Miller, Norv, Peter \"Arantor\" Spicer, Selman \"[SiNaN]\" Eser, Shitiz \"Dragooon\" Garg, Theodore \"Orstio\" Hildebrandt, Thorsten \"TE\" Eurich, and winrules."
+          dt
+            strong
+              "Support Specialists"
+          dd
+            "Will \"Kindred\" Wagner, Doug Heffernan, lurkalot, Steve, Aleksi \"Lex\" Kilpinen, br#, GigaWatt, ziycon, Adam Tallon, Bigguy, Bruno \"margarett\" Alves, CapadY, ChalkCat, Chas Large, Duncan#, gbsothere, JimM, Justyne, Kat, Kevin \"greyknight#\" Hou, Krash, Mashby, Michael Colin Blaber, Old Fossil, S-Ace, shadav, Storman™, Wade \"sησω\" Poulsen, and xenovanis."
+          dt
+            strong
+              "Customizers"
+          dd
+            "Diego Andrés, GL#Wing, Johnnie \"TwitchisMental\" Ballew, Jonathan \"vbgamer#\" Valentin, Sami \"SychO\" Mazouz, Brannon \"B\" Hall, Gary M. Gadsdon, Jack \"akabugeyes\" Thorsen, Jason \"JBlaze\" Clemons, Joey \"Tyrsson\" Smith, Kays, Michael \"Mick.\" Gomez, NanoSector, Ricky., Russell \"NEND\" Najar, and SA™."
+          dt
+            strong
+              "Documentation Writers"
+          dd
+            "Michele \"Illori\" Davis, Irisado, AngelinaBelle, Chainy, Graeme Spence, and Joshua \"groundup\" Dickerson."
+          dt
+            strong
+              "Localizers"
+          dd
+            "Nikola \"Dzonny\" Novaković, m#z, Francisco \"d#vcho\" Domínguez, Robert Monden, and Relyana."
+          dt
+            strong
+              "Marketing"
+          dd
+            "Adish \"(F.L.A.M.E.R)\" Patel, Bryan \"Runic\" Deakin, Marcus \"cσσкιє мσηѕтєя\" Forsberg, and Ralph \"[n#rve]\" Otowo."
+          dt
+            strong
+              "Site Administrators"
+          dd
+            "Jeremy \"SleePy\" Darwood."
+          dt
+            strong
+              "Servers Administrators"
+          dd
+            "Derek Schwab, Michael Johnson, and Liroy van Hoewijk."
+      div.cat_bar
+        h3.catbg
+          "Special Thanks"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Consulting Developers"
+          dd
+            "albertlast, Brett Flannigan, Mark Rose, René-Gilles \"Nao 尚\" Deberdt, tinoest, and everyone who"
+            a [href="https://github.com/SimpleMachines/SMF/graphs/contributors"]
+              "contributed on GitHub"
+            "."
+          dt
+            strong
+              "Beta Testers"
+          dd
+            "The invaluable few who tirelessly find bugs, provide feedback, and drive the developers crazier."
+          dt
+            strong
+              "Language Translators"
+          dd
+            "Thank you for your efforts which make it possible for people all around the world to use SMF."
+          dt
+            strong
+              "Founding Father of SMF"
+          dd
+            "Unknown W. \"[Unknown]\" Brackets."
+          dt
+            strong
+              "Original Project Managers"
+          dd
+            "Jeff Lewis, Joseph Fung, and David Recordon."
+          dt
+            strong
+              "In loving memory of"
+          dd
+            "Crip, K@, metallica#, Paul_Pauline, and Rock Lee."
+        p.posttext
+          "And for anyone we may have missed, thank you!"
+      div.cat_bar
+        h3.catbg
+          "Software/Graphics"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Graphics"
+          dd
+            a [href="https://p.yusukekamiyamane.com/"]
+              "Fugue Icons"
+            "| © # Yusuke(s) Kamiyamane | These icons are licensed under a Creative Commons Attribution # License(s)"
+          dd
+            a [href="https://techbase.kde.org/Projects/Oxygen/Licensing#Use_on_Websites"]
+              "Oxygen Icons"
+            "| These icons are licensed under"
+            a [href="https://www.gnu.org/licenses/lgpl-#.html"]
+              "GNU LGPLv#"
+        dl
+          dt
+            strong
+              "Software"
+          dd
+            a [href="https://jquery.org/"]
+              "JQuery"
+            "| © John Resig | Licensed under"
+            a [href="https://github.com/jquery/jquery/blob/master/LICENSE.txt"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://briancherne.github.io/jquery-hoverIntent/"]
+              "hoverIntent"
+            "| © Brian Cherne | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://www.sceditor.com/"]
+              "SCEditor"
+            "| © Sam Clarke | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/code-of-kpp/jquery-animadrag/blob/master/animadrag.js"]
+              "animaDrag"
+            "| © Abel Mohler | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://slippry.com/"]
+              "jQuery Responsive Slider"
+            "| © booncon ROCKETS | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/ichord/At.js"]
+              "At.js"
+            "| © {email} | Licensed under"
+            a [href="https://github.com/ichord/At.js/blob/master/LICENSE-MIT"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/ttsvetko/HTML#-Desktop-Notifications"]
+              "HTML# Desktop(s) Notifications"
+            "| © Tsvetan Tsvetkov | Licensed under"
+            a [href="https://github.com/ttsvetko/HTML#-Desktop-Notifications/blob/master/License.txt"]
+              "The Apache License Version #"
+          dd
+            a [href="https://github.com/enygma/gauth"]
+              "GAuth Code Generator/Validator"
+            "| © Chris Cornutt | Licensed under"
+            a [href="https://github.com/enygma/gauth/blob/master/LICENSE"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/enyo/dropzone"]
+              "Dropzone.js"
+            "| © Matias Meno | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/matthiasmullie/minify"]
+              "Minify"
+            "| © Matthias Mullie | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/true/php-punycode"]
+              "PHP-Punycode"
+            "| © True B.V. | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/mdbassit/Coloris"]
+              "Coloris"
+            "| © Mohammed Bassit | Licensed under"
+            a [href="https://github.com/mdbassit/Coloris/blob/main/LICENSE"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://fontawesome.com/"]
+              "Font Awesome"
+            "| © # | Licensed under"
+            a [href="http://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+        dl
+          dt
+            strong
+              "Fonts"
+          dd
+            a [href="https://fontlibrary.org/en/font/anonymous-pro"]
+              "Anonymous Pro"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontlibrary.org/en/font/consolamono"]
+              "ConsolaMono"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontlibrary.org/en/font/phennig"]
+              "Phennig"
+            "| © #-# | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontawesome.com/"]
+              "Font Awesome"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+      div.cat_bar
+        h3.catbg
+          "Forum Copyright"
+      div.windowbg
+        a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+          "SMF # Alpha(s) #-dev © #"
+        ","
+        a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+          "Simple Machines"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/display.txt b/tests/Integration/Http/Snapshot/snapshots/guest/display.txt
new file mode 100644
index 00000000000..74ca7e2d04e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/display.txt
@@ -0,0 +1,392 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "The first post, with"
+                  strong
+                    "bold"
+                  ","
+                  em
+                    "italic"
+                  ","
+                  u
+                    "underlined"
+                  "and"
+                  s
+                    "struck"
+                  "text."
+                  br
+                  a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+                    "A link"
+                  "and"
+                  a.bbc_email [href="mailto:{email}"]
+                    "{email}"
+                  "."
+                  br
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote"
+                    "An unattributed quote."
+                  div.codeheader
+                    "Code"
+                  pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+                    code
+                      "echo \"code\";"
+                  ul.bbc_list
+                    li
+                      "One"
+                    li
+                      "Two"
+                  span.bbc_color [style="color: red;"]
+                    "Red"
+                  span.bbc_size [style="font-size: #pt;"]
+                    "Sized"
+                  div.centertext
+                    "Centred"
+                  table.bbc_table
+                    thead
+                      tr
+                        th
+                          "A"
+                        th
+                          "B"
+                    tbody
+                  span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+                    button [tabindex="#" title="Show or hide spoiler content" type="button"]
+                    span
+                      "Hidden"
+                  hr.bbc_hr
+                  "Smileys:"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+                  img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+              div.under_message
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                "Snapshot Guest"
+              ul.user_info
+                li.membergroup
+                  "Guest"
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from a guest."
+              div.under_message
+            div.moderatorbar
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote from: {member}"
+                    "The quoted text."
+                  "A reply from an administrator."
+              div.under_message
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from another member, with a smiley"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+              div.under_message
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+    div#display_jump_to
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/display_child.txt b/tests/Integration/Http/Snapshot/snapshots/guest/display_child.txt
new file mode 100644
index 00000000000..236675bbbda
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/display_child.txt
@@ -0,0 +1,196 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A topic in a child board."
+              div.under_message
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+    div#display_jump_to
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot child one", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/display_poll.txt b/tests/Integration/Http/Snapshot/snapshots/guest/display_poll.txt
new file mode 100644
index 00000000000..4f1fdd4023d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/display_poll.txt
@@ -0,0 +1,230 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+        span.lock.main_icons
+        span.main_icons.sticky
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div#poll
+      div.cat_bar
+        h3.catbg
+          span.main_icons.poll
+          "Which colour?"
+      div.windowbg
+        div#poll_options
+          dl.options
+            dt.voted
+              "Red"
+            dd.generic_bar.statsbar.voted
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span.percentage
+                "# (#%)"
+            dt.voted
+              "Green"
+            dd.generic_bar.statsbar.voted
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span.percentage
+                "# (#%)"
+            dt.voted
+              "Blue"
+            dd.generic_bar.statsbar.voted
+              span.percentage
+                "# (#%)"
+          p
+            "Total Members Voted:"
+            strong
+              "#"
+    div#pollmoderation
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                li.poster_ip
+                  "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A sticky, locked topic with a poll."
+              div.under_message
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+    div#display_jump_to
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/groups.txt b/tests/Integration/Http/Snapshot/snapshots/guest/groups.txt
new file mode 100644
index 00000000000..387e125c7c2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/groups.txt
@@ -0,0 +1,55 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#frmLogin [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+      div.login
+        div.cat_bar
+          h3.catbg
+            "Warning!"
+        p.centertext.information
+          "You cannot view the memberlist because you do not have permission to do so."
+          br
+          "Please login below or"
+          a [href="{boardurl}/index.php?action=signup"]
+            "sign up for an account"
+          "with {forum_name}"
+        div.cat_bar
+          h3.catbg
+            span.login.main_icons
+            "Log in"
+        div.roundframe
+          dl
+            dt
+              "Username"
+            dd
+              input [name="user" size="#" type="text"]
+            dt
+              "Password"
+            dd
+              input [name="passwrd" size="#" type="password"]
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p.centertext
+            input.button [type="submit" value="Log in"]
+          p.centertext.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    script
+      | document.forms.frmLogin.user.focus();
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/help.txt b/tests/Integration/Http/Snapshot/snapshots/guest/help.txt
new file mode 100644
index 00000000000..12f1b173222
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/help.txt
@@ -0,0 +1,80 @@
+status 200
+@ title
+title
+  "SMF User Help"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=help" itemprop="item"]
+        span [itemprop="name"]
+          "Help"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.cat_bar
+      h3.catbg
+        "SMF User Help"
+    div#help_container
+      div#helpmain.windowbg
+        p
+          "Welcome to {forum_name}, powered by Simple Machines® Forum (SMF) software!"
+        p
+          "SMF® is the elegant, effective, powerful and free forum software solution that this site is running. It allows users to communicate in discussion topics on a given subject in a clever and organized manner. Furthermore, it has a number of powerful features which end users can take advantage of. Help for many of SMF’s features can be found by either clicking the question mark icon next to the relevant section or by selecting one of the links on this page. These links will take you to SMF’s centrally-located documentation on the Simple Machines official site."
+        ul
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Registering" rel="noopener" target="_blank"]
+              "Registering"
+            "- Many forums require users to register to gain full access."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Logging_In" rel="noopener" target="_blank"]
+              "Logging In"
+            "- Once registered, users must login to access their account."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Profile" rel="noopener" target="_blank"]
+              "Profile"
+            "- Each member has their own personal profile."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Search" rel="noopener" target="_blank"]
+              "Search"
+            "- Searching is an extremely helpful tool for finding information in posts and topics."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Posting" rel="noopener" target="_blank"]
+              "Posting"
+            "- The whole point of a forum, posting allows users to express themselves."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Bulletin_board_code" rel="noopener" target="_blank"]
+              "Bulletin Board Code (BBC)"
+            "- Posts can be spiced up with a little BBC."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Personal_messages" rel="noopener" target="_blank"]
+              "Personal Messages"
+            "- Users can send personal messages to each other."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Memberlist" rel="noopener" target="_blank"]
+              "Memberlist"
+            "- The memberlist shows all the members of a forum."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Calendar" rel="noopener" target="_blank"]
+              "Calendar"
+            "- Users can keep track of events, holidays, and birthdays with the calendar."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Features" rel="noopener" target="_blank"]
+              "Features"
+            "- Here is a list of the most popular features in SMF."
+        p
+          "For more information about how to use SMF, please see the"
+          a [href="https://wiki.simplemachines.org/smf" rel="noopener" target="_blank"]
+            "Simple Machines Documentation Wiki"
+          "and check out the"
+          a [href="{boardurl}/index.php?action=credits"]
+            "credits"
+          "to find out who has made SMF what it is today."
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/help_popup.txt b/tests/Integration/Http/Snapshot/snapshots/guest/help_popup.txt
new file mode 100644
index 00000000000..c4529141d92
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/help_popup.txt
@@ -0,0 +1,21 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  meta [content="noindex" name="robots"]
+  title
+    "{forum_name} - Help"
+  link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  link [href="https://use.fontawesome.com/releases/v#/css/all.css" rel="stylesheet"]
+  style
+    | img.avatar { max-width: #px !important; max-height: #px !important; }
+  noscript
+    link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  script [src="{boardurl}/Themes/default/scripts/script.js?smf#alpha#dev_#"]
+@ body
+body#help_popup
+  div.description.windowbg
+    "Registration Agreement"
+    br
+    a [href="javascript:self.close();"]
+      "Close window"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/index.php b/tests/Integration/Http/Snapshot/snapshots/guest/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/login.txt b/tests/Integration/Http/Snapshot/snapshots/guest/login.txt
new file mode 100644
index 00000000000..063b2999b4b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/login.txt
@@ -0,0 +1,59 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=login" itemprop="item"]
+        span [itemprop="name"]
+          "Log in"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.login
+      div.cat_bar
+        h3.catbg
+          span.login.main_icons
+          "Log in"
+      div.roundframe
+        form#frmLogin.login [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+          dl
+            dt
+              "Username"
+            dd
+              input#loginuser [name="user" required size="#" type="text" value]
+            dt
+              "Password"
+            dd
+              input#loginpass [name="passwrd" required size="#" type="password" value]
+          dl
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p
+            input.button [type="submit" value="Log in"]
+          p.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          script
+            | setTimeout(function() { document.getElementById("loginuser").focus(); }, #);
+        hr
+        div.centertext
+          "Don’t have an account?"
+          a [href="{boardurl}/index.php?action=signup"]
+            "Sign up"
+          "."
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/login_popup.txt b/tests/Integration/Http/Snapshot/snapshots/guest/login_popup.txt
new file mode 100644
index 00000000000..f4e0b20f838
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/login_popup.txt
@@ -0,0 +1,41 @@
+status 200
+@ head
+head
+@ body
+body
+  div.login
+    div.cat_bar
+      h3.catbg
+        span.login.main_icons
+        "Log in"
+    div.roundframe
+      form#frmLogin.login [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+        dl
+          dt
+            "Username"
+          dd
+            input#loginuser [name="user" required size="#" type="text" value]
+          dt
+            "Password"
+          dd
+            input#loginpass [name="passwrd" required size="#" type="password" value]
+        dl
+          dt
+          dd
+            label
+              input [name="cookieneverexp" type="checkbox"]
+              "Remember me"
+        p
+          input.button [type="submit" value="Log in"]
+        p.smalltext
+          a [href="{boardurl}/index.php?action=reminder"]
+            "Forgot your password?"
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        script
+          | setTimeout(function() { document.getElementById("loginuser").focus(); }, #);
+      hr
+      div.centertext
+        "Don’t have an account?"
+        a [href="{boardurl}/index.php?action=signup"]
+          "Sign up"
+        "."
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/member_list.txt b/tests/Integration/Http/Snapshot/snapshots/guest/member_list.txt
new file mode 100644
index 00000000000..387e125c7c2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/member_list.txt
@@ -0,0 +1,55 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#frmLogin [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+      div.login
+        div.cat_bar
+          h3.catbg
+            "Warning!"
+        p.centertext.information
+          "You cannot view the memberlist because you do not have permission to do so."
+          br
+          "Please login below or"
+          a [href="{boardurl}/index.php?action=signup"]
+            "sign up for an account"
+          "with {forum_name}"
+        div.cat_bar
+          h3.catbg
+            span.login.main_icons
+            "Log in"
+        div.roundframe
+          dl
+            dt
+              "Username"
+            dd
+              input [name="user" size="#" type="text"]
+            dt
+              "Password"
+            dd
+              input [name="passwrd" size="#" type="password"]
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p.centertext
+            input.button [type="submit" value="Log in"]
+          p.centertext.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    script
+      | document.forms.frmLogin.user.focus();
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/message_index.txt b/tests/Integration/Http/Snapshot/snapshots/guest/message_index.txt
new file mode 100644
index 00000000000..bd397c2746b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/message_index.txt
@@ -0,0 +1,243 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "Topics, replies and a poll for the snapshot tests."
+    div#board_#_childboards.boardindex_table.main_container
+      div.cat_bar
+        h3.catbg
+          "Sub-Boards"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_on [href="{boardurl}/index.php?board=#" title="New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The first child board."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+          p
+            strong
+              "Last post:"
+            "{date}"
+            span.postby
+              a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+                "{subject}"
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                "{member}"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_on [href="{boardurl}/index.php?board=#" title="New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The second child board, which stays empty."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div#messageindex
+      div#topic_header.title_bar
+        div.board_icon
+        div.info
+          a [href="{boardurl}/index.php?board=#;sort=subject"]
+            "Subject"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=starter"]
+            "Started by"
+        div.board_stats.centertext
+          a [href="{boardurl}/index.php?board=#;sort=replies"]
+            "Replies"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=views"]
+            "Views"
+        div.lastpost
+          a [href="{boardurl}/index.php?board=#;asc"]
+            "Last post"
+            span.main_icons.sort_down
+      div#topic_container
+        div.locked.sticky.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+                span.lock.main_icons
+                span.main_icons.sticky
+                span.main_icons.poll
+              div.message_index_title
+                span.bold_text.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##msg#"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##msg#"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/message_index_child.txt b/tests/Integration/Http/Snapshot/snapshots/guest/message_index_child.txt
new file mode 100644
index 00000000000..0c04247b8b9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/message_index_child.txt
@@ -0,0 +1,191 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "The first child board."
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div#messageindex
+      div#topic_header.title_bar
+        div.board_icon
+        div.info
+          a [href="{boardurl}/index.php?board=#;sort=subject"]
+            "Subject"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=starter"]
+            "Started by"
+        div.board_stats.centertext
+          a [href="{boardurl}/index.php?board=#;sort=replies"]
+            "Replies"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=views"]
+            "Views"
+        div.lastpost
+          a [href="{boardurl}/index.php?board=#;asc"]
+            "Last post"
+            span.main_icons.sort_down
+      div#topic_container
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##msg#"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot child one", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/message_index_empty.txt b/tests/Integration/Http/Snapshot/snapshots/guest/message_index_empty.txt
new file mode 100644
index 00000000000..336565b508b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/message_index_empty.txt
@@ -0,0 +1,127 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "A board with nothing in it."
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div#messageindex
+      div#topic_header.title_bar
+        h3.titlebg
+          "No messages..."
+      div#topic_container
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot empty board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/no_such_topic.txt b/tests/Integration/Http/Snapshot/snapshots/guest/no_such_topic.txt
new file mode 100644
index 00000000000..cc079e4bd28
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/no_such_topic.txt
@@ -0,0 +1,25 @@
+status 403
+@ title
+title
+  "An error has occurred"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#fatal_error
+      div.cat_bar
+        h3.catbg
+          "An error has occurred"
+      div.windowbg
+        div#not_a_topic.padding
+          "This topic does not exist on this board."
+    div.centertext
+      a.button.floatnone [href="javascript:document.location=document.referrer"]
+        "Back"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/not_found.txt b/tests/Integration/Http/Snapshot/snapshots/guest/not_found.txt
new file mode 100644
index 00000000000..c958641b2e8
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/not_found.txt
@@ -0,0 +1,25 @@
+status 404
+@ title
+title
+  "An error has occurred"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#fatal_error
+      div.cat_bar
+        h3.catbg
+          "An error has occurred"
+      div.windowbg
+        div#not_found.padding
+          "Sorry, this section is not available at this time."
+    div.centertext
+      a.button.floatnone [href="javascript:document.location=document.referrer"]
+        "Back"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/post.txt b/tests/Integration/Http/Snapshot/snapshots/guest/post.txt
new file mode 100644
index 00000000000..f6d1209c583
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/post.txt
@@ -0,0 +1,69 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#frmLogin [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+      div.login
+        div.cat_bar
+          h3.catbg
+            "Warning!"
+        p.centertext.information
+          "Sorry, you cannot post new topics in this board."
+          br
+          "Please login below or"
+          a [href="{boardurl}/index.php?action=signup"]
+            "sign up for an account"
+          "with {forum_name}"
+        div.cat_bar
+          h3.catbg
+            span.login.main_icons
+            "Log in"
+        div.roundframe
+          dl
+            dt
+              "Username"
+            dd
+              input [name="user" size="#" type="text"]
+            dt
+              "Password"
+            dd
+              input [name="passwrd" size="#" type="password"]
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p.centertext
+            input.button [type="submit" value="Log in"]
+          p.centertext.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    script
+      | document.forms.frmLogin.user.focus();
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/printpage.txt b/tests/Integration/Http/Snapshot/snapshots/guest/printpage.txt
new file mode 100644
index 00000000000..e245414e1d2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/printpage.txt
@@ -0,0 +1,124 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  meta [content="noindex" name="robots"]
+  link [href="{boardurl}/index.php?topic=#" rel="canonical"]
+  title
+    "Print Page - Snapshot topic"
+  style
+    | body, a { color: ##; background: #fff; } body, td, .normaltext { font-family: Verdana, arial, helvetica, serif; font-size: small; } h##title { font-size: large; font-weight: bold; } h##linktree { margin: #em # #em #; font-size: small; font-weight: bold; } dl#posts { width: #%; margin: #; padding: #; list-style: none; } div.postheader, #poll_data { border: solid ##; border-width: #px #; padding: #px #; } div.postbody { margin: #em # #em #em; } table { empty-cells: show; } blockquote { margin: # # #px #; padding: #px #px; font-size: small; border: #px solid #d#dfe#; border-left: #px solid #aaa; border-right: #px solid #aaa; } blockquote cite { display: block; border-bottom: #px solid #aaa; font-size: #em; } blockquote cite:before { color: #aaa; font-size: #px; font-style: normal; margin-right: #px; } code { border: #px solid ##; margin: #px; padding: #px; display: block; } code { font: x-small monospace; } .smalltext, .codeheader { font-size: x-small; } .largetext { font-size: large; } .centertext { text-align: center; } hr { height: #px; border: #; color: black; background-color: black; } .voted { font-weight: bold; } #footer { font-family: Verdana, sans-serif; } @media print { .print_options { display: none; } } @media screen { .print_options { margin: #em #; } }
+@ body
+body
+  div.print_options
+    strong
+      a [href="{boardurl}/index.php?action=printpage;topic=#"]
+        "Text only"
+    "|"
+    a [href="{boardurl}/index.php?action=printpage;topic=#;images"]
+      "Text with Images"
+  h1#title
+    "{forum_name}"
+  h2#linktree
+    "Snapshot fixtures ▸ Snapshot board ▸ Started by Snapshot Member, {date}"
+  div#posts
+    div.postheader
+      div
+        strong
+          "Snapshot topic"
+      div
+        "Posted by Snapshot Member, {date}"
+    div.postbody
+      "The first post, with"
+      strong
+        "bold"
+      ","
+      em
+        "italic"
+      ","
+      u
+        "underlined"
+      "and"
+      s
+        "struck"
+      "text."
+      br
+      "A link (https://www.simplemachines.org) and {email}."
+      br
+      blockquote.bbc_standard_quote
+        cite
+          "Quote"
+        "An unattributed quote."
+      div.codeheader
+        "Code"
+      pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+        code
+          "echo \"code\";"
+      ul.bbc_list
+        li
+          "One"
+        li
+          "Two"
+      "Red"
+      span.bbc_size [style="font-size: #pt;"]
+        "Sized"
+      div.centertext
+        "Centred"
+      table.bbc_table
+        thead
+          tr
+            th
+              "A"
+            th
+              "B"
+        tbody
+      span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+        button [tabindex="#" title="Show or hide spoiler content" type="button"]
+        span
+          "Hidden"
+      hr.bbc_hr
+      "Smileys:"
+      img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+      img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Guest, {date}"
+    div.postbody
+      "A reply from a guest."
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Admin, {date}"
+    div.postbody
+      blockquote.bbc_standard_quote
+        cite
+          "Quote from: Snapshot Member"
+        "The quoted text."
+      "A reply from an administrator."
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Other, {date}"
+    div.postbody
+      "A reply from another member, with a smiley"
+      img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+  div.print_options
+    strong
+      a [href="{boardurl}/index.php?action=printpage;topic=#"]
+        "Text only"
+    "|"
+    a [href="{boardurl}/index.php?action=printpage;topic=#;images"]
+      "Text with Images"
+  div#footer.smalltext
+    a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+      "SMF # Alpha(s) #-dev © #"
+    ","
+    a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+      "Simple Machines"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/profile.txt b/tests/Integration/Http/Snapshot/snapshots/guest/profile.txt
new file mode 100644
index 00000000000..41761ef1915
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/profile.txt
@@ -0,0 +1,55 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#frmLogin [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+      div.login
+        div.cat_bar
+          h3.catbg
+            "Warning!"
+        p.centertext.information
+          "Only registered members are allowed to access this section."
+          br
+          "Please login below or"
+          a [href="{boardurl}/index.php?action=signup"]
+            "sign up for an account"
+          "with {forum_name}"
+        div.cat_bar
+          h3.catbg
+            span.login.main_icons
+            "Log in"
+        div.roundframe
+          dl
+            dt
+              "Username"
+            dd
+              input [name="user" size="#" type="text"]
+            dt
+              "Password"
+            dd
+              input [name="passwrd" size="#" type="password"]
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p.centertext
+            input.button [type="submit" value="Log in"]
+          p.centertext.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    script
+      | document.forms.frmLogin.user.focus();
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/recent.txt b/tests/Integration/Http/Snapshot/snapshots/guest/recent.txt
new file mode 100644
index 00000000000..e4d0d70ea83
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/recent.txt
@@ -0,0 +1,240 @@
+status 200
+@ title
+title
+  "Recent posts"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=recent;c=#" itemprop="item"]
+        span [itemprop="name"]
+          "Recent posts"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#recent.main_section
+      div#display_head.information
+        h2.display_title
+          span#top_subject
+            "Recent posts"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A second topic in the child board."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A topic in a child board."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "Another topic, so the board lists more than one."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A sticky, locked topic with a poll."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A reply from another member, with a smiley"
+          img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          blockquote.bbc_standard_quote
+            cite
+              "Quote from: {member}"
+            "The quoted text."
+          "A reply from an administrator."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by Snapshot Guest on {date}"
+        div.list_posts
+          "A reply from a guest."
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "The first post, with"
+          strong
+            "bold"
+          ","
+          em
+            "italic"
+          ","
+          u
+            "underlined"
+          "and"
+          s
+            "struck"
+          "text."
+          br
+          a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+            "A link"
+          "and"
+          a.bbc_email [href="mailto:{email}"]
+            "{email}"
+          "."
+          br
+          blockquote.bbc_standard_quote
+            cite
+              "Quote"
+            "An unattributed quote."
+          div.codeheader
+            "Code"
+          pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+            code
+              "echo \"code\";"
+          ul.bbc_list
+            li
+              "One"
+            li
+              "Two"
+          span.bbc_color [style="color: red;"]
+            "Red"
+          span.bbc_size [style="font-size: #pt;"]
+            "Sized"
+          div.centertext
+            "Centred"
+          table.bbc_table
+            thead
+              tr
+                th
+                  "A"
+                th
+                  "B"
+            tbody
+          span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+            button [tabindex="#" title="Show or hide spoiler content" type="button"]
+            span
+              "Hidden"
+          hr.bbc_hr
+          "Smileys:"
+          img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+          img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/reminder.txt b/tests/Integration/Http/Snapshot/snapshots/guest/reminder.txt
new file mode 100644
index 00000000000..aa381746970
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/reminder.txt
@@ -0,0 +1,34 @@
+status 200
+@ title
+title
+  "Authentication Reminder"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    br
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=reminder;sa=picktype" method="post"]
+      div.login.tborder
+        div.cat_bar
+          h3.catbg
+            "Authentication Reminder"
+        div.roundframe
+          p.centertext.smalltext
+            "If you have forgotten your login details, don’t worry, they can be retrieved. To start this process please enter your username or email address below."
+          dl
+            dt
+              label [for="user"]
+                "Username/Email"
+            dd
+              input#user [name="user" size="#" type="text"]
+          input.button [type="submit" value="Continue"]
+          br.clear
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/search.txt b/tests/Integration/Http/Snapshot/snapshots/guest/search.txt
new file mode 100644
index 00000000000..c813eae7226
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/search.txt
@@ -0,0 +1,122 @@
+status 200
+@ title
+title
+  "Set Search Parameters"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#searchform [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post" name="searchform"]
+      div.cat_bar
+        h3.catbg
+          span.filter.main_icons
+          "Set Search Parameters"
+      div#advanced_search.roundframe
+        dl#search_options.settings
+          dt
+            strong
+              label [for="searchfor"]
+                "Search for"
+          dd
+            input#searchfor [maxlength="#" name="search" size="#" type="search"]
+            br
+            em.smalltext
+              em
+                "e.g."
+              "Orwell \"Animal Farm\" -movie"
+          dt
+            label [for="searchtype"]
+              "Match"
+          dd
+            select#searchtype [name="searchtype"]
+              option [selected value="#"]
+                "Match all words"
+              option [value="#"]
+                "Match any words"
+          dt
+            label [for="userspec"]
+              "By user"
+          dd
+            input#userspec [name="userspec" size="#" type="text" value="*"]
+          dt
+            label [for="sort"]
+              "Search order"
+          dd
+            select#sort [name="sort"]
+              option [value="relevance|desc"]
+                "Most relevant results first"
+              option [value="num_replies|desc"]
+                "Largest topics first"
+              option [value="num_replies|asc"]
+                "Smallest topics first"
+              option [value="id_msg|desc"]
+                "Most recent topics first"
+              option [value="id_msg|asc"]
+                "Oldest topics first"
+          dt.options.righttext
+            "Options"
+          dd.options
+            ul
+              li
+                label
+                  input#show_complete [name="show_complete" type="checkbox" value="#"]
+                  span
+                    "Show results as messages"
+              li
+                label
+                  input#subject_only [name="subject_only" type="checkbox" value="#"]
+                  span
+                    "Search in topic subjects only"
+          dt.between
+            "Message age"
+          dd
+            "between"
+            input#minage [max="#" min="#" name="minage" type="number" value="#"]
+            "and"
+            input#maxage [max="#" min="#" name="maxage" type="number" value="#"]
+            "days"
+        script
+          | window.addEventListener("load", initSearch, false);
+        input [name="advanced" type="hidden" value="#"]
+      fieldset.flow_hidden
+        div.alt.roundframe
+          details#advanced_panel
+            summary.title_bar.titlebg
+              "Choose boards to search in, or search all"
+            div.boardslist.flow_auto
+              ul
+                li
+                  a [href="javascript:void(#);" onclick="selectBoards([#, #, #, #], 'searchform'); return false;"]
+                    "Snapshot fixtures"
+                  ul
+                    li
+                      label [for="brd#"]
+                        input#brd# [checked name="brd[#]" type="checkbox" value="#"]
+                        "Snapshot board"
+                    li
+                      label [for="brd#"]
+                        input#brd# [checked name="brd[#]" type="checkbox" value="#"]
+                        "Snapshot empty board"
+          br.clear
+          div.padding
+            input#check_all [checked name="all" onclick="invertAll(this, this.form, 'brd');" type="checkbox" value]
+            label [for="check_all"]
+              em
+                "Select all"
+            input.button.floatright [name="b_search" type="submit" value="Search"]
+    script
+      | var oAddMemberSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sControlId: 'userspec', sSearchType: 'member' });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/search_results.txt b/tests/Integration/Http/Snapshot/snapshots/guest/search_results.txt
new file mode 100644
index 00000000000..87dc9ad5ad3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/search_results.txt
@@ -0,0 +1,101 @@
+status 200
+@ title
+title
+  "Search Results"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search;params={params}" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search#;params={params}" itemprop="item"]
+        span [itemprop="name"]
+          "Search Results"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#new_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post" name="new_search"]
+      input [maxlength="#" name="search" size="#" type="hidden" value="bold"]
+      input [name="searchtype" type="hidden" value="#"]
+      input [name="userspec" type="hidden" value]
+      input [name="show_complete" type="hidden" value="#"]
+      input [name="subject_only" type="hidden" value="#"]
+      input [name="minage" type="hidden" value="#"]
+      input [name="maxage" type="hidden" value="#"]
+      input [name="sort" type="hidden" value="relevance"]
+      input [name="brd[#]" type="hidden" value="#"]
+    div#display_head.information
+      h2.display_title
+        span
+          "Search Results"
+      div.floatleft
+        a.button [href="{boardurl}/index.php?action=search;params={params}"]
+          "Adjust Search Parameters"
+      div.floatright
+        span.padding
+          "Search order"
+        select.floatright [form="new_search" name="sort" onchange="document.forms.new_search.submit()"]
+          option [selected value="relevance|desc"]
+            "Most relevant results first"
+          option [value="num_replies|desc"]
+            "Largest topics first"
+          option [value="num_replies|asc"]
+            "Smallest topics first"
+          option [value="id_msg|desc"]
+            "Most recent topics first"
+          option [value="id_msg|asc"]
+            "Oldest topics first"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.block
+        div.floatright.page_number
+          "##"
+        div.half_content
+          div.topic_details
+            h5
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+            span.smalltext
+              "{date} by"
+              strong
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+      div.list_posts.word_break
+        strong
+          "......"
+        "first post, with"
+        mark.highlight
+          "bold"
+        ", italic, underlined and struck text. A link and"
+        strong
+          "......"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div#search_jump_to.floatright.pagelinks.smalltext
+      script
+        | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "search_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Please select a destination", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/signup.txt b/tests/Integration/Http/Snapshot/snapshots/guest/signup.txt
new file mode 100644
index 00000000000..ff0eafba772
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/signup.txt
@@ -0,0 +1,48 @@
+status 200
+@ title
+title
+  "Registration Agreement"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=signup" itemprop="item"]
+        span [itemprop="name"]
+          "Sign up"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#registration [accept-charset="UTF-#" action="{boardurl}/index.php?action=signup" method="post"]
+      div.cat_bar
+        h3.catbg
+          "Registration Agreement"
+      div.roundframe
+        div
+          "You agree, through your use of this forum, that you will not post any material which is false, defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person's privacy, adult material, or otherwise in violation of any International or United States Federal law. You also agree not to post any copyrighted material unless you own the copyright or you have written consent from the owner of the copyrighted material. Spam, flooding, advertisements, chain letters, pyramid schemes, and solicitations are also forbidden on this forum."
+          br
+          "Note that it is impossible for the staff or the owners of this forum to confirm the validity of posts. Please remember that we do not actively monitor the posted messages, and as such, are not responsible for the content contained within. We do not warrant the accuracy, completeness, or usefulness of any information presented. The posted messages express the views of the author, and not necessarily the views of this forum, its staff, its subsidiaries, or this forum's owner. Anyone who feels that a posted message is objectionable is encouraged to notify an administrator or moderator of this forum immediately. The staff and the owner of this forum reserve the right to remove objectionable content, within a reasonable time frame, if they determine that removal is necessary. This is a manual process, however, please realize that they may not be able to remove or edit particular messages immediately. This policy applies to member profile information as well."
+          br
+          "You remain solely responsible for the content of your posted messages. Furthermore, you agree to indemnify and hold harmless the owners of this forum, any related websites to this forum, its staff, and its subsidiaries. The owners of this forum also reserve the right to reveal your identity (or any other related information collected on this service) in the event of a formal complaint or legal action arising from any situation caused by your use of this forum."
+          br
+          "You have the ability, as you register, to choose your username. We advise that you keep the name appropriate. With this user account you are about to register, you agree to never give your password out to another person except an administrator, for your protection and for validity reasons. You also agree to NEVER use another person's account for any reason. We also HIGHLY recommend you use a complex and unique password for your account, to prevent account theft."
+          br
+          "After you register and login to this forum, you will be able to fill out a detailed profile. It is your responsibility to present clean and accurate information. Any information the forum owner or staff determines to be inaccurate or vulgar in nature will be removed, with or without prior notice. Appropriate sanctions may be applicable."
+          br
+          "Please note that with each post, your IP address is recorded, in the event that you need to be banned from this forum or your ISP contacted. This will only happen in the event of a major violation of this agreement."
+          br
+          "Also note that the software places a cookie, a text file containing bits of information (such as your username and password), in your browser's cache. This is ONLY used to keep you logged in/out. The software does not collect or send any other form of information to your computer."
+      div#confirm_buttons
+        input.button [name="accept_agreement" type="submit" value="I accept the terms of the agreement."]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input [name="step" type="hidden" value="#"]
+    script
+      | var verificationregisterHandle = new smfCaptcha("{boardurl}/index.php?action=verificationcode;vid=register;rand={hash}", "register", #);
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/stats.txt b/tests/Integration/Http/Snapshot/snapshots/guest/stats.txt
new file mode 100644
index 00000000000..c8cb8acb7b1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/stats.txt
@@ -0,0 +1,203 @@
+status 200
+@ title
+title
+  "{forum_name} - Statistics Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=stats" itemprop="item"]
+        span [itemprop="name"]
+          "Statistics Center"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#statistics.main_section
+      div.cat_bar
+        h3.catbg
+          "{forum_name} - Statistics Center"
+      div.roundframe
+        div.title_bar
+          h4.titlebg
+            span.general.main_icons
+            "General Statistics"
+        dl.half_content.stats
+          dt
+            "Total Members"
+          dd
+            "#"
+          dt
+            "Total Posts"
+          dd
+            "#"
+          dt
+            "Total Topics"
+          dd
+            "#"
+          dt
+            "Total Categories"
+          dd
+            "#"
+          dt
+            "Users Online"
+          dd
+            "#"
+          dt
+            "Most Online"
+          dd
+            "# on(s) {date}"
+          dt
+            "Online today"
+          dd
+            "#"
+        dl.half_content.stats
+          dt
+            "Average registrations per day"
+          dd
+            "#"
+          dt
+            "Average posts per day"
+          dd
+            "#"
+          dt
+            "Average topics per day"
+          dd
+            "#"
+          dt
+            "Total Boards"
+          dd
+            "#"
+          dt
+            "Latest Member"
+          dd
+            a [href="{boardurl}/index.php?action=profile;u=#"]
+              "{member}"
+          dt
+            "Average online per day"
+          dd
+            "#"
+          dt
+            "Gender stats"
+          dd
+            "None: #"
+            br
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.posters
+              "Top # Poster(s)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.boards.main_icons
+              "Top # Board(s)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.topics_replies
+              "Top # Topic(s) (by Replies)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?topic=#"]
+                "{subject}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.topics_views
+              "Top # Topic(s) (by Views)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?topic=#"]
+                "{subject}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.starters
+              "Top Topic Starters"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.time_online
+              "Most Time Online"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+      br.clear
+      div.cat_bar
+        h3.catbg
+          span.history.main_icons
+          "Forum History (using forum time offset)"
+      table#stats.table_grid
+        thead
+          tr.title_bar
+            th.lefttext
+              "Yearly Summary"
+            th
+              "New Topics"
+            th
+              "New Posts"
+            th
+              "New Members"
+            th
+              "Most Online"
+        tbody
+          tr#year_#.windowbg
+            th.lefttext
+              img#year_img_# [alt="*" src="{boardurl}/Themes/default/images/selected_open.png"]
+              a#year_link_# [href="#year_#"]
+                "#"
+            th
+              "#"
+          tr#tr_month_#.windowbg
+            th.stats_month
+              img#img_# [alt src="{boardurl}/Themes/default/images/selected.png"]
+              a#m# [href="{boardurl}/index.php?action=stats;expand=##m#" onclick="return doingExpandCollapse;"]
+                "{date}"
+            th
+              "#"
+    script
+      | var oStatsCenter = new smf_StatsCenter({ sTableId: 'stats', reYearPattern: /year_(\d+)/, sYearImageCollapsed: 'selected.png', sYearImageExpanded: 'selected_open.png', sYearImageIdPrefix: 'year_img_', sYearLinkIdPrefix: 'year_link_', reMonthPattern: /tr_month_(\d+)/, sMonthImageCollapsed: 'selected.png', sMonthImageExpanded: 'selected_open.png', sMonthImageIdPrefix: 'img_', sMonthLinkIdPrefix: 'm', reDayPattern: /tr_day_(\d+-\d+-\d+)/, sDayRowClassname: 'windowbg', sDayRowIdPrefix: 'tr_day_', aCollapsedYears: [ ], aDataCells: [ 'date', 'new_topics', 'new_posts', 'new_members', 'most_members_online' ] });
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/theme_picker.txt b/tests/Integration/Http/Snapshot/snapshots/guest/theme_picker.txt
new file mode 100644
index 00000000000..4ad5f2aa801
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/theme_picker.txt
@@ -0,0 +1,5 @@
+status 302
+location {boardurl}/index.php?action=themechooser
+(nothing matches title)
+(nothing matches .navigate_section)
+(nothing matches #content_section)
diff --git a/tests/Integration/Http/Snapshot/snapshots/guest/unread.txt b/tests/Integration/Http/Snapshot/snapshots/guest/unread.txt
new file mode 100644
index 00000000000..41761ef1915
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/guest/unread.txt
@@ -0,0 +1,55 @@
+status 200
+@ title
+title
+  "Log in"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#frmLogin [accept-charset="UTF-#" action="{boardurl}/index.php?action=login#" method="post" name="frmLogin"]
+      div.login
+        div.cat_bar
+          h3.catbg
+            "Warning!"
+        p.centertext.information
+          "Only registered members are allowed to access this section."
+          br
+          "Please login below or"
+          a [href="{boardurl}/index.php?action=signup"]
+            "sign up for an account"
+          "with {forum_name}"
+        div.cat_bar
+          h3.catbg
+            span.login.main_icons
+            "Log in"
+        div.roundframe
+          dl
+            dt
+              "Username"
+            dd
+              input [name="user" size="#" type="text"]
+            dt
+              "Password"
+            dd
+              input [name="passwrd" size="#" type="password"]
+            dt
+            dd
+              label
+                input [name="cookieneverexp" type="checkbox"]
+                "Remember me"
+          p.centertext
+            input.button [type="submit" value="Log in"]
+          p.centertext.smalltext
+            a [href="{boardurl}/index.php?action=reminder"]
+              "Forgot your password?"
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+    script
+      | document.forms.frmLogin.user.focus();
diff --git a/tests/Integration/Http/Snapshot/snapshots/index.php b/tests/Integration/Http/Snapshot/snapshots/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/board_index.txt b/tests/Integration/Http/Snapshot/snapshots/member/board_index.txt
new file mode 100644
index 00000000000..3b74d3b22e2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/board_index.txt
@@ -0,0 +1,95 @@
+status 200
+@ title
+title
+  "{forum_name} - Index"
+@ #category_#
+div#category_#.cat_bar
+  h3.catbg
+    a#c#
+    a [href="{boardurl}/index.php?action=unread;c=#" title="Click to see the new posts in Snapshot fixtures"]
+      "Snapshot fixtures"
+  span#category_#_upshrink.toggle_up [data-collapsed="#" style="display: none;" title="Hide Category"]
+  div.desc
+    "Content for the template snapshot tests, version #."
+@ #category_#_boards
+div#category_#_boards
+  div#board_#.up_contain
+    div.board_icon
+      a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "Topics, replies and a poll for the snapshot tests."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+      p
+        strong
+          "Last post:"
+        "{date}"
+        span.postby
+          a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+            "{subject}"
+          "by"
+          a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+            "{member}"
+    div#board_#_children.children
+      p
+        strong#child_list_#
+          "Sub-Boards"
+        span
+          a [href="{boardurl}/index.php?board=#" title="No New Posts (# topic(s), # post(s))"]
+            "{board}"
+  div#board_#.up_contain
+    div.board_icon
+      a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+    div.info
+      a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+        "{board}"
+      div.board_description
+        "A board with nothing in it."
+    div.board_stats
+      p
+        "# post(s)"
+        br
+        "# topic(s)"
+    div.lastpost
+@ #info_center
+div#info_center.roundframe
+  div.title_bar
+    h3.titlebg
+      a#upshrink_link [href="#"]
+        "{forum_name} - Info Center"
+    span#upshrink_ic.toggle_up [style="display: none;" title="Hide Info Center"]
+  div#upshrink_stats
+    div.sub_bar
+      h4.subbg
+        a [href="{boardurl}/index.php?action=stats" title="[More Stats]"]
+          span.main_icons.stats
+          "Forum Stats"
+    p.inline
+      "# post(s) in # topic(s) by # member(s) - Latest Member:"
+      strong
+        a [href="{boardurl}/index.php?action=profile;u=#"]
+          "{member}"
+      br
+      "Latest Post:"
+      strong
+        "\""
+        a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+          "{subject}"
+        "\""
+      "({date})"
+      br
+      a [href="{boardurl}/index.php?action=recent"]
+        "View the most recent posts on the forum."
+    div.sub_bar
+      h4.subbg
+        a [href="{boardurl}/index.php?action=who"]
+          span.main_icons.people
+          "Users Online"
+    snapshot-ignored [selector="#upshrink_stats > p:nth-of-type(#)"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/calendar_list.txt b/tests/Integration/Http/Snapshot/snapshots/member/calendar_list.txt
new file mode 100644
index 00000000000..1dbf3f7bf59
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/calendar_list.txt
@@ -0,0 +1,210 @@
+status 200
+@ title
+title
+  "Calendar"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar" itemprop="item"]
+        span [itemprop="name"]
+          "Calendar"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar;year=#;month=#" itemprop="item"]
+        span [itemprop="name"]
+          "{date}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#calendar
+      div#month_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.events.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+      div#main_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "Upcoming Calendar"
+        div.calendar_top.noup.roundframe
+          div#calendar_viewselector.buttonrow.floatleft
+            a.active.button [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "List"
+            a.button [href="{boardurl}/index.php?action=calendar;viewmonth;year=#;month=#;day=#"]
+              "Month"
+            a.button [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "Week"
+          form#calendar_range [accept-charset="UTF-#" action="{boardurl}/index.php?action=calendar;viewlist" method="post"]
+            input#start_date.date_input.start [data-type="date" name="start_date" type="date" value="{date}"]
+            span
+              "to"
+            input#end_date.date_input.end [data-type="date" name="end_date" type="date" value="{date}"]
+            input#view_button.button [style="float:none" type="submit" value="View"]
+        div
+          div.title_bar
+            h3.titlebg
+              "Holidays"
+          div.windowbg
+            p.holidays.inline
+              span
+                strong
+                  "Jan #"
+                ": New Year's Day."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/calendar_month.txt b/tests/Integration/Http/Snapshot/snapshots/member/calendar_month.txt
new file mode 100644
index 00000000000..41c39fb1e53
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/calendar_month.txt
@@ -0,0 +1,222 @@
+status 200
+@ title
+title
+  "Calendar"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar" itemprop="item"]
+        span [itemprop="name"]
+          "Calendar"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar;year=#;month=#" itemprop="item"]
+        span [itemprop="name"]
+          "{date}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#calendar
+      div#month_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.events.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+      div#main_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "Upcoming Calendar"
+        div.calendar_top.noup.roundframe
+          div#calendar_viewselector.buttonrow.floatleft
+            a.active.button [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "List"
+            a.button [href="{boardurl}/index.php?action=calendar;viewmonth;year=#;month=#;day=#"]
+              "Month"
+            a.button [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "Week"
+          form#calendar_range [accept-charset="UTF-#" action="{boardurl}/index.php?action=calendar;viewlist" method="post"]
+            input#start_date.date_input.start [data-type="date" name="start_date" type="date" value="{date}"]
+            span
+              "to"
+            input#end_date.date_input.end [data-type="date" name="end_date" type="date" value="{date}"]
+            input#view_button.button [style="float:none" type="submit" value="View"]
+        div
+          div.title_bar
+            h3.titlebg
+              "Events"
+          ul
+            li.windowbg
+              strong.event_title
+                "Snapshot event"
+              br
+              time [datetime="{date}"]
+                "{date}"
+              "–"
+              time [datetime="{date}"]
+                "{date} UTC"
+              br
+              "Snapshot location"
+            li.windowbg
+              strong.event_title
+                "Snapshot all day event"
+              br
+              time [datetime="{date}"]
+                "{date}"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/calendar_post.txt b/tests/Integration/Http/Snapshot/snapshots/member/calendar_post.txt
new file mode 100644
index 00000000000..fa5e64f1a35
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/calendar_post.txt
@@ -0,0 +1,25 @@
+status 403
+@ title
+title
+  "An error has occurred"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#fatal_error
+      div.cat_bar
+        h3.catbg
+          "An error has occurred"
+      div.windowbg
+        div#cannot_calendar_post.padding
+          "Event posting is not allowed - sorry."
+    div.centertext
+      a.button.floatnone [href="javascript:document.location=document.referrer"]
+        "Back"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/calendar_week.txt b/tests/Integration/Http/Snapshot/snapshots/member/calendar_week.txt
new file mode 100644
index 00000000000..ed2a7fbdc21
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/calendar_week.txt
@@ -0,0 +1,283 @@
+status 200
+@ title
+title
+  "Calendar - Week beginning {date}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar" itemprop="item"]
+        span [itemprop="name"]
+          "Calendar"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar;year=#;month=#" itemprop="item"]
+        span [itemprop="name"]
+          "{date}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#" itemprop="item"]
+        span [itemprop="name"]
+          "Week beginning {date}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#calendar
+      div#month_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.events.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.disabled
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "{date}"
+        table.calendar_table
+          tbody
+            tr
+              th.days [scope="col"]
+                "Sun"
+              th.days [scope="col"]
+                "Mon"
+              th.days [scope="col"]
+                "Tue"
+              th.days [scope="col"]
+                "Wed"
+              th.days [scope="col"]
+                "Thu"
+              th.days [scope="col"]
+                "Fri"
+              th.days [scope="col"]
+                "Sat"
+            tr.days_wrapper
+              td.days.disabled
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.holidays.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+            tr.days_wrapper
+              td.days.windowbg
+                a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                  span.day_text
+                    "#"
+      div#main_grid
+        div.cat_bar
+          h3.catbg.centertext.largetext
+            span.floatleft
+              a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                "«"
+            span.floatright
+              a [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+                "»"
+            "Week beginning {date}"
+        div.calendar_top.noup.roundframe
+          div#calendar_viewselector.buttonrow.floatleft
+            a.button [href="{boardurl}/index.php?action=calendar;viewlist;year=#;month=#;day=#"]
+              "List"
+            a.button [href="{boardurl}/index.php?action=calendar;viewmonth;year=#;month=#;day=#"]
+              "Month"
+            a.active.button [href="{boardurl}/index.php?action=calendar;viewweek;year=#;month=#;day=#"]
+              "Week"
+          form#calendar_navigation [accept-charset="UTF-#" action="{boardurl}/index.php?action=calendar;viewweek" method="post"]
+            input#start_date.date_input.start [data-type="date" name="start_date" type="date" value="{date}"]
+            input#view_button.button [style="float:none" type="submit" value="View"]
+        div.week_month_title
+          a [href="{boardurl}/index.php?action=calendar;viewmonth;month=#"]
+            "January"
+        table.calendar_week.table_grid
+          tbody
+            tr
+              th.days [scope="col"]
+                "Day"
+              th.days [scope="col"]
+                "Events:"
+              th.days [scope="col"]
+                "Holidays:"
+              th.days [scope="col"]
+                "Birthdays:"
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Sunday - #"
+              td.days.disabled.event_col.windowbg [data-css-prefix="Events: None"]
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Monday - #"
+              td.days.event_col.events.windowbg [data-css-prefix="Events: "]
+                div.event_wrapper
+                  "Snapshot event"
+                  br
+                  span.event_time.floatright
+                    "{date}"
+                  br
+                  span.event_location.floatright
+                    "Snapshot location"
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Tuesday - #"
+              td.days.disabled.event_col.windowbg [data-css-prefix="Events: None"]
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Wednesday - #"
+              td.days.event_col.events.windowbg [data-css-prefix="Events: "]
+                div.event_wrapper
+                  "Snapshot all day event"
+                  br
+                  span.event_time.floatright
+                    "{date}"
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Thursday - #"
+              td.days.event_col.events.windowbg [data-css-prefix="Events: "]
+                div.event_wrapper
+                  "Snapshot all day event"
+                  br
+                  span.event_time.floatright
+                    "{date}"
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Friday - #"
+              td.days.disabled.event_col.windowbg [data-css-prefix="Events: None"]
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
+            tr.days_wrapper
+              td.act_day.days.windowbg
+                "Saturday - #"
+              td.days.disabled.event_col.windowbg [data-css-prefix="Events: None"]
+              td.days.disabled.holiday_col.windowbg [data-css-prefix="Holidays: "]
+              td.birthday_col.days.disabled.windowbg [data-css-prefix="Birthdays: "]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/chrome.txt b/tests/Integration/Http/Snapshot/snapshots/member/chrome.txt
new file mode 100644
index 00000000000..e5d0ed93030
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/chrome.txt
@@ -0,0 +1,152 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  link [href="https://use.fontawesome.com/releases/v#/css/all.css" rel="stylesheet"]
+  style
+    | img.avatar { max-width: #px !important; max-height: #px !important; }
+  noscript
+    link [href="{boardurl}/Themes/default/css/minified_{hash}.css?smf#alpha#dev_#" rel="stylesheet"]
+  script
+    | var smf_theme_url = "{boardurl}/Themes/default"; var smf_default_theme_url = "{boardurl}/Themes/default"; var smf_images_url = "{boardurl}/Themes/default/images"; var smf_smileys_url = "{boardurl}/Smileys"; var smf_smiley_sets = "fugue,alienine"; var smf_smiley_sets_default = "fugue"; var smf_avatars_url = "{boardurl}/avatars"; var smf_scripturl = "{boardurl}/index.php"; var smf_charset = "UTF-#"; var smf_session_id = "{session_id}"; var smf_session_var = "{session_var}"; var smf_member_id = #; var ajax_notification_text = 'Loading...'; var help_popup_heading_text = 'A little lost? Let me explain:'; var banned_text = 'Sorry Snapshot Member, you are banned from using this forum!'; var smf_txt_expand = 'Expand'; var smf_txt_shrink = 'Shrink'; var smf_collapseAlt = 'Hide Category'; var smf_expandAlt = 'Show Category'; var smf_quote_expand = false; var allow_xhjr_credentials = false;
+  script [src="https://ajax.googleapis.com/ajax/libs/jquery/#/jquery.min.js"]
+  script [src="{boardurl}/Themes/default/scripts/minified_{hash}.js?smf#alpha#dev_#"]
+  script
+    | var new_alert_title = "{forum_name}"; var alert_timeout = #; var smf_you_sure ='Are you sure you want to do this?';
+  title
+    "{forum_name} - Index"
+  meta [content="width=device-width, initial-scale=#" name="viewport"]
+  meta [content="{forum_name}" property="og:site_name"]
+  meta [content="{forum_name} - Index" property="og:title"]
+  meta [content="{boardurl}/index.php" property="og:url"]
+  meta [content="{forum_name} - Index" property="og:description"]
+  meta [content="{forum_name} - Index" name="description"]
+  meta [content="##EA#" name="theme-color"]
+  link [href="{boardurl}/index.php" rel="canonical"]
+  link [href="{boardurl}/index.php?action=help" rel="help"]
+  link [href="{boardurl}/index.php" rel="contents"]
+  link [href="{boardurl}/index.php?action=search" rel="search"]
+  link [href="{boardurl}/index.php?action=feed;type=rss#" rel="alternate" title="{forum_name} - RSS" type="application/rss+xml"]
+  link [href="{boardurl}/index.php?action=feed;type=atom" rel="alternate" title="{forum_name} - Atom" type="application/atom+xml"]
+@ body
+body#smf.action_home
+  div#footerfix
+    div#top_section
+      div.content_wrapper.inner_wrap
+        ul#top_info.floatleft
+          li
+            a#profile_menu_top [href="{boardurl}/index.php?action=profile"]
+              img.avatar [alt src="{boardurl}/avatars/default.png"]
+              span.textmenu
+                "{member}"
+            div#profile_menu.top_menu
+          li
+            a#pm_menu_top [href="{boardurl}/index.php?action=pm"]
+              span.inbox.main_icons
+              span.textmenu
+                "My Messages"
+            div#pm_menu.scrollable.top_menu
+          li
+            a#alerts_menu_top [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+              span.alerts.main_icons
+              span.textmenu
+                "Alerts"
+            div#alerts_menu.scrollable.top_menu
+          li#nojs_logout
+            a [href="{boardurl}/index.php?action=logout;{session_var}={session_id}"]
+              "Log out"
+            script
+              | document.getElementById("nojs_logout").style.display = "none";
+        form#search_form.floatright [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post"]
+          input [name="search" type="search" value]
+          select [name="search_selection"]
+            option [selected value="all"]
+              "Entire forum"
+            option [value="members"]
+              "Members"
+          input.button [name="search#" type="submit" value="Search"]
+          input [name="advanced" type="hidden" value="#"]
+    header#header.content_wrapper
+      h1.forumtitle
+        a#top [href="{boardurl}/index.php"]
+          "{forum_name}"
+      img#smflogo [alt="Simple Machines Forum" src="{boardurl}/Themes/default/images/smflogo.svg" title="Simple Machines Forum"]
+    nav#main_menu [aria-label="Main Menu"]
+      div.content_wrapper
+        a.mobile_user_menu
+          span.menu_icon
+          span.text_menu
+            "Main Menu"
+        div#mobile_user_menu.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Main Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            ul.dropmenu.menu_nav
+              li.button_home
+                a.active [href="{boardurl}/index.php"]
+                  span.home.main_icons
+                  span.textmenu
+                    "Home"
+              li.button_search
+                a [href="{boardurl}/index.php?action=search"]
+                  span.main_icons.search
+                  span.textmenu
+                    "Search"
+              li.button_mlist.subsections
+                a [href="{boardurl}/index.php?action=mlist"]
+                  span.main_icons.mlist
+                  span.textmenu
+                    "Members"
+                ul
+                  li
+                    a [href="{boardurl}/index.php?action=mlist"]
+                      "View the memberlist"
+                  li
+                    a [href="{boardurl}/index.php?action=mlist;sa=search"]
+                      "Search for Members"
+    div#wrapper.content_wrapper
+      div#inner_wrap
+        div.user
+          time [datetime="{date}"]
+            "{date}"
+          ul.unread_links
+            li
+              a [href="{boardurl}/index.php?action=unread" title="Show unread posts since last visit."]
+                "Unread Posts"
+            li
+              a [href="{boardurl}/index.php?action=unreadreplies" title="Show new replies to your posts."]
+                "Updated Topics"
+        div.news
+          h2
+            "News:"
+          p
+            "SMF - Just Installed!"
+      nav.navigate_section [aria-label="Breadcrumb"]
+        ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+          li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+            a [href="{boardurl}/index.php" itemprop="item"]
+              span [itemprop="name"]
+                "{forum_name}"
+            meta [content="#" itemprop="position"]
+      div#content_section
+        snapshot-ignored [selector="#main_content_section"]
+  footer#footer
+    div.content_wrapper
+      ul
+        li.copyright
+          a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+            "SMF # Alpha(s) #-dev © #"
+          ","
+          a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+            "Simple Machines"
+        li.helplinks
+          a [href="{boardurl}/index.php?action=help"]
+            "Help"
+          a [href="{boardurl}/index.php?action=agreement"]
+            "Terms and Rules"
+          a [href="#top_section"]
+            "Go Up ▲"
+  script
+    | window.addEventListener("DOMContentLoaded", function() { function triggerCron() { $.get('{boardurl}' + "/cron.php?ts=#"); } window.setTimeout(triggerCron, #); var user_menus = new smc_PopupMenu(); user_menus.add("profile", "{boardurl}/index.php?action=profile;area=popup"); user_menus.add("alerts", "{boardurl}/index.php?action=profile;area=alerts_popup;u=#"); user_menus.add("pm", "{boardurl}/index.php?action=pm;sa=popup"); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/credits.txt b/tests/Integration/Http/Snapshot/snapshots/member/credits.txt
new file mode 100644
index 00000000000..ed5274d7367
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/credits.txt
@@ -0,0 +1,241 @@
+status 200
+@ title
+title
+  "Credits"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#credits.main_section
+      div.cat_bar
+        h3.catbg
+          "Credits"
+      div.windowbg
+        p
+          "Simple Machines wants to thank everyone who helped make SMF # Alpha(s) #-dev what it is today; shaping and directing our project, all through the thick and the thin. It wouldn’t have been possible without you. This includes our users and especially Charter Members - thanks for installing and using our software as well as providing valuable feedback, bug reports, and opinions."
+      div.cat_bar
+        h3.catbg
+          "The Team"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Project Management"
+          dd
+            "Aleksi \"Lex\" Kilpinen, Michele \"Illori\" Davis, Jessica \"Suki\" González, and Will \"Kindred\" Wagner."
+          dt
+            strong
+              "Developers"
+          dd
+            "Shawn Bulen, John \"live#\" Rayes, Oscar \"Ozp\" Rydhé, Aaron van Geffen, Antechinus, Bjoern \"Bloc\" Kristiansen, Brad \"IchBin™\" Grow, Colin Schoen, emanuele, Hendrik Jan \"Compuart\" Visser, Jessica \"Suki\" González, Jon \"Sesquipedalian\" Stovell, Juan \"JayBachatero\" Hernandez, Karl \"RegularExpression\" Benson, Matthew \"Labradoodle-#\" Kerle, Grudge, Michael \"Oldiesmann\" Eshom, Michael \"Thantos\" Miller, Norv, Peter \"Arantor\" Spicer, Selman \"[SiNaN]\" Eser, Shitiz \"Dragooon\" Garg, Theodore \"Orstio\" Hildebrandt, Thorsten \"TE\" Eurich, and winrules."
+          dt
+            strong
+              "Support Specialists"
+          dd
+            "Will \"Kindred\" Wagner, Doug Heffernan, lurkalot, Steve, Aleksi \"Lex\" Kilpinen, br#, GigaWatt, ziycon, Adam Tallon, Bigguy, Bruno \"margarett\" Alves, CapadY, ChalkCat, Chas Large, Duncan#, gbsothere, JimM, Justyne, Kat, Kevin \"greyknight#\" Hou, Krash, Mashby, Michael Colin Blaber, Old Fossil, S-Ace, shadav, Storman™, Wade \"sησω\" Poulsen, and xenovanis."
+          dt
+            strong
+              "Customizers"
+          dd
+            "Diego Andrés, GL#Wing, Johnnie \"TwitchisMental\" Ballew, Jonathan \"vbgamer#\" Valentin, Sami \"SychO\" Mazouz, Brannon \"B\" Hall, Gary M. Gadsdon, Jack \"akabugeyes\" Thorsen, Jason \"JBlaze\" Clemons, Joey \"Tyrsson\" Smith, Kays, Michael \"Mick.\" Gomez, NanoSector, Ricky., Russell \"NEND\" Najar, and SA™."
+          dt
+            strong
+              "Documentation Writers"
+          dd
+            "Michele \"Illori\" Davis, Irisado, AngelinaBelle, Chainy, Graeme Spence, and Joshua \"groundup\" Dickerson."
+          dt
+            strong
+              "Localizers"
+          dd
+            "Nikola \"Dzonny\" Novaković, m#z, Francisco \"d#vcho\" Domínguez, Robert Monden, and Relyana."
+          dt
+            strong
+              "Marketing"
+          dd
+            "Adish \"(F.L.A.M.E.R)\" Patel, Bryan \"Runic\" Deakin, Marcus \"cσσкιє мσηѕтєя\" Forsberg, and Ralph \"[n#rve]\" Otowo."
+          dt
+            strong
+              "Site Administrators"
+          dd
+            "Jeremy \"SleePy\" Darwood."
+          dt
+            strong
+              "Servers Administrators"
+          dd
+            "Derek Schwab, Michael Johnson, and Liroy van Hoewijk."
+      div.cat_bar
+        h3.catbg
+          "Special Thanks"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Consulting Developers"
+          dd
+            "albertlast, Brett Flannigan, Mark Rose, René-Gilles \"Nao 尚\" Deberdt, tinoest, and everyone who"
+            a [href="https://github.com/SimpleMachines/SMF/graphs/contributors"]
+              "contributed on GitHub"
+            "."
+          dt
+            strong
+              "Beta Testers"
+          dd
+            "The invaluable few who tirelessly find bugs, provide feedback, and drive the developers crazier."
+          dt
+            strong
+              "Language Translators"
+          dd
+            "Thank you for your efforts which make it possible for people all around the world to use SMF."
+          dt
+            strong
+              "Founding Father of SMF"
+          dd
+            "Unknown W. \"[Unknown]\" Brackets."
+          dt
+            strong
+              "Original Project Managers"
+          dd
+            "Jeff Lewis, Joseph Fung, and David Recordon."
+          dt
+            strong
+              "In loving memory of"
+          dd
+            "Crip, K@, metallica#, Paul_Pauline, and Rock Lee."
+        p.posttext
+          "And for anyone we may have missed, thank you!"
+      div.cat_bar
+        h3.catbg
+          "Software/Graphics"
+      div.windowbg
+        dl
+          dt
+            strong
+              "Graphics"
+          dd
+            a [href="https://p.yusukekamiyamane.com/"]
+              "Fugue Icons"
+            "| © # Yusuke(s) Kamiyamane | These icons are licensed under a Creative Commons Attribution # License(s)"
+          dd
+            a [href="https://techbase.kde.org/Projects/Oxygen/Licensing#Use_on_Websites"]
+              "Oxygen Icons"
+            "| These icons are licensed under"
+            a [href="https://www.gnu.org/licenses/lgpl-#.html"]
+              "GNU LGPLv#"
+        dl
+          dt
+            strong
+              "Software"
+          dd
+            a [href="https://jquery.org/"]
+              "JQuery"
+            "| © John Resig | Licensed under"
+            a [href="https://github.com/jquery/jquery/blob/master/LICENSE.txt"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://briancherne.github.io/jquery-hoverIntent/"]
+              "hoverIntent"
+            "| © Brian Cherne | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://www.sceditor.com/"]
+              "SCEditor"
+            "| © Sam Clarke | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/code-of-kpp/jquery-animadrag/blob/master/animadrag.js"]
+              "animaDrag"
+            "| © Abel Mohler | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://slippry.com/"]
+              "jQuery Responsive Slider"
+            "| © booncon ROCKETS | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/ichord/At.js"]
+              "At.js"
+            "| © {email} | Licensed under"
+            a [href="https://github.com/ichord/At.js/blob/master/LICENSE-MIT"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/ttsvetko/HTML#-Desktop-Notifications"]
+              "HTML# Desktop(s) Notifications"
+            "| © Tsvetan Tsvetkov | Licensed under"
+            a [href="https://github.com/ttsvetko/HTML#-Desktop-Notifications/blob/master/License.txt"]
+              "The Apache License Version #"
+          dd
+            a [href="https://github.com/enygma/gauth"]
+              "GAuth Code Generator/Validator"
+            "| © Chris Cornutt | Licensed under"
+            a [href="https://github.com/enygma/gauth/blob/master/LICENSE"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/enyo/dropzone"]
+              "Dropzone.js"
+            "| © Matias Meno | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/matthiasmullie/minify"]
+              "Minify"
+            "| © Matthias Mullie | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/true/php-punycode"]
+              "PHP-Punycode"
+            "| © True B.V. | Licensed under"
+            a [href="https://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://github.com/mdbassit/Coloris"]
+              "Coloris"
+            "| © Mohammed Bassit | Licensed under"
+            a [href="https://github.com/mdbassit/Coloris/blob/main/LICENSE"]
+              "The MIT License (MIT)"
+          dd
+            a [href="https://fontawesome.com/"]
+              "Font Awesome"
+            "| © # | Licensed under"
+            a [href="http://en.wikipedia.org/wiki/MIT_License"]
+              "The MIT License (MIT)"
+        dl
+          dt
+            strong
+              "Fonts"
+          dd
+            a [href="https://fontlibrary.org/en/font/anonymous-pro"]
+              "Anonymous Pro"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontlibrary.org/en/font/consolamono"]
+              "ConsolaMono"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontlibrary.org/en/font/phennig"]
+              "Phennig"
+            "| © #-# | This font is licensed under the SIL Open Font License, Version #"
+          dd
+            a [href="https://fontawesome.com/"]
+              "Font Awesome"
+            "| © # | This font is licensed under the SIL Open Font License, Version #"
+      div.cat_bar
+        h3.catbg
+          "Forum Copyright"
+      div.windowbg
+        a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+          "SMF # Alpha(s) #-dev © #"
+        ","
+        a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+          "Simple Machines"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/display.txt b/tests/Integration/Http/Snapshot/snapshots/member/display.txt
new file mode 100644
index 00000000000..00429339295
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/display.txt
@@ -0,0 +1,651 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+          "Add poll"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                    li.email
+                      a [href="mailto:{email}" rel="nofollow"]
+                        span.centericon.mail.main_icons [title="Email"]
+                li.poster_ip
+                  a.help.show_on_hover [data-hover="#" href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    span
+                      "Show IP address"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon
+                    img#msg_icon_# [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "The first post, with"
+                  strong
+                    "bold"
+                  ","
+                  em
+                    "italic"
+                  ","
+                  u
+                    "underlined"
+                  "and"
+                  s
+                    "struck"
+                  "text."
+                  br
+                  a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+                    "A link"
+                  "and"
+                  a.bbc_email [href="mailto:{email}"]
+                    "{email}"
+                  "."
+                  br
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote"
+                    "An unattributed quote."
+                  div.codeheader
+                    "Code"
+                  pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+                    code
+                      "echo \"code\";"
+                  ul.bbc_list
+                    li
+                      "One"
+                    li
+                      "Two"
+                  span.bbc_color [style="color: red;"]
+                    "Red"
+                  span.bbc_size [style="font-size: #pt;"]
+                    "Sized"
+                  div.centertext
+                    "Centred"
+                  table.bbc_table
+                    thead
+                      tr
+                        th
+                          "A"
+                        th
+                          "B"
+                    tbody
+                  span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+                    button [tabindex="#" title="Show or hide spoiler content" type="button"]
+                    span
+                      "Hidden"
+                  hr.bbc_hr
+                  "Smileys:"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+                  img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li#modify_button_#.quick_edit
+                    a [href="javascript:void(#);"]
+                      span.main_icons.quick_edit_button
+                      "Quick Edit"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=post;msg=#;topic=#"]
+                          span.main_icons.modify_button
+                          "Modify"
+                      li.you_sure
+                        a [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+                          span.main_icons.remove_button
+                          "Remove topic"
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                "Snapshot Guest"
+              ul.user_info
+                li.membergroup
+                  "Guest"
+                li.poster_ip
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from a guest."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                li.poster_ip
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  blockquote.bbc_standard_quote
+                    cite
+                      "Quote from: {member}"
+                    "The quoted text."
+                  "A reply from an administrator."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                li.poster_ip
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                span.floatright.page_number
+                  "##"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="Reply ## - {subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A reply from another member, with a smiley"
+                  img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+          "Add poll"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+        a.button.mobile_mod
+          "Moderation"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+      div#moderationbuttons_strip.buttonlist.floatbottom
+        a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+          "Remove topic"
+        a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=lock;{session_var}={session_id}"]
+          "Lock topic"
+    div#display_jump_to
+    a#quickreply_anchor
+    div#quickreply.tborder
+      div.cat_bar
+        h3.catbg
+          "Quick Reply"
+      div#quickreply_options
+        div.roundframe
+          p.alert.smalltext
+            "Warning: this topic has not been posted in for at least {duration}."
+            br
+            "Unless you are sure you want to reply, please consider starting a new topic."
+          form#postmodify [accept-charset="UTF-#" action="{boardurl}/index.php?board=#;action=post#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+            input [name="topic" type="hidden" value="#"]
+            input [name="subject" type="hidden" value="{subject}"]
+            input [name="icon" type="hidden" value="xx"]
+            input [name="from_qr" type="hidden" value="#"]
+            input [name="notify" type="hidden" value="#"]
+            input [name="not_approved" type="hidden" value]
+            input [name="goback" type="hidden" value="#"]
+            input [name="last_msg" type="hidden" value="#"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            textarea#quickReply.editor [cols="#" name="quickReply" style="width: #%; height: #px;"]
+            input#quickReply_mode [name="quickReply_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("quickReply"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+    br.clear
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickReply({ bDefaultCollapsed: false, iTopicId: #, iStart: #, sScriptUrl: smf_scripturl, sImagesUrl: smf_images_url, sContainerId: "quickreply_options", sImageId: "quickReplyExpand", sClassCollapsed: "toggle_up", sClassExpanded: "toggle_down", sJumpAnchor: "quickreply_anchor", bIsFull: true }); }); var oEditorID = "quickReply";
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+            "Reply"
+          a.button.button_strip_add_poll [href="{boardurl}/index.php?action=editpoll;add;topic=#"]
+            "Add poll"
+          a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+            "Mark unread"
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Not Following"
+                  br
+                  span
+                    "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts but only @mentions by other members."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this topic."
+    div#mobile_moderation.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "Moderation"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div#moderationbuttons_mobile
+          div#moderationbuttons_strip_mobile.buttonlist.floatbottom
+            a.button.button_strip_delete.you_sure [data-confirm="Are you sure you want to remove this topic?" href="{boardurl}/index.php?action=removetopic#;topic=#;{session_var}={session_id}"]
+              "Remove topic"
+            a.button.button_strip_lock [href="{boardurl}/index.php?action=lock;topic=#;sa=lock;{session_var}={session_id}"]
+              "Lock topic"
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/display_child.txt b/tests/Integration/Http/Snapshot/snapshots/member/display_child.txt
new file mode 100644
index 00000000000..a7b99de22f5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/display_child.txt
@@ -0,0 +1,353 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                li.poster_ip
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A topic in a child board."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li
+                    a [href="{boardurl}/index.php?action=post;quote=#;topic=#;last_msg=#" onclick="return oQuickReply.quote(#);"]
+                      span.main_icons.quote
+                      "Quote"
+                  li#quoteSelected_# [style="display:none"]
+                    a [href="javascript:void(#)"]
+                      span.main_icons.quote_selected
+                      "Quote selected text"
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+          "Reply"
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+    div#display_jump_to
+    a#quickreply_anchor
+    div#quickreply.tborder
+      div.cat_bar
+        h3.catbg
+          "Quick Reply"
+      div#quickreply_options
+        div.roundframe
+          p.alert.smalltext
+            "Warning: this topic has not been posted in for at least {duration}."
+            br
+            "Unless you are sure you want to reply, please consider starting a new topic."
+          form#postmodify [accept-charset="UTF-#" action="{boardurl}/index.php?board=#;action=post#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+            input [name="topic" type="hidden" value="#"]
+            input [name="subject" type="hidden" value="Re: {subject}"]
+            input [name="icon" type="hidden" value="xx"]
+            input [name="from_qr" type="hidden" value="#"]
+            input [name="notify" type="hidden" value="#"]
+            input [name="not_approved" type="hidden" value]
+            input [name="goback" type="hidden" value="#"]
+            input [name="last_msg" type="hidden" value="#"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            textarea#quickReply.editor [cols="#" name="quickReply" style="width: #%; height: #px;"]
+            input#quickReply_mode [name="quickReply_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("quickReply"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+    br.clear
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickReply({ bDefaultCollapsed: false, iTopicId: #, iStart: #, sScriptUrl: smf_scripturl, sImagesUrl: smf_images_url, sContainerId: "quickreply_options", sImageId: "quickReplyExpand", sClassCollapsed: "toggle_up", sClassExpanded: "toggle_down", sJumpAnchor: "quickreply_anchor", bIsFull: true }); }); var oEditorID = "quickReply";
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_reply [href="{boardurl}/index.php?action=post;topic=#;last_msg=#"]
+            "Reply"
+          a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+            "Mark unread"
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Not Following"
+                  br
+                  span
+                    "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts but only @mentions by other members."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this topic."
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot child one", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/display_poll.txt b/tests/Integration/Http/Snapshot/snapshots/member/display_poll.txt
new file mode 100644
index 00000000000..977ae8bfd69
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/display_poll.txt
@@ -0,0 +1,334 @@
+status 200
+@ title
+title
+  "{subject}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        span#top_subject
+          "{subject}"
+        span.lock.main_icons
+        span.main_icons.sticky
+      p
+        "Started by {member}, {date}"
+      span.floatright.nextlinks
+        a [href="{boardurl}/index.php?topic=#;prev_next=prev#new"]
+          "Previous topic"
+        "-"
+        a [href="{boardurl}/index.php?topic=#;prev_next=next#new"]
+          "Next topic"
+    div#poll
+      div.cat_bar
+        h3.catbg
+          span.main_icons.poll
+          "Which colour?"
+      div.windowbg
+        div#poll_options
+          form [accept-charset="UTF-#" action="{boardurl}/index.php?action=vote;topic=#" method="post"]
+            ul.options
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Red"
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Green"
+              li
+                input#options-# [name="options[]" type="radio" value="#"]
+                label [for="options-#"]
+                  "Blue"
+            div.submitbutton
+              input.button [type="submit" value="Submit Vote"]
+              input [name="{session_var}" type="hidden" value="{session_id}"]
+    div#pollmoderation
+      div.buttonlist
+        a.button.button_strip_results [href="{boardurl}/index.php?topic=#;viewresults"]
+          "View results"
+    div.pagesection.top
+      div.buttonlist.floatright
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#forumposts
+      form#quickModForm [accept-charset="UTF-#" action="{boardurl}/index.php?action=quickmod#;topic=#" method="post" name="quickModForm"]
+        div#msg#.windowbg
+          div.post_wrapper
+            div.poster
+              h4
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              ul.user_info
+                li.membergroup
+                  "Administrator"
+                li.avatar
+                  a [href="{boardurl}/index.php?action=profile;u=#"]
+                    img.avatar [alt src="{boardurl}/avatars/default.png"]
+                li.icons
+                  img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+                li.postgroup
+                  "{text}"
+                li.postcount
+                  "Posts: #"
+                li.blurb
+                  "Personal text for {member}"
+                li.profile
+                  ol.profile_icons
+                    li
+                      a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                        span.centericon.main_icons.www [title="Example"]
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                        span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+                li.poster_ip
+                  a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                    "Logged"
+            div.postarea
+              div.keyinfo
+                div#subject_#.subject_hidden.subject_title
+                  a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+                    "{subject}"
+                div.postinfo
+                  span.messageicon [style="position: absolute; z-index: -#;"]
+                    img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+                  a.smalltext [href="{boardurl}/index.php?msg=#" rel="nofollow" title="{subject}"]
+                    "{date}"
+                  span.spacer
+                  span#modified_#.floatright.modified.smalltext
+                div#msg_#_quick_mod
+              div.post
+                div#msg_#.inner [data-msgid="#"]
+                  "A sticky, locked topic with a poll."
+              div.under_message
+                ul.quickbuttons.quickbuttons_post
+                  li.post_options
+                    a [href="javascript:void(#);"]
+                      "More..."
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=reporttm;topic=#;msg=#"]
+                          span.error.main_icons
+                          "Report to moderator"
+            div.moderatorbar
+              div#msg_#_signature.signature
+                "A signature with"
+                strong
+                  "bold"
+                "text."
+        hr.post_separator
+    div.pagesection
+      div.buttonlist.floatright
+        a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+          "Mark unread"
+        a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+          "Print"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Not Following"
+                br
+                span
+                  "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts but only @mentions by other members."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this topic."
+              a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this topic."
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+            span [itemprop="name"]
+              "{subject}"
+          meta [content="#" itemprop="position"]
+    div#moderationbuttons
+    div#display_jump_to
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.button.button_strip_mark_unread [href="{boardurl}/index.php?action=markasread;sa=topic;t=#;topic=#;{session_var}={session_id}"]
+            "Mark unread"
+          a.button.button_strip_print [href="{boardurl}/index.php?action=printpage;topic=#" rel="nofollow"]
+            "Print"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Not Following"
+                  br
+                  span
+                    "You will not receive any emails or alerts for this topic and it will also not show up in your unread replies and topics list. You will still receive @mentions for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts but only @mentions by other members."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this topic."
+                a [href="{boardurl}/index.php?action=notifytopic;topic=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this topic."
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModify({ sScriptUrl: smf_scripturl, sFormName: 'quickModForm', sClassName: 'quick_edit', bShowModify: true, iTopicId: #, sSaveButtonText: 'Save', sCancelButtonText: 'Cancel', sEditReasonText: 'Reason for editing', sErrorBorderStyle: '#px solid red' }); new JumpTo({ sContainerId: "display_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); new IconList({ sIconIdPrefix: "msg_icon_", sScriptUrl: smf_scripturl, bShowModify: true, iBoardId: #, iTopicId: #, sSessionId: smf_session_id, sSessionVar: smf_session_var, sLabelIconList: "Message icon" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/groups.txt b/tests/Integration/Http/Snapshot/snapshots/member/groups.txt
new file mode 100644
index 00000000000..df3a98e0e13
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/groups.txt
@@ -0,0 +1,67 @@
+status 200
+@ title
+title
+  "Viewing Membergroups"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=groups" itemprop="item"]
+        span [itemprop="name"]
+          "Groups"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.cat_bar
+      h3.catbg
+        "Viewing Membergroups"
+    table#group_lists.table_grid
+      thead
+        tr.title_bar
+          th#header_group_lists_group.group [scope="col"]
+            a [href="{boardurl}/index.php?action=groups;sort=group;desc" rel="nofollow"]
+              "Name"
+              span.main_icons.sort_up
+          th#header_group_lists_icons.icons [scope="col"]
+            a [href="{boardurl}/index.php?action=groups;sort=icons" rel="nofollow"]
+              "Icons"
+          th#header_group_lists_moderators.moderators [scope="col"]
+            "Moderators"
+          th#header_group_lists_members.members [scope="col"]
+            a [href="{boardurl}/index.php?action=groups;sort=members" rel="nofollow"]
+              "Members"
+      tbody
+        tr#list_group_lists_#.windowbg
+          td.group
+            a [href="{boardurl}/index.php?action=groups;sa=members;group=#" style="color: #FF#;"]
+              "Administrator"
+            "("
+            a [href="{boardurl}/index.php?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"]
+              "?"
+            ")"
+          td.icons
+            img [alt="*" src="{boardurl}/Themes/default/images/membericons/iconadmin.png"]
+          td.moderators
+            em
+              "(none)"
+          td.centercol.members
+            "#"
+        tr#list_group_lists_#.windowbg
+          td.group
+            a [href="{boardurl}/index.php?action=groups;sa=members;group=#" style="color: ##FF;"]
+              "Global Moderator"
+          td.icons
+            img [alt="*" src="{boardurl}/Themes/default/images/membericons/icongmod.png"]
+          td.moderators
+            em
+              "(none)"
+          td.centercol.members
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/help.txt b/tests/Integration/Http/Snapshot/snapshots/member/help.txt
new file mode 100644
index 00000000000..12f1b173222
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/help.txt
@@ -0,0 +1,80 @@
+status 200
+@ title
+title
+  "SMF User Help"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=help" itemprop="item"]
+        span [itemprop="name"]
+          "Help"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div.cat_bar
+      h3.catbg
+        "SMF User Help"
+    div#help_container
+      div#helpmain.windowbg
+        p
+          "Welcome to {forum_name}, powered by Simple Machines® Forum (SMF) software!"
+        p
+          "SMF® is the elegant, effective, powerful and free forum software solution that this site is running. It allows users to communicate in discussion topics on a given subject in a clever and organized manner. Furthermore, it has a number of powerful features which end users can take advantage of. Help for many of SMF’s features can be found by either clicking the question mark icon next to the relevant section or by selecting one of the links on this page. These links will take you to SMF’s centrally-located documentation on the Simple Machines official site."
+        ul
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Registering" rel="noopener" target="_blank"]
+              "Registering"
+            "- Many forums require users to register to gain full access."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Logging_In" rel="noopener" target="_blank"]
+              "Logging In"
+            "- Once registered, users must login to access their account."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Profile" rel="noopener" target="_blank"]
+              "Profile"
+            "- Each member has their own personal profile."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Search" rel="noopener" target="_blank"]
+              "Search"
+            "- Searching is an extremely helpful tool for finding information in posts and topics."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Posting" rel="noopener" target="_blank"]
+              "Posting"
+            "- The whole point of a forum, posting allows users to express themselves."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Bulletin_board_code" rel="noopener" target="_blank"]
+              "Bulletin Board Code (BBC)"
+            "- Posts can be spiced up with a little BBC."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Personal_messages" rel="noopener" target="_blank"]
+              "Personal Messages"
+            "- Users can send personal messages to each other."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Memberlist" rel="noopener" target="_blank"]
+              "Memberlist"
+            "- The memberlist shows all the members of a forum."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Calendar" rel="noopener" target="_blank"]
+              "Calendar"
+            "- Users can keep track of events, holidays, and birthdays with the calendar."
+          li
+            a [href="https://wiki.simplemachines.org/smf/SMF#:Features" rel="noopener" target="_blank"]
+              "Features"
+            "- Here is a list of the most popular features in SMF."
+        p
+          "For more information about how to use SMF, please see the"
+          a [href="https://wiki.simplemachines.org/smf" rel="noopener" target="_blank"]
+            "Simple Machines Documentation Wiki"
+          "and check out the"
+          a [href="{boardurl}/index.php?action=credits"]
+            "credits"
+          "to find out who has made SMF what it is today."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/index.php b/tests/Integration/Http/Snapshot/snapshots/member/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/likes.txt b/tests/Integration/Http/Snapshot/snapshots/member/likes.txt
new file mode 100644
index 00000000000..31541d738ea
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/likes.txt
@@ -0,0 +1,5 @@
+status 302
+location {boardurl}/index.php
+(nothing matches title)
+(nothing matches .navigate_section)
+(nothing matches #content_section)
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/member_list.txt b/tests/Integration/Http/Snapshot/snapshots/member/member_list.txt
new file mode 100644
index 00000000000..95f6dc958e9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/member_list.txt
@@ -0,0 +1,134 @@
+status 200
+@ title
+title
+  "Search for Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=mlist" itemprop="item"]
+        span [itemprop="name"]
+          "Members List"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=mlist;sa=search" itemprop="item"]
+        span [itemprop="name"]
+          "Search for Members"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#memberlist.main_section
+      div.pagesection
+        div.floatleft.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+        div.buttonlist.floatright
+          a.button.button_strip_view_all_members [href="{boardurl}/index.php?action=mlist;sa=all"]
+            "View all Members"
+          a.active.button.button_strip_mlist_search [href="{boardurl}/index.php?action=mlist;sa=search"]
+            "Search for Members"
+      div.cat_bar
+        h3.catbg
+          span.floatleft
+            "Members List"
+      div#mlist
+        table.table_grid
+          thead
+            tr.title_bar
+              th.is_online [scope="col"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=is_online;search=snapshot;fields=name" rel="nofollow"]
+                  "Status"
+              th.lefttext.real_name.selected [scope="col" style="width: auto;"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=real_name;desc;search=snapshot;fields=name" rel="nofollow"]
+                  "Name"
+                span.main_icons.sort_up
+              th.website_url [scope="col"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=website_url;search=snapshot;fields=name" rel="nofollow"]
+                  "Website"
+              th.id_group [scope="col"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=id_group;search=snapshot;fields=name" rel="nofollow"]
+                  "Position"
+              th.registered [scope="col"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=registered;search=snapshot;fields=name" rel="nofollow"]
+                  "Date registered"
+              th.post_count [scope="col"]
+                a [href="{boardurl}/index.php?action=mlist;sa=search;start=#;sort=post_count;desc;search=snapshot;fields=name" rel="nofollow"]
+                  "Posts"
+          tbody
+            tr.windowbg
+              td.centertext.is_online
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Offline"]
+                  span.off [title="Offline"]
+              td.lefttext.real_name
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              td.centertext.website_url
+                a [href="https://www.example.com" rel="noopener" target="_blank"]
+                  span.main_icons.www [title="Example"]
+              td.centertext.id_group
+                "Administrator"
+              td.centertext.registered
+                "{date}"
+              td.centertext.post_count
+                div.generic_bar
+                  div.bar [style="width: #%;"]
+                  span
+                    "#"
+            tr.windowbg
+              td.centertext.is_online
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Online"]
+                  span.on [title="Online"]
+              td.lefttext.real_name
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              td.centertext.website_url
+                a [href="https://www.example.com" rel="noopener" target="_blank"]
+                  span.main_icons.www [title="Example"]
+              td.centertext.id_group
+              td.centertext.registered
+                "{date}"
+              td.centertext.post_count
+                div.generic_bar
+                  div.bar [style="width: #%;"]
+                  span
+                    "#"
+            tr.windowbg
+              td.centertext.is_online
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Offline"]
+                  span.off [title="Offline"]
+              td.lefttext.real_name
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+              td.centertext.website_url
+                a [href="https://www.example.com" rel="noopener" target="_blank"]
+                  span.main_icons.www [title="Example"]
+              td.centertext.id_group
+                "Newbie"
+              td.centertext.registered
+                "{date}"
+              td.centertext.post_count
+                div.generic_bar
+                  div.bar [style="width: #%;"]
+                  span
+                    "#"
+      div.pagesection
+        div.floatleft.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+        div.buttonlist.floatright
+          a.button [href="{boardurl}/index.php?action=mlist;sa=search;search=snapshot"]
+            "Search again"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/member_list_search.txt b/tests/Integration/Http/Snapshot/snapshots/member/member_list_search.txt
new file mode 100644
index 00000000000..34076d480e4
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/member_list_search.txt
@@ -0,0 +1,68 @@
+status 200
+@ title
+title
+  "Search for Members"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=mlist" itemprop="item"]
+        span [itemprop="name"]
+          "Members List"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=mlist;sa=search" itemprop="item"]
+        span [itemprop="name"]
+          "Search for Members"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form [accept-charset="UTF-#" action="{boardurl}/index.php?action=mlist;sa=search" method="post"]
+      div#memberlist
+        div.pagesection
+          div.buttonlist.floatright
+            a.button.button_strip_view_all_members [href="{boardurl}/index.php?action=mlist;sa=all"]
+              "View all Members"
+            a.active.button.button_strip_mlist_search [href="{boardurl}/index.php?action=mlist;sa=search"]
+              "Search for Members"
+        div.cat_bar
+          h3.catbg.mlist
+            span.filter.main_icons
+            "Search for Members"
+        div#advanced_search.roundframe
+          dl#mlist_search.settings
+            dt
+              label [for="search"]
+                strong
+                  "Search for"
+            dd
+              input#search [name="search" size="#" type="text" value]
+            dt
+              label
+                strong
+                  "Search options"
+            dd
+              ul
+                li
+                  input#fields-name [checked name="fields[]" type="checkbox" value="name"]
+                  label [for="fields-name"]
+                    "Search by name"
+                li
+                  input#fields-website [name="fields[]" type="checkbox" value="website"]
+                  label [for="fields-website"]
+                    "Search by website"
+                li
+                  input#fields-group [name="fields[]" type="checkbox" value="group"]
+                  label [for="fields-group"]
+                    "Search by position"
+          input.button.floatright [name="submit" type="submit" value="Search"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/message_index.txt b/tests/Integration/Http/Snapshot/snapshots/member/message_index.txt
new file mode 100644
index 00000000000..4598caafc01
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/message_index.txt
@@ -0,0 +1,371 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "Topics, replies and a poll for the snapshot tests."
+    div#board_#_childboards.boardindex_table.main_container
+      div.cat_bar
+        h3.catbg
+          "Sub-Boards"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The first child board."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+          p
+            strong
+              "Last post:"
+            "{date}"
+            span.postby
+              a [href="{boardurl}/index.php?topic=#.msg##new" title="{subject}"]
+                "{subject}"
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                "{member}"
+      div#board_#.up_contain
+        div.board_icon
+          a.board_off [href="{boardurl}/index.php?action=unread;board=#;children" title="No New Posts"]
+        div.info
+          a#b#.mobile_subject.subject [href="{boardurl}/index.php?board=#"]
+            "{board}"
+          div.board_description
+            "The second child board, which stays empty."
+        div.board_stats
+          p
+            "# post(s)"
+            br
+            "# topic(s)"
+        div.lastpost
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#messageindex
+      div#topic_header.title_bar
+        div.board_icon
+        div.info
+          a [href="{boardurl}/index.php?board=#;sort=subject"]
+            "Subject"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=starter"]
+            "Started by"
+        div.board_stats.centertext
+          a [href="{boardurl}/index.php?board=#;sort=replies"]
+            "Replies"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=views"]
+            "Views"
+        div.lastpost
+          a [href="{boardurl}/index.php?board=#;asc"]
+            "Last post"
+            span.main_icons.sort_down
+      div#topic_container
+        div.locked.sticky.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+                span.lock.main_icons
+                span.main_icons.sticky
+                span.main_icons.poll
+              div.message_index_title
+                span.bold_text.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+            span.main_icons.profile_sm
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=#.msg##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.profile_sm
+          "Topic you have posted in"
+          br
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+            "New Topic"
+          a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+            "New poll"
+          a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+            "Mark Read"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts for new topics"
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this board."
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this board."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/message_index_child.txt b/tests/Integration/Http/Snapshot/snapshots/member/message_index_child.txt
new file mode 100644
index 00000000000..bd18e5836e9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/message_index_child.txt
@@ -0,0 +1,319 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "The first child board."
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#messageindex
+      div#topic_header.title_bar
+        div.board_icon
+        div.info
+          a [href="{boardurl}/index.php?board=#;sort=subject"]
+            "Subject"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=starter"]
+            "Started by"
+        div.board_stats.centertext
+          a [href="{boardurl}/index.php?board=#;sort=replies"]
+            "Replies"
+          "/"
+          a [href="{boardurl}/index.php?board=#;sort=views"]
+            "Views"
+        div.lastpost
+          a [href="{boardurl}/index.php?board=#;asc"]
+            "Last post"
+            span.main_icons.sort_down
+      div#topic_container
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+            span.main_icons.profile_sm
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+        div.windowbg
+          div.board_icon
+            img [alt src="{boardurl}/Themes/default/images/post/xx.png"]
+          div.info.info_block
+            div
+              div#icons#.floatright.icons
+              div.message_index_title
+                span.preview [title]
+                  span#msg#
+                    a [href="{boardurl}/index.php?topic=#"]
+                      "{subject}"
+              p.floatleft
+                "Started by"
+                a.preview [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+          div.board_stats.centertext
+            p
+              "# reply(s)"
+              br
+              "# view(s)"
+          div.lastpost
+            p
+              a [href="{boardurl}/index.php?topic=##new"]
+                "{date}"
+              br
+              "by"
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.profile_sm
+          "Topic you have posted in"
+          br
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot child one", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+            "New Topic"
+          a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+            "New poll"
+          a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+            "Mark Read"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts for new topics"
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this board."
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this board."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/message_index_empty.txt b/tests/Integration/Http/Snapshot/snapshots/member/message_index_empty.txt
new file mode 100644
index 00000000000..51e031248e6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/message_index_empty.txt
@@ -0,0 +1,226 @@
+status 200
+@ title
+title
+  "{board}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#display_head.information
+      h2.display_title
+        "{board}"
+      p
+        "A board with nothing in it."
+    div.pagesection
+      div.floatleft.pagelinks
+        a.button [href="#bot"]
+          "Go Down"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    div#messageindex
+      div#topic_header.title_bar
+        h3.titlebg
+          "No messages..."
+      div#topic_container
+    div.pagesection
+      div.floatleft.pagelinks
+        a#bot.button [href="#main_content_section"]
+          "Go Up"
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div.buttonlist.floatright
+        a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+          "New Topic"
+        a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+          "New poll"
+        a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+          "Mark Read"
+        a.button.button_strip_notify
+          "No Alerts or Emails"
+        div.dropmenu.notify_dropdown.top_menu
+          div.viewport
+            div.overview
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "No Alerts or Emails"
+                br
+                span
+                  "You will not receive any emails or alerts for new topics"
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Alerts"
+                br
+                span
+                  "You will receive alerts for this board."
+              a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                strong
+                  "Receive Emails and Alerts"
+                br
+                span
+                  "You will receive both alerts and e-mails for this board."
+      div.floatright.mobile_buttons
+        a.button.mobile_act
+          "User actions"
+    nav.navigate_section [aria-label="Breadcrumb"]
+      ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          a [href="{boardurl}/index.php" itemprop="item"]
+            span [itemprop="name"]
+              "{forum_name}"
+          meta [content="#" itemprop="position"]
+        li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php#c#" itemprop="item"]
+            span [itemprop="name"]
+              "Snapshot fixtures"
+          meta [content="#" itemprop="position"]
+        li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+          span.dividers
+            "►"
+          a [href="{boardurl}/index.php?board=#" itemprop="item"]
+            span [itemprop="name"]
+              "{board}"
+          meta [content="#" itemprop="position"]
+    script
+      | window.addEventListener("DOMContentLoaded", function() { new QuickModifyTopic({ aHidePrefixes: ["icons", "msg", "pages", "newicon"], sTopicContainer: "topic_container", }); });
+    div#topic_icons.tborder
+      div.information
+        p#message_index_jump_to
+        p.floatleft
+          span.main_icons.profile_sm
+          "Topic you have posted in"
+          br
+          span.main_icons.poll
+          "Poll"
+          br
+          span.main_icons.move
+          "Moved Topic"
+          br
+        p
+          span.lock.main_icons
+          "Locked Topic"
+          br
+          span.main_icons.sticky
+          "Sticky Topic"
+          br
+          span.main_icons.watch
+          "Topic you are watching"
+          br
+        script
+          | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "message_index_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Snapshot empty board", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
+    div#mobile_action.popup_container
+      div.description.popup_window
+        div.popup_heading
+          "User actions"
+          a.hide_popup.main_icons [href="javascript:void(#);"]
+        div.buttonlist
+          a.active.button.button_strip_new_topic [href="{boardurl}/index.php?action=post;board=#"]
+            "New Topic"
+          a.button.button_strip_post_poll [href="{boardurl}/index.php?action=post;board=#;poll"]
+            "New poll"
+          a.button.button_strip_markread.you_sure [data-confirm="Are you sure you want to mark messages as read?" href="{boardurl}/index.php?action=markasread;sa=board;board=#;{session_var}={session_id}"]
+            "Mark Read"
+          a.button.button_strip_notify
+            "No Alerts or Emails"
+          div.dropmenu.notify_dropdown.top_menu
+            div.viewport
+              div.overview
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "No Alerts or Emails"
+                  br
+                  span
+                    "You will not receive any emails or alerts for new topics"
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Alerts"
+                  br
+                  span
+                    "You will receive alerts for this board."
+                a [href="{boardurl}/index.php?action=notifyboard;board=#;mode=#;{session_var}={session_id}"]
+                  strong
+                    "Receive Emails and Alerts"
+                  br
+                  span
+                    "You will receive both alerts and e-mails for this board."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/other_profile_posts.txt b/tests/Integration/Http/Snapshot/snapshots/member/other_profile_posts.txt
new file mode 100644
index 00000000000..e99411850a9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/other_profile_posts.txt
@@ -0,0 +1,210 @@
+status 200
+@ title
+title
+  "Show Posts - Snapshot Other"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=showposts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=showposts;sa=messages" itemprop="item"]
+        span [itemprop="name"]
+          "Messages"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.chosen.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Show Posts"
+      p.information
+        "This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Show Posts Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Show Posts Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                    "Messages"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                    "Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                    "Attachments"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar.cat_bar_round
+        h3.catbg
+          "Messages - Snapshot Other"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "A topic in a child board."
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "Another topic, so the board lists more than one."
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "A reply from another member, with a smiley"
+            img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+          li.you_sure
+            a [data-confirm="Remove this post" href="{boardurl}/index.php?action=deletemsg;msg=#;topic=#;profile;u=#;start=#;{session_var}={session_id}"]
+              span.main_icons.remove_button
+              "Remove"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/other_profile_summary.txt b/tests/Integration/Http/Snapshot/snapshots/member/other_profile_summary.txt
new file mode 100644
index 00000000000..ea0e32b8af9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/other_profile_summary.txt
@@ -0,0 +1,149 @@
+status 200
+@ title
+title
+  "{member}"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;u=#;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.personal_message.profile_menu_icon [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+                      span.main_icons.personal_message
+                      "Send personal message"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Other"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+            br
+            a [href="{boardurl}/index.php?action=buddy;u=#;{session_var}={session_id}"]
+              "Add to buddy list"
+          a.infolinks [href="{boardurl}/index.php?action=pm;sa=send;u=#"]
+            "Send PM"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Other"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_inbox.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_inbox.txt
new file mode 100644
index 00000000000..d2e22d1bfd5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_inbox.txt
@@ -0,0 +1,249 @@
+status 200
+@ title
+title
+  "Personal Messages Index"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;f=inbox" itemprop="item"]
+        span [itemprop="name"]
+          "Inbox"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.chosen.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        script
+          | var allLabels = {}; var currentLabels = {}; function loadLabelChoices() { var listing = document.forms.pmFolder.elements; var theSelect = document.forms.pmFolder.pm_action; var add, remove, toAdd = {length: #}, toRemove = {length: #}; if (theSelect.childNodes.length == #) return; // This is done this way for internationalization reasons. if (!('-#' in allLabels)) { for (var o = #; o < theSelect.options.length; o++) if (theSelect.options[o].value.substr(#, #) == "rem_") allLabels[theSelect.options[o].value.substr(#)] = theSelect.options[o].text; } for (var i = #; i < listing.length; i++) { if (listing[i].name != "pms[]" || !listing[i].checked) continue; var alreadyThere = [], x; for (x in currentLabels[listing[i].value]) { if (!(x in toRemove)) { toRemove[x] = allLabels[x]; toRemove.length++; } alreadyThere[x] = allLabels[x]; } for (x in allLabels) { if (!(x in alreadyThere)) { toAdd[x] = allLabels[x]; toAdd.length++; } } } while (theSelect.options.length > #) theSelect.options[#] = null; if (toAdd.length != #) { theSelect.options[theSelect.options.length] = new Option("Add label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Add label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toAdd) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toAdd[i], "add_" + i); } } if (toRemove.length != #) { theSelect.options[theSelect.options.length] = new Option("Remove label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Remove label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toRemove) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toRemove[i], "rem_" + i); } } }
+        form#pmFolder.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=pmactions;f=inbox;start=#" method="post" name="pmFolder"]
+          div.cat_bar
+            h3.catbg
+              "Inbox"
+          table.table_grid
+            thead
+              tr.title_bar
+                th.centercol.pm_icon.table_icon
+                  a [href="{boardurl}/index.php?action=pm;view;f=inbox;start=#;sort=date"]
+                    span.main_icons.switch [title="Change view"]
+                th.lefttext.pm_time.quarter_table
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=date;desc"]
+                    "Date"
+                    span.main_icons.sort_up
+                th.half_table.lefttext.pm_subject
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=subject"]
+                    "Subject"
+                th.lefttext.pm_from_to
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=name"]
+                    "From"
+                th.centercol.pm_moderation.table_icon
+                  input [onclick="invertAll(this, this.form);" type="checkbox"]
+            tbody
+              tr.windowbg
+                td.pm_icon.table_icon
+                  script
+                    | currentLabels[#] = { "-#": "Inbox" };
+                  span.im_off.main_icons [title="Read"]
+                td.pm_time
+                  "{date}"
+                td.pm_subject
+                  a [href="#msg#"]
+                    "Snapshot message"
+                td.pm_from_to
+                  a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                    "{member}"
+                td.centercol.pm_moderation.table_icon
+                  input#deletelisting# [name="pms[]" onclick="if (document.getElementById('deletedisplay#')) document.getElementById('deletedisplay#').checked = this.checked;" type="checkbox" value="#"]
+          div.pagesection
+            div.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+            div.floatright
+              select [name="pm_action" onchange="if (this.options[this.selectedIndex].value) this.form.submit();" onfocus="loadLabelChoices();"]
+                option [value]
+                  "Label selected..."
+                option [disabled value]
+                  "---------------"
+                option [disabled value]
+                  "Add label"
+                option [disabled value]
+                  "Remove label"
+                option [value="rem_-#"]
+                  "Inbox"
+              noscript
+                input.button [type="submit" value="Apply"]
+              input.button.you_sure [data-confirm="Are you sure you want to delete all selected personal messages?" name="del_selected" type="submit" value="Remove selected"]
+          div.clear_right
+            br
+          div#msg#.windowbg
+            div.post_wrapper
+              div.poster
+                h4
+                  a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                    "{member}"
+                ul.user_info
+                  li.avatar
+                    a [href="{boardurl}/index.php?action=profile;u=#"]
+                      img.avatar [alt src="{boardurl}/avatars/default.png"]
+                  li.icons
+                    img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                  li.postgroup
+                    "{text}"
+                  li.postcount
+                    "Posts: #"
+                  li.blurb
+                    "Personal text for {member}"
+                  li.poster_ip
+                    a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                      "Logged"
+                  li.profile
+                    ol.profile_icons
+                      li
+                        a [href="{boardurl}/index.php?action=profile;u=#" title="View profile"]
+                          span.main_icons.members
+                      li
+                        a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                          span.centericon.main_icons.www [title="Example"]
+                      li
+                        a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                          span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+              div.postarea
+                div.keyinfo
+                  div#subject_#.subject_title
+                    h5
+                      "Snapshot message"
+                  div.postinfo
+                    span.smalltext
+                      "Sent to"
+                      a [href="{boardurl}/index.php?action=profile;u=#"]
+                        "{member}"
+                      "and"
+                      a [href="{boardurl}/index.php?action=profile;u=#"]
+                        "{member}"
+                      "on {date}"
+                div.post
+                  div#msg_#.inner
+                    "A personal message to two people."
+                div.under_message
+                  div.floatleft.labels
+                    select [name="pm_actions[#]" onchange="if (this.options[this.selectedIndex].value) form.submit();"]
+                      option [value]
+                        "Label message..."
+                      option [disabled value]
+                        "---------------"
+                    noscript
+                      input.button [type="submit" value="Apply"]
+                  ul.quickbuttons.quickbuttons_pm
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;quote;u=all"]
+                        span.main_icons.reply_all_button
+                        "Reply to All"
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;u=#"]
+                        span.main_icons.reply_button
+                        "Reply"
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;quote;u=all"]
+                        span.main_icons.quote
+                        "Quote"
+                    li.you_sure
+                      a [data-confirm="'Remove this post?'" href="{boardurl}/index.php?action=pm;sa=pmactions;pm_actions%#b#%#D=delete;f=inbox;start=#;{session_var}={session_id}"]
+                        span.main_icons.remove_button
+                        "Delete"
+                    li.inline_mod_check
+                      input#deletedisplay# [name="pms[]" onclick="document.getElementById('deletelisting#').checked = this.checked;" type="checkbox" value="#"]
+              div.moderatorbar
+                div.signature
+                  "A signature with"
+                  strong
+                    "bold"
+                  "text."
+          div.pagesection
+            div.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+            div.floatright
+              input.button.you_sure [data-confirm="Are you sure you want to delete all selected personal messages?" name="del_selected" type="submit" value="Remove selected"]
+          br
+          input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_labels.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_labels.txt
new file mode 100644
index 00000000000..c9f51bcdfd3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_labels.txt
@@ -0,0 +1,128 @@
+status 200
+@ title
+title
+  "Manage labels"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=manlabels" itemprop="item"]
+        span [itemprop="name"]
+          "Manage labels"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.chosen.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        form [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=manlabels" method="post"]
+          div.cat_bar
+            h3.catbg
+              "Manage labels"
+          div.information
+            "From here you can add, edit and delete the labels used in your personal message center."
+          table.table_grid
+            thead
+              tr.title_bar
+                th.lefttext
+                  "Label name"
+                th.centertext.table_icon
+            tbody
+              tr.windowbg
+                td [colspan="#"]
+                  "You currently have no labels setup!"
+          div.block.righttext
+            input.button [name="save" type="submit" value="Save"]
+            input.button.you_sure [data-confirm="Are you sure you wish to delete the selected labels?" name="delete" type="submit" value="Remove selected"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+        form [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=manlabels" method="post"]
+          div.cat_bar
+            h3.catbg
+              "Add new label"
+          div.windowbg
+            dl.settings
+              dt
+                strong
+                  label [for="add_label"]
+                    "Label name"
+              dd
+                input#add_label [maxlength="#" name="label" size="#" type="text" value]
+            input.button.floatright [name="add" type="submit" value="Add new label"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+        br
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_outbox.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_outbox.txt
new file mode 100644
index 00000000000..52cd214ad65
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_outbox.txt
@@ -0,0 +1,131 @@
+status 200
+@ title
+title
+  "Personal Messages Index"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;f=sent" itemprop="item"]
+        span [itemprop="name"]
+          "Sent Items"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.chosen.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        script
+          | var allLabels = {}; var currentLabels = {}; function loadLabelChoices() { var listing = document.forms.pmFolder.elements; var theSelect = document.forms.pmFolder.pm_action; var add, remove, toAdd = {length: #}, toRemove = {length: #}; if (theSelect.childNodes.length == #) return; // This is done this way for internationalization reasons. if (!('-#' in allLabels)) { for (var o = #; o < theSelect.options.length; o++) if (theSelect.options[o].value.substr(#, #) == "rem_") allLabels[theSelect.options[o].value.substr(#)] = theSelect.options[o].text; } for (var i = #; i < listing.length; i++) { if (listing[i].name != "pms[]" || !listing[i].checked) continue; var alreadyThere = [], x; for (x in currentLabels[listing[i].value]) { if (!(x in toRemove)) { toRemove[x] = allLabels[x]; toRemove.length++; } alreadyThere[x] = allLabels[x]; } for (x in allLabels) { if (!(x in alreadyThere)) { toAdd[x] = allLabels[x]; toAdd.length++; } } } while (theSelect.options.length > #) theSelect.options[#] = null; if (toAdd.length != #) { theSelect.options[theSelect.options.length] = new Option("Add label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Add label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toAdd) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toAdd[i], "add_" + i); } } if (toRemove.length != #) { theSelect.options[theSelect.options.length] = new Option("Remove label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Remove label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toRemove) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toRemove[i], "rem_" + i); } } }
+        form#pmFolder.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=pmactions;f=sent;start=#" method="post" name="pmFolder"]
+          div.cat_bar
+            h3.catbg
+              "Sent Items"
+          table.table_grid
+            thead
+              tr.title_bar
+                th.centercol.pm_icon.table_icon
+                  a [href="{boardurl}/index.php?action=pm;view;f=sent;start=#;sort=date"]
+                    span.main_icons.switch [title="Change view"]
+                th.lefttext.pm_time.quarter_table
+                  a [href="{boardurl}/index.php?action=pm;f=sent;start=#;sort=date;desc"]
+                    "Date"
+                    span.main_icons.sort_up
+                th.half_table.lefttext.pm_subject
+                  a [href="{boardurl}/index.php?action=pm;f=sent;start=#;sort=subject"]
+                    "Subject"
+                th.lefttext.pm_from_to
+                  a [href="{boardurl}/index.php?action=pm;f=sent;start=#;sort=name"]
+                    "To"
+                th.centercol.pm_moderation.table_icon
+                  input [onclick="invertAll(this, this.form);" type="checkbox"]
+            tbody
+              tr.windowbg
+                td [colspan="#"]
+                  "No messages..."
+          div.pagesection
+            div.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+            div.floatright
+          div.clear_right
+            br
+          input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_prune.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_prune.txt
new file mode 100644
index 00000000000..c12eafa6f7d
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_prune.txt
@@ -0,0 +1,110 @@
+status 200
+@ title
+title
+  "Prune Messages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=prune" itemprop="item"]
+        span [itemprop="name"]
+          "Prune Messages"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.chosen.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        div.cat_bar
+          h3.catbg
+            "Prune Messages"
+        div.windowbg
+          form [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=prune" method="post" onsubmit="return confirm('Are you sure you wish to prune your personal messages? They cannot be recovered!');"]
+            p
+              "Delete all personal messages older than"
+              input [name="age" size="#" type="text" value="#"]
+              "days."
+            input.button [type="submit" value="Delete"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+        div.windowbg
+          form [action="{boardurl}/index.php?action=pm;sa=removeall#" method="post" onsubmit="return confirm('Are you absolutely sure you wish to delete all of your personal messages? They cannot be recovered!');"]
+            p
+              "Delete all of your personal messages (this will wipe out your inbox and your outbox)."
+            input.button [type="submit" value="Delete all"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_read.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_read.txt
new file mode 100644
index 00000000000..d2e22d1bfd5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_read.txt
@@ -0,0 +1,249 @@
+status 200
+@ title
+title
+  "Personal Messages Index"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;f=inbox" itemprop="item"]
+        span [itemprop="name"]
+          "Inbox"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.chosen.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        script
+          | var allLabels = {}; var currentLabels = {}; function loadLabelChoices() { var listing = document.forms.pmFolder.elements; var theSelect = document.forms.pmFolder.pm_action; var add, remove, toAdd = {length: #}, toRemove = {length: #}; if (theSelect.childNodes.length == #) return; // This is done this way for internationalization reasons. if (!('-#' in allLabels)) { for (var o = #; o < theSelect.options.length; o++) if (theSelect.options[o].value.substr(#, #) == "rem_") allLabels[theSelect.options[o].value.substr(#)] = theSelect.options[o].text; } for (var i = #; i < listing.length; i++) { if (listing[i].name != "pms[]" || !listing[i].checked) continue; var alreadyThere = [], x; for (x in currentLabels[listing[i].value]) { if (!(x in toRemove)) { toRemove[x] = allLabels[x]; toRemove.length++; } alreadyThere[x] = allLabels[x]; } for (x in allLabels) { if (!(x in alreadyThere)) { toAdd[x] = allLabels[x]; toAdd.length++; } } } while (theSelect.options.length > #) theSelect.options[#] = null; if (toAdd.length != #) { theSelect.options[theSelect.options.length] = new Option("Add label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Add label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toAdd) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toAdd[i], "add_" + i); } } if (toRemove.length != #) { theSelect.options[theSelect.options.length] = new Option("Remove label", ""); setInnerHTML(theSelect.options[theSelect.options.length - #], "Remove label"); theSelect.options[theSelect.options.length - #].disabled = true; for (i in toRemove) { if (i != "length") theSelect.options[theSelect.options.length] = new Option(toRemove[i], "rem_" + i); } } }
+        form#pmFolder.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=pmactions;f=inbox;start=#" method="post" name="pmFolder"]
+          div.cat_bar
+            h3.catbg
+              "Inbox"
+          table.table_grid
+            thead
+              tr.title_bar
+                th.centercol.pm_icon.table_icon
+                  a [href="{boardurl}/index.php?action=pm;view;f=inbox;start=#;sort=date"]
+                    span.main_icons.switch [title="Change view"]
+                th.lefttext.pm_time.quarter_table
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=date;desc"]
+                    "Date"
+                    span.main_icons.sort_up
+                th.half_table.lefttext.pm_subject
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=subject"]
+                    "Subject"
+                th.lefttext.pm_from_to
+                  a [href="{boardurl}/index.php?action=pm;f=inbox;start=#;sort=name"]
+                    "From"
+                th.centercol.pm_moderation.table_icon
+                  input [onclick="invertAll(this, this.form);" type="checkbox"]
+            tbody
+              tr.windowbg
+                td.pm_icon.table_icon
+                  script
+                    | currentLabels[#] = { "-#": "Inbox" };
+                  span.im_off.main_icons [title="Read"]
+                td.pm_time
+                  "{date}"
+                td.pm_subject
+                  a [href="#msg#"]
+                    "Snapshot message"
+                td.pm_from_to
+                  a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                    "{member}"
+                td.centercol.pm_moderation.table_icon
+                  input#deletelisting# [name="pms[]" onclick="if (document.getElementById('deletedisplay#')) document.getElementById('deletedisplay#').checked = this.checked;" type="checkbox" value="#"]
+          div.pagesection
+            div.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+            div.floatright
+              select [name="pm_action" onchange="if (this.options[this.selectedIndex].value) this.form.submit();" onfocus="loadLabelChoices();"]
+                option [value]
+                  "Label selected..."
+                option [disabled value]
+                  "---------------"
+                option [disabled value]
+                  "Add label"
+                option [disabled value]
+                  "Remove label"
+                option [value="rem_-#"]
+                  "Inbox"
+              noscript
+                input.button [type="submit" value="Apply"]
+              input.button.you_sure [data-confirm="Are you sure you want to delete all selected personal messages?" name="del_selected" type="submit" value="Remove selected"]
+          div.clear_right
+            br
+          div#msg#.windowbg
+            div.post_wrapper
+              div.poster
+                h4
+                  a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                    "{member}"
+                ul.user_info
+                  li.avatar
+                    a [href="{boardurl}/index.php?action=profile;u=#"]
+                      img.avatar [alt src="{boardurl}/avatars/default.png"]
+                  li.icons
+                    img [alt="*" src="{boardurl}/Themes/default/images/membericons/icon.png"]
+                  li.postgroup
+                    "{text}"
+                  li.postcount
+                    "Posts: #"
+                  li.blurb
+                    "Personal text for {member}"
+                  li.poster_ip
+                    a.help [href="{boardurl}/index.php?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);"]
+                      "Logged"
+                  li.profile
+                    ol.profile_icons
+                      li
+                        a [href="{boardurl}/index.php?action=profile;u=#" title="View profile"]
+                          span.main_icons.members
+                      li
+                        a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                          span.centericon.main_icons.www [title="Example"]
+                      li
+                        a [href="{boardurl}/index.php?action=pm;sa=send;u=#" title="Personal Message (Offline)"]
+                          span.centericon.im_off.main_icons [title="Personal Message (Offline)"]
+              div.postarea
+                div.keyinfo
+                  div#subject_#.subject_title
+                    h5
+                      "Snapshot message"
+                  div.postinfo
+                    span.smalltext
+                      "Sent to"
+                      a [href="{boardurl}/index.php?action=profile;u=#"]
+                        "{member}"
+                      "and"
+                      a [href="{boardurl}/index.php?action=profile;u=#"]
+                        "{member}"
+                      "on {date}"
+                div.post
+                  div#msg_#.inner
+                    "A personal message to two people."
+                div.under_message
+                  div.floatleft.labels
+                    select [name="pm_actions[#]" onchange="if (this.options[this.selectedIndex].value) form.submit();"]
+                      option [value]
+                        "Label message..."
+                      option [disabled value]
+                        "---------------"
+                    noscript
+                      input.button [type="submit" value="Apply"]
+                  ul.quickbuttons.quickbuttons_pm
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;quote;u=all"]
+                        span.main_icons.reply_all_button
+                        "Reply to All"
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;u=#"]
+                        span.main_icons.reply_button
+                        "Reply"
+                    li
+                      a [href="{boardurl}/index.php?action=pm;sa=send;f=inbox;pmsg=#;quote;u=all"]
+                        span.main_icons.quote
+                        "Quote"
+                    li.you_sure
+                      a [data-confirm="'Remove this post?'" href="{boardurl}/index.php?action=pm;sa=pmactions;pm_actions%#b#%#D=delete;f=inbox;start=#;{session_var}={session_id}"]
+                        span.main_icons.remove_button
+                        "Delete"
+                    li.inline_mod_check
+                      input#deletedisplay# [name="pms[]" onclick="document.getElementById('deletelisting#').checked = this.checked;" type="checkbox" value="#"]
+              div.moderatorbar
+                div.signature
+                  "A signature with"
+                  strong
+                    "bold"
+                  "text."
+          div.pagesection
+            div.pagelinks
+              span.pages
+                "Pages"
+              span.current_page
+                "#"
+            div.floatright
+              input.button.you_sure [data-confirm="Are you sure you want to delete all selected personal messages?" name="del_selected" type="submit" value="Remove selected"]
+          br
+          input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_reply.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_reply.txt
new file mode 100644
index 00000000000..1bb82184996
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_reply.txt
@@ -0,0 +1,197 @@
+status 200
+@ title
+title
+  "Send message"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=send" itemprop="item"]
+        span [itemprop="name"]
+          "New Message"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.chosen.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        div#preview_section.hidden
+          div.cat_bar
+            h3.catbg
+              span#preview_subject
+          div.noup.windowbg
+            div#preview_body.post
+              br
+          br.clear
+        form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=send#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+          div.cat_bar
+            h3.catbg
+              span.icon.inbox.main_icons [title="New Message"]
+              "New Message"
+          div.noup.roundframe
+            div#errors.hidden.noticebox
+              dl
+                dt
+                  strong#error_serious
+                    "The message has the following error or errors that must be corrected before continuing:"
+                dd#error_list.error
+            div#draft_section.infobox [style="display: none;"]
+              "The contents have been saved as a draft, and will be accessible from the"
+              a [href="{boardurl}/index.php?action=pm;sa=showpmdrafts"]
+                "Show Drafts area"
+              "of your message center."
+              strong
+                "Please note that all drafts will be automatically deleted after {duration}."
+            dl#post_header
+              dt
+                label#caption_to [for="to_control"]
+                  "To:"
+              dd#pm_to.clear_right
+                input#to_control [name="to" size="#" type="text" value="\"snapshot_other\", \"Snapshot Admin\""]
+                span#bcc_link_container.smalltext [style="display: none;"]
+                div#to_item_list_container
+              dt#bcc_div.clear_left
+                label#caption_bbc [for="bcc_control"]
+                  "Bcc:"
+              dd#bcc_div#
+                input#bcc_control [name="bcc" size="#" type="text" value]
+                div#bcc_item_list_container
+              dt.clear_left
+                label#caption_subject [for="subject"]
+                  "Subject"
+              dd#pm_subject
+                input#subject [maxlength="#" name="subject" size="#" type="text" value="Re: Snapshot message"]
+            textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+              "[quote author={member} link=action=profile;u=# date(s)=#] A personal message to two people. [/quote]"
+            input#message_mode [name="message_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            div.post_verification
+              strong
+                "Verification"
+              div#verification_control_#.verification_control
+                div.smalltext.vv_special
+                  "Please leave this box empty"
+                  snapshot-ignored [selector=".vv_special input"]
+                img#verification_image_pm [alt="Type the letters shown in the picture" src="{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash}"]
+                div.smalltext [style="margin: #px # #px #;"]
+                  a#visual_verification_pm_sound [href="{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash};sound" rel="nofollow"]
+                    "Listen to the letters"
+                  "/"
+                  a#visual_verification_pm_refresh [href="#visual_verification_pm_refresh"]
+                    "Request another image"
+                  br
+                  "Type the letters shown in the picture"
+                  br
+                  input [autocomplete="off" name="pm_vv[code]" required size="#" type="text" value]
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Send message"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            input [name="replied_to" type="hidden" value="#"]
+            input [name="pm_head" type="hidden" value="#"]
+            input [name="f" type="hidden" value="inbox"]
+            input [name="l" type="hidden" value="-#"]
+            br.clear_right
+        script
+          | var txt_preview_title = "Preview post"; var txt_preview_fetch = "Fetching preview..."; function previewPost() { if (window.XMLHttpRequest) { // Opera didn't support setRequestHeader() before #. // @todo Remove support for old browsers if ('opera' in window) { var test = new XMLHttpRequest(); if (!('setRequestHeader' in test)) return submitThisOnce(document.forms.postmodify); } // @todo Currently not sending poll options and option checkboxes. var x = new Array(); var textFields = ['subject', 'message', 'to', 'bcc']; var numericFields = ['recipient_to[]', 'recipient_bcc[]']; var checkboxFields = []; for (var i = #, n = textFields.length; i < n; i++) if (textFields[i] in document.forms.postmodify) { // Handle the WYSIWYG editor. if (textFields[i] == 'message' && 'oEditorHandle_message' in window && oEditorHandle_message.bRichTextEnabled) x[x.length] = 'message_mode=#&' + textFields[i] + '=' + oEditorHandle_message.getText(false).php_to#bit().php_urlencode(); else x[x.length] = textFields[i] + '=' + document.forms.postmodify[textFields[i]].value.php_to#bit().php_urlencode(); } for (var i = #, n = numericFields.length; i < n; i++) if (numericFields[i] in document.forms.postmodify && 'value' in document.forms.postmodify[numericFields[i]]) x[x.length] = numericFields[i] + '=' + parseInt(document.forms.postmodify.elements[numericFields[i]].value); for (var i = #, n = checkboxFields.length; i < n; i++) if (checkboxFields[i] in document.forms.postmodify && document.forms.postmodify.elements[checkboxFields[i]].checked) x[x.length] = checkboxFields[i] + '=' + document.forms.postmodify.elements[checkboxFields[i]].value; sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=pm;sa=send#;preview;xml', x.join('&'), onDocSent); document.getElementById('preview_section').style.display = ''; setInnerHTML(document.getElementById('preview_subject'), txt_preview_title); setInnerHTML(document.getElementById('preview_body'), txt_preview_fetch); return false; } else return submitThisOnce(document.forms.postmodify); } function onDocSent(XMLDoc) { if (!XMLDoc) { document.forms.postmodify.preview.onclick = new function () { return true; } document.forms.postmodify.preview.click(); } // Show the preview section. var preview = XMLDoc.getElementsByTagName('smf')[#].getElementsByTagName('preview')[#]; setInnerHTML(document.getElementById('preview_subject'), preview.getElementsByTagName('subject')[#].firstChild.nodeValue); var bodyText = ''; for (var i = #, n = preview.getElementsByTagName('body')[#].childNodes.length; i < n; i++) bodyText += preview.getElementsByTagName('body')[#].childNodes[i].nodeValue; setInnerHTML(document.getElementById('preview_body'), bodyText); document.getElementById('preview_body').className = 'post'; // Show a list of errors (if any). var errors = XMLDoc.getElementsByTagName('smf')[#].getElementsByTagName('errors')[#]; var errorList = new Array(); for (var i = #, numErrors = errors.getElementsByTagName('error').length; i < numErrors; i++) errorList[errorList.length] = errors.getElementsByTagName('error')[i].firstChild.nodeValue; document.getElementById('errors').style.display = numErrors == # ? 'none' : ''; setInnerHTML(document.getElementById('error_list'), numErrors == # ? '' : errorList.join('<br>')); // Adjust the color of captions if the given data is erroneous. var captions = errors.getElementsByTagName('caption'); for (var i = #, numCaptions = errors.getElementsByTagName('caption').length; i < numCaptions; i++) if (document.getElementById('caption_' + captions[i].getAttribute('name'))) document.getElementById('caption_' + captions[i].getAttribute('name')).className = captions[i].getAttribute('class'); if (errors.getElementsByTagName('post_error').length == #) document.forms.postmodify.message.style.border = '#px solid red'; else if (document.forms.postmodify.message.style.borderColor == 'red' || document.forms.postmodify.message.style.borderColor == 'red red red red') { if ('runtimeStyle' in document.forms.postmodify.message) document.forms.postmodify.message.style.borderColor = ''; else document.forms.postmodify.message.style.border = null; } location.hash = '#' + 'preview_section'; }
+        br
+        div.cat_bar
+          h3.catbg
+            "Subject: Snapshot message"
+        div.windowbg
+          div.clear
+            span.floatright.smalltext
+              "{date}"
+            "From:"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+          hr
+          "A personal message to two people."
+        br.clear
+        script
+          | var oPersonalMessageSend = new smf_PersonalMessageSend({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sTextDeleteItem: 'Delete Item', sToControlId: 'to_control', aToRecipients: [ { sItemId: '#', sItemName: 'snapshot_other' }, { sItemId: '#', sItemName: 'Snapshot Admin' }, ], aBccRecipients: [ ], sBccControlId: 'bcc_control', sBccDivId: 'bcc_div', sBccDivId#: 'bcc_div#', sBccLinkId: 'bcc_link', sBccLinkContainerId: 'bcc_link_container', bBccShowByDefault: false, sShowBccLinkTemplate: '\n\t\t\t\t\t<a hr'+'ef="#" id="bcc_link">Add BCC<' + '/a> <a hr'+'ef="' + smf_scripturl + '?action=helpadmin;help=pm_bcc" onclick="return reqOverlayDiv(this.href);">(?)<' + '/a>' });
+        script
+          | var verificationpmHandle = new smfCaptcha("{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash}", "pm", #);
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_rules.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_rules.txt
new file mode 100644
index 00000000000..4f734748ed2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_rules.txt
@@ -0,0 +1,112 @@
+status 200
+@ title
+title
+  "Manage Rules"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=manrules" itemprop="item"]
+        span [itemprop="name"]
+          "Manage Rules"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.chosen.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        form#manrules [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=manrules" method="post" name="manRules"]
+          div.cat_bar
+            h3.catbg
+              "Manage Rules"
+          div.information
+            "Message rules allow you to automatically sort incoming messages dependent on a set of criteria you define. Below are all the rules you currently have setup. To edit a rule simply click the rule name."
+          table.table_grid
+            thead
+              tr.title_bar
+                th.lefttext
+                  "Rule"
+                th.centertext.table_icon
+            tbody
+              tr.windowbg
+                td [colspan="#"]
+                  "You have not yet setup any message rules."
+          div.righttext
+            a.button [href="{boardurl}/index.php?action=pm;sa=manrules;add;rid=#"]
+              "Add new rule"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_search.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_search.txt
new file mode 100644
index 00000000000..30e72b83a5f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_search.txt
@@ -0,0 +1,173 @@
+status 200
+@ title
+title
+  "Search personal messages"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=search" itemprop="item"]
+        span [itemprop="name"]
+          "Search messages"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.chosen.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        form#searchform [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=search#" method="post" name="searchform"]
+          div.cat_bar
+            h3.catbg
+              "Search personal messages"
+          div#advanced_search.roundframe
+            input [name="advanced" type="hidden" value="#"]
+            dl#search_options.settings
+              dt
+                strong
+                  label [for="searchfor"]
+                    "Search for"
+              dd
+                input [name="search" size="#" type="search"]
+                script
+                  | window.addEventListener("load", initSearch, false);
+              dt
+                label [for="searchtype"]
+                  "Match"
+              dd
+                select [name="searchtype"]
+                  option [selected value="#"]
+                    "Match all words"
+                  option [value="#"]
+                    "Match any words"
+              dt
+                label [for="userspec"]
+                  "By user"
+              dd
+                input [name="userspec" size="#" type="text" value="*"]
+              dt
+                label [for="sort"]
+                  "Search order"
+              dd
+                select [name="sort"]
+                  option [value="relevance|desc"]
+                    "Most relevant first"
+                  option [value="id_pm|desc"]
+                    "Most recent first"
+                  option [value="id_pm|asc"]
+                    "Oldest first"
+              dt.options
+                "Options"
+              dd.options
+                label [for="show_complete"]
+                  input#show_complete [name="show_complete" type="checkbox" value="#"]
+                  "Show full message in results."
+                br
+                label [for="subject_only"]
+                  input#subject_only [name="subject_only" type="checkbox" value="#"]
+                  "Search by subject and author only."
+              dt.between
+                "Message age"
+              dd
+                "between"
+                input [max="#" min="#" name="minage" type="number" value="#"]
+                "and"
+                input [max="#" min="#" name="maxage" type="number" value="#"]
+                "days"
+          fieldset.labels
+            div.alt.roundframe
+              div.title_bar
+                h3.titlebg
+                  a#advanced_panel_link [href="#"]
+                    "Choose labels to search by, or search all"
+                span#advanced_panel_toggle.toggle_up [style="display: none;"]
+              div#advanced_panel_div
+                ul#search_labels
+                  li
+                    label [for="searchlabel_-#"]
+                      input#searchlabel_-# [checked name="searchlabel[-#]" type="checkbox" value="-#"]
+                      "Inbox"
+              br.clear
+              div.padding
+                input#check_all [checked name="all" onclick="invertAll(this, this.form, 'searchlabel');" type="checkbox" value]
+                label [for="check_all"]
+                  em
+                    "Select all"
+                input.button.floatright [name="pm_search" type="submit" value="Search"]
+          script
+            | var oAdvancedPanelToggle = new smc_Toggle({ bToggleEnabled: true, bCurrentlyCollapsed: true, aSwappableContainers: [ 'advanced_panel_div' ], aSwapImages: [ { sId: 'advanced_panel_toggle', altExpanded: 'Hide', altCollapsed: 'Show' } ], aSwapLinks: [ { sId: 'advanced_panel_link', msgExpanded: 'Choose labels to search by, or search all', msgCollapsed: 'Choose labels to search by, or search all' } ] });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_send.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_send.txt
new file mode 100644
index 00000000000..614d87f3dff
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_send.txt
@@ -0,0 +1,182 @@
+status 200
+@ title
+title
+  "Send message"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=send" itemprop="item"]
+        span [itemprop="name"]
+          "New Message"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.chosen.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        div#preview_section.hidden
+          div.cat_bar
+            h3.catbg
+              span#preview_subject
+          div.noup.windowbg
+            div#preview_body.post
+              br
+          br.clear
+        form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=send#" method="post" name="postmodify" onsubmit="submitonce(this);"]
+          div.cat_bar
+            h3.catbg
+              span.icon.inbox.main_icons [title="New Message"]
+              "New Message"
+          div.noup.roundframe
+            div#errors.hidden.noticebox
+              dl
+                dt
+                  strong#error_serious
+                    "The message has the following error or errors that must be corrected before continuing:"
+                dd#error_list.error
+            div#draft_section.infobox [style="display: none;"]
+              "The contents have been saved as a draft, and will be accessible from the"
+              a [href="{boardurl}/index.php?action=pm;sa=showpmdrafts"]
+                "Show Drafts area"
+              "of your message center."
+              strong
+                "Please note that all drafts will be automatically deleted after {duration}."
+            dl#post_header
+              dt
+                label#caption_to [for="to_control"]
+                  "To:"
+              dd#pm_to.clear_right
+                input#to_control [name="to" size="#" type="text" value]
+                span#bcc_link_container.smalltext [style="display: none;"]
+                div#to_item_list_container
+              dt#bcc_div.clear_left
+                label#caption_bbc [for="bcc_control"]
+                  "Bcc:"
+              dd#bcc_div#
+                input#bcc_control [name="bcc" size="#" type="text" value]
+                div#bcc_item_list_container
+              dt.clear_left
+                label#caption_subject [for="subject"]
+                  "Subject"
+              dd#pm_subject
+                input#subject [maxlength="#" name="subject" size="#" type="text" value]
+            textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+            input#message_mode [name="message_mode" type="hidden" value="#"]
+            script
+              | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } } }; sceditor.create(textarea, options, '#', '#'); });
+            div.post_verification
+              strong
+                "Verification"
+              div#verification_control_#.verification_control
+                div.smalltext.vv_special
+                  "Please leave this box empty"
+                  snapshot-ignored [selector=".vv_special input"]
+                img#verification_image_pm [alt="Type the letters shown in the picture" src="{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash}"]
+                div.smalltext [style="margin: #px # #px #;"]
+                  a#visual_verification_pm_sound [href="{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash};sound" rel="nofollow"]
+                    "Listen to the letters"
+                  "/"
+                  a#visual_verification_pm_refresh [href="#visual_verification_pm_refresh"]
+                    "Request another image"
+                  br
+                  "Type the letters shown in the picture"
+                  br
+                  input [autocomplete="off" name="pm_vv[code]" required size="#" type="text" value]
+            span#post_confirm_buttons
+              span.smalltext
+                "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+              span.post_button_container
+                input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+                input#id_draft [name="id_draft" type="hidden" value="#"]
+                input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+                input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Send message"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="seqnum" type="hidden" value="#"]
+            input [name="replied_to" type="hidden" value="#"]
+            input [name="pm_head" type="hidden" value="#"]
+            input [name="f" type="hidden" value="inbox"]
+            input [name="l" type="hidden" value="-#"]
+            br.clear_right
+        script
+          | var txt_preview_title = "Preview post"; var txt_preview_fetch = "Fetching preview..."; function previewPost() { if (window.XMLHttpRequest) { // Opera didn't support setRequestHeader() before #. // @todo Remove support for old browsers if ('opera' in window) { var test = new XMLHttpRequest(); if (!('setRequestHeader' in test)) return submitThisOnce(document.forms.postmodify); } // @todo Currently not sending poll options and option checkboxes. var x = new Array(); var textFields = ['subject', 'message', 'to', 'bcc']; var numericFields = ['recipient_to[]', 'recipient_bcc[]']; var checkboxFields = []; for (var i = #, n = textFields.length; i < n; i++) if (textFields[i] in document.forms.postmodify) { // Handle the WYSIWYG editor. if (textFields[i] == 'message' && 'oEditorHandle_message' in window && oEditorHandle_message.bRichTextEnabled) x[x.length] = 'message_mode=#&' + textFields[i] + '=' + oEditorHandle_message.getText(false).php_to#bit().php_urlencode(); else x[x.length] = textFields[i] + '=' + document.forms.postmodify[textFields[i]].value.php_to#bit().php_urlencode(); } for (var i = #, n = numericFields.length; i < n; i++) if (numericFields[i] in document.forms.postmodify && 'value' in document.forms.postmodify[numericFields[i]]) x[x.length] = numericFields[i] + '=' + parseInt(document.forms.postmodify.elements[numericFields[i]].value); for (var i = #, n = checkboxFields.length; i < n; i++) if (checkboxFields[i] in document.forms.postmodify && document.forms.postmodify.elements[checkboxFields[i]].checked) x[x.length] = checkboxFields[i] + '=' + document.forms.postmodify.elements[checkboxFields[i]].value; sendXMLDocument(smf_prepareScriptUrl(smf_scripturl) + 'action=pm;sa=send#;preview;xml', x.join('&'), onDocSent); document.getElementById('preview_section').style.display = ''; setInnerHTML(document.getElementById('preview_subject'), txt_preview_title); setInnerHTML(document.getElementById('preview_body'), txt_preview_fetch); return false; } else return submitThisOnce(document.forms.postmodify); } function onDocSent(XMLDoc) { if (!XMLDoc) { document.forms.postmodify.preview.onclick = new function () { return true; } document.forms.postmodify.preview.click(); } // Show the preview section. var preview = XMLDoc.getElementsByTagName('smf')[#].getElementsByTagName('preview')[#]; setInnerHTML(document.getElementById('preview_subject'), preview.getElementsByTagName('subject')[#].firstChild.nodeValue); var bodyText = ''; for (var i = #, n = preview.getElementsByTagName('body')[#].childNodes.length; i < n; i++) bodyText += preview.getElementsByTagName('body')[#].childNodes[i].nodeValue; setInnerHTML(document.getElementById('preview_body'), bodyText); document.getElementById('preview_body').className = 'post'; // Show a list of errors (if any). var errors = XMLDoc.getElementsByTagName('smf')[#].getElementsByTagName('errors')[#]; var errorList = new Array(); for (var i = #, numErrors = errors.getElementsByTagName('error').length; i < numErrors; i++) errorList[errorList.length] = errors.getElementsByTagName('error')[i].firstChild.nodeValue; document.getElementById('errors').style.display = numErrors == # ? 'none' : ''; setInnerHTML(document.getElementById('error_list'), numErrors == # ? '' : errorList.join('<br>')); // Adjust the color of captions if the given data is erroneous. var captions = errors.getElementsByTagName('caption'); for (var i = #, numCaptions = errors.getElementsByTagName('caption').length; i < numCaptions; i++) if (document.getElementById('caption_' + captions[i].getAttribute('name'))) document.getElementById('caption_' + captions[i].getAttribute('name')).className = captions[i].getAttribute('class'); if (errors.getElementsByTagName('post_error').length == #) document.forms.postmodify.message.style.border = '#px solid red'; else if (document.forms.postmodify.message.style.borderColor == 'red' || document.forms.postmodify.message.style.borderColor == 'red red red red') { if ('runtimeStyle' in document.forms.postmodify.message) document.forms.postmodify.message.style.borderColor = ''; else document.forms.postmodify.message.style.border = null; } location.hash = '#' + 'preview_section'; }
+        script
+          | var oPersonalMessageSend = new smf_PersonalMessageSend({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sTextDeleteItem: 'Delete Item', sToControlId: 'to_control', aToRecipients: [ ], aBccRecipients: [ ], sBccControlId: 'bcc_control', sBccDivId: 'bcc_div', sBccDivId#: 'bcc_div#', sBccLinkId: 'bcc_link', sBccLinkContainerId: 'bcc_link_container', bBccShowByDefault: false, sShowBccLinkTemplate: '\n\t\t\t\t\t<a hr'+'ef="#" id="bcc_link">Add BCC<' + '/a> <a hr'+'ef="' + smf_scripturl + '?action=helpadmin;help=pm_bcc" onclick="return reqOverlayDiv(this.href);">(?)<' + '/a>' });
+        script
+          | var verificationpmHandle = new smfCaptcha("{boardurl}/index.php?action=verificationcode;vid=pm;rand={hash}", "pm", #);
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/pm_settings.txt b/tests/Integration/Http/Snapshot/snapshots/member/pm_settings.txt
new file mode 100644
index 00000000000..aa252375fa0
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/pm_settings.txt
@@ -0,0 +1,151 @@
+status 200
+@ title
+title
+  "Change settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm" itemprop="item"]
+        span [itemprop="name"]
+          "Personal Messages"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=pm;sa=settings" itemprop="item"]
+        span [itemprop="name"]
+          "Change settings"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;f=inbox"]
+                  "Messages"
+                ul
+                  li
+                    a.inbox.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=inbox"]
+                      span.inbox.main_icons
+                      "Inbox"
+                  li
+                    a.pm_menu_icon.send [href="{boardurl}/index.php?action=pm;sa=send"]
+                      span.main_icons.send
+                      "send"
+                  li
+                    a.pm_menu_icon.sent [href="{boardurl}/index.php?action=pm;f=sent"]
+                      span.main_icons.sent
+                      "sent"
+                  li
+                    a.drafts.pm_menu_icon [href="{boardurl}/index.php?action=pm;f=drafts"]
+                      span.drafts.main_icons
+                      "Drafts"
+              li.subsections
+                a [href="{boardurl}/index.php?action=pm;sa=search"]
+                  "Actions"
+                ul
+                  li
+                    a.pm_menu_icon.search [href="{boardurl}/index.php?action=pm;sa=search"]
+                      span.main_icons.search
+                      "Search"
+                  li
+                    a.pm_menu_icon.prune [href="{boardurl}/index.php?action=pm;sa=prune"]
+                      span.main_icons.prune
+                      "prune"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                  "Preferences"
+                ul
+                  li
+                    a.manlabels.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manlabels"]
+                      span.main_icons.manlabels
+                      "manlabels"
+                  li
+                    a.manrules.pm_menu_icon [href="{boardurl}/index.php?action=pm;sa=manrules"]
+                      span.main_icons.manrules
+                      "manrules"
+                  li
+                    a.chosen.pm_menu_icon.settings [href="{boardurl}/index.php?action=pm;sa=settings"]
+                      span.main_icons.settings
+                      "Settings"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#personal_messages
+        form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=pm;sa=settings;save" enctype="multipart/form-data" method="post" name="creator"]
+          div.cat_bar
+            h3.catbg.profile_hd
+              "Personal Messages"
+          p.information
+            "From this page you can change a variety of personal messaging options, including how messages are displayed and who may send them to you."
+          div.roundframe
+            dl.settings
+              dt
+                label [for="pm_prefs"]
+                  "Display personal messages"
+              dd
+                select#pm_prefs [name="pm_prefs"]
+                  option [selected value="#"]
+                    "All at once"
+                  option [value="#"]
+                    "One at a time"
+                  option [value="#"]
+                    "As a conversation"
+              dt
+                label [for="view_newest_pm_first"]
+                  "Show most recent personal messages at top"
+              dd
+                input [name="default_options[view_newest_pm_first]" type="hidden" value="#"]
+                input#view_newest_pm_first [name="default_options[view_newest_pm_first]" type="checkbox" value="#"]
+            hr
+            dl.settings
+              dt
+                label [for="pm_receive_from"]
+                  "Receive personal messages from:"
+              dd
+                select#pm_receive_from [name="pm_receive_from"]
+                  option [value="#"]
+                    "All members"
+                  option [selected value="#"]
+                    "All members, except those on my ignore list"
+                  option [value="#"]
+                    "Buddies and Administrators only"
+                  option [value="#"]
+                    "Administrators only"
+              dt
+                label [for="popup_messages"]
+                  "Show a popup when I receive new messages."
+              dd
+                input [name="default_options[popup_messages]" type="hidden" value="#"]
+                input#popup_messages [name="default_options[popup_messages]" type="checkbox" value="#"]
+            hr
+            dl.settings
+              dt
+                label [for="pm_remove_inbox_label"]
+                  "Remove the inbox label when applying another label"
+              dd
+                input [name="default_options[pm_remove_inbox_label]" type="hidden" value="#"]
+                input#pm_remove_inbox_label [name="default_options[pm_remove_inbox_label]" type="checkbox" value="#"]
+            input.button.floatright [name="save" type="submit" value="Change settings"]
+            input [name="{session_var}" type="hidden" value="{session_id}"]
+            input [name="u" type="hidden" value="#"]
+            input [name="sa" type="hidden" value="settings"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/post_in_locked_topic.txt b/tests/Integration/Http/Snapshot/snapshots/member/post_in_locked_topic.txt
new file mode 100644
index 00000000000..35fe0e3fba3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/post_in_locked_topic.txt
@@ -0,0 +1,39 @@
+status 403
+@ title
+title
+  "An error has occurred"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#fatal_error
+      div.cat_bar
+        h3.catbg
+          "An error has occurred"
+      div.windowbg
+        div#topic_locked.padding
+          "This topic is locked, you are not allowed to post or modify messages."
+    div.centertext
+      a.button.floatnone [href="javascript:document.location=document.referrer"]
+        "Back"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/post_new_poll.txt b/tests/Integration/Http/Snapshot/snapshots/member/post_new_poll.txt
new file mode 100644
index 00000000000..6ba3d951290
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/post_new_poll.txt
@@ -0,0 +1,254 @@
+status 200
+@ title
+title
+  "New poll"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span [itemprop="name"]
+        em
+          "Start new topic"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    script
+      | var icon_urls = {"xx":"{boardurl}/Themes/default/images/post/xx.png","thumbup":"{boardurl}/Themes/default/images/post/thumbup.png","thumbdown":"{boardurl}/Themes/default/images/post/thumbdown.png","exclamation":"{boardurl}/Themes/default/images/post/exclamation.png","question":"{boardurl}/Themes/default/images/post/question.png","lamp":"{boardurl}/Themes/default/images/post/lamp.png","smiley":"{boardurl}/Themes/default/images/post/smiley.png","angry":"{boardurl}/Themes/default/images/post/angry.png","cheesy":"{boardurl}/Themes/default/images/post/cheesy.png","grin":"{boardurl}/Themes/default/images/post/grin.png","sad":"{boardurl}/Themes/default/images/post/sad.png","wink":"{boardurl}/Themes/default/images/post/wink.png","poll":"{boardurl}/Themes/default/images/post/poll.png"};
+    form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=post#;start=#;poll;board=#" enctype="multipart/form-data" method="post" name="postmodify" onsubmit="submitonce(this);"]
+      div#preview_section [style="display: none;"]
+        div.cat_bar
+          h3.catbg
+            span#preview_subject
+        div#preview_body.windowbg
+          br
+      br
+      div.cat_bar
+        h3.catbg
+          "New poll"
+      div#post_area
+        div.noup.roundframe
+          input [name="topic" type="hidden" value="#"]
+          div#errors.noticebox [style="display: none"]
+            dl
+              dt
+                strong#error_serious
+                  "The message has the following error or errors that must be corrected before continuing:"
+              dd#error_list.error
+          div#draft_section.infobox [style="display: none;"]
+            "The contents have been saved as a draft, and will be accessible from the"
+            a [href="{boardurl}/index.php?action=profile;u=#;area=showdrafts"]
+              "Show Drafts area"
+            "of your profile."
+            strong
+              "Please note that all drafts will be automatically deleted after {duration}."
+          dl#post_header
+            dt.clear.pf_subject
+              label#caption_subject [for="subject"]
+                "Subject"
+            dd.pf_subject
+              input#subject [maxlength="#" name="subject" required size="#" type="text" value]
+            dt.clear.pf_icon
+              label#caption_icon [for="icon"]
+                "Message icon"
+            dd.pf_icon
+              select#icon [name="icon" onchange="showimage();"]
+                option [value="xx"]
+                  "Standard"
+                option [value="thumbup"]
+                  "Thumb Up"
+                option [value="thumbdown"]
+                  "Thumb Down"
+                option [value="exclamation"]
+                  "Exclamation point"
+                option [value="question"]
+                  "Question mark"
+                option [value="lamp"]
+                  "Lamp"
+                option [value="smiley"]
+                  "Smiley"
+                option [value="angry"]
+                  "Angry"
+                option [value="cheesy"]
+                  "Cheesy"
+                option [value="grin"]
+                  "Grin"
+                option [value="sad"]
+                  "Sad"
+                option [value="wink"]
+                  "Wink"
+                option [selected value="poll"]
+                  "Poll"
+              img#icons [src="{boardurl}/Themes/default/images/post/poll.png"]
+          hr.clear
+          div#edit_poll
+            fieldset#poll_main
+              legend
+                span
+                  "Question"
+              dl#poll_choices.poll_options.settings [data-more-txt="Add Option" data-option-txt="Option #"]
+                dt
+                  "Question"
+                dd
+                  input [name="question" size="#" type="text" value]
+                dt
+                  label [for="options-#"]
+                    "Option #"
+                dd
+                  input#options-# [maxlength="#" name="options[#]" size="#" type="text" value]
+            fieldset#poll_options
+              legend
+                "Poll Options"
+              dl.poll_options.settings
+                dt
+                  label [for="poll_max_votes"]
+                    "Maximum votes per user"
+                dd
+                  input#poll_max_votes [min="#" name="poll_max_votes" type="number" value="#"]
+                dt
+                  label [for="poll_expire"]
+                    "Number of days to run the poll"
+                  br
+                  em.smalltext
+                    "(# for(s) no limit)"
+                dd
+                  input#poll_expire [max="#" min="#" name="poll_expire" type="number" value="#"]
+                dt
+                  label [for="poll_change_vote"]
+                    "Allow users to change vote"
+                dd
+                  input#poll_change_vote [name="poll_change_vote" type="checkbox"]
+                dt
+                  "Result visibility"
+                dd
+                  input#poll_results_anyone [checked name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_anyone"]
+                    "Show the poll’s results to anyone."
+                  br
+                  input#poll_results_voted [name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_voted"]
+                    "Only show the results after someone has voted."
+                  br
+                  input#poll_results_expire [disabled name="poll_hide" type="radio" value="#"]
+                  label [for="poll_results_expire"]
+                    "Only show the results after the poll has expired."
+          textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+          input#message_mode [name="message_mode" type="hidden" value="#"]
+          script
+            | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } }, "autofocus": false }; sceditor.create(textarea, options, '#', '#'); });
+          div#post_attachments_area.noup.roundframe
+            div#postAttachment
+              div.padding
+                div
+                  strong
+                    "Attachments"
+                  ":"
+                  input [multiple="multiple" name="attachment[]" type="file"]
+                  input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+                div.smalltext
+                  "Restrictions: {#} per post ("
+                  span.attach_remaining
+                    "#"
+                  "remaining), maximum total size , maximum individual size"
+                div.smalltext
+                  input [name="attach_del[]" type="hidden" value="#"]
+                  "Uncheck the attachments you no longer want attached"
+              div.attachments
+            div#attachment_upload
+              div#drop_zone_ui.centertext
+                div.attach_drop_zone_label
+                  "Click or drag files here to attach them."
+              div#attachment_previews.files
+                div#au-template
+                  div.attachment_preview_wrapper
+                    div.attach-ui.roundframe
+                      a.cancel.delete.floatright.main_icons [data-dz-remove]
+                      div.attached_BBC_width_height
+                        div.attached_BBC_width
+                          label
+                            span
+                              "Insert width (px):"
+                            input [min="#" name="attached_BBC_width" placeholder="auto" type="number" value]
+                        div.attached_BBC_height
+                          label
+                            span
+                              "Insert height (px):"
+                            input [min="#" name="attached_BBC_height" placeholder="auto" type="number" value]
+                    div.attach-preview
+                      img [data-dz-thumbnail]
+                    div.attachment_info
+                      span.name [data-dz-name]
+                      span.error [data-dz-errormessage]
+                      span.size [data-dz-size]
+                      span.message [data-dz-message]
+                      div.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+                        div.bar
+                div.attachment_spacer
+                  div.fallback
+                    input#attachment#.fallback [multiple="multiple" name="attachment[]" type="file"]
+                    "("
+                    a [href="javascript:void(#);" onclick="cleanFileInput('attachment#');"]
+                      "Clear attachments"
+                    ")"
+                    input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+            div#max_files_progress.max_files_progress.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+              div.bar
+              div#max_files_progress_text
+          details#post_options_toggle
+            summary
+              "Other options"
+            ul#post_options.smalltext
+              li
+                input [name="notify" type="hidden" value="#"]
+                label [for="check_notify"]
+                  input#check_notify [name="notify" type="checkbox" value="#"]
+                  "Notify me of replies"
+              li
+                input [name="already_locked" type="hidden" value]
+                input [name="lock" type="hidden" value="#"]
+                label [for="check_lock"]
+                  input#check_lock [name="lock" type="checkbox" value="#"]
+                  "Lock this topic"
+              li
+                label [for="check_back"]
+                  input#check_back [name="goback" type="checkbox" value="#"]
+                  "Return to this topic"
+              li
+                label [for="check_smileys"]
+                  input#check_smileys [name="ns" type="checkbox" value="NS"]
+                  "Do not use smileys"
+          span#post_confirm_buttons
+            span.smalltext
+              "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+            span.post_button_container
+              input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+              input#id_draft [name="id_draft" type="hidden" value="#"]
+              input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+              input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+      br.clear
+      input#additional_options [name="additional_options" type="hidden" value="#"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="seqnum" type="hidden" value="#"]
+    script
+      | var oPreviewPost = new smc_preview_post({ sPreviewSectionContainerID: "preview_section", sPreviewSubjectContainerID: "preview_subject", sPreviewBodyContainerID: "preview_body", sErrorsContainerID: "errors", sErrorsSeriousContainerID: "error_serious", sErrorsListContainerID: "error_list", sCaptionContainerID: "caption_%ID%", sNewImageContainerID: "image_new_%ID%", sPostBoxContainerID: 'message', bMakePoll: true, sTxtPreviewTitle: 'Preview post', sTxtPreviewFetch: 'Fetching preview...', sSessionVar: '{session_var}', newPostsTemplate:'\n\t\t<span id="new_replies"><' + '/span>\n\t\t<div class="windowbg">\n\t\t\t<div id="msg%PostID%">\n\t\t\t<h# clas(s)="floatleft">\n\t\t\t\tPosted by %PosterName%, %PostTime%&nbsp;&##; <span class="new_posts" id="image_new_%PostID%">New<' + '/span>\n\t\t\t<' + '/h#>\n\t\t\t<br class="clear">\n\t\t\t<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">You are ignoring this user.<a hr'+'ef="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">Show me the post.<' + '/a><' + '/div>\n\t\t\t<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%<' + '/div>\n\t\t\t<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">\n\t\t\t\t<li class="post_modify">\n\t\t\t\t\t<a hr'+'ef="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"><' + '/span>Quote<' + '/a>\n\t\t\t\t<' + '/li>\n\t\t\t<' + '/ul>\n\t\t<' + '/div>', iCurrentBoard: # }); document.getElementById('post_options_toggle').addEventListener('toggle', function () { document.getElementById('additional_options').value = this.open ? '#' : '#'; }); var oEditorID = "message";
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/post_new_topic.txt b/tests/Integration/Http/Snapshot/snapshots/member/post_new_topic.txt
new file mode 100644
index 00000000000..eb2d597b428
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/post_new_topic.txt
@@ -0,0 +1,202 @@
+status 200
+@ title
+title
+  "Start new topic"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span [itemprop="name"]
+        em
+          "Start new topic"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    script
+      | var icon_urls = {"xx":"{boardurl}/Themes/default/images/post/xx.png","thumbup":"{boardurl}/Themes/default/images/post/thumbup.png","thumbdown":"{boardurl}/Themes/default/images/post/thumbdown.png","exclamation":"{boardurl}/Themes/default/images/post/exclamation.png","question":"{boardurl}/Themes/default/images/post/question.png","lamp":"{boardurl}/Themes/default/images/post/lamp.png","smiley":"{boardurl}/Themes/default/images/post/smiley.png","angry":"{boardurl}/Themes/default/images/post/angry.png","cheesy":"{boardurl}/Themes/default/images/post/cheesy.png","grin":"{boardurl}/Themes/default/images/post/grin.png","sad":"{boardurl}/Themes/default/images/post/sad.png","wink":"{boardurl}/Themes/default/images/post/wink.png","poll":"{boardurl}/Themes/default/images/post/poll.png"};
+    form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=post#;start=#;board=#" enctype="multipart/form-data" method="post" name="postmodify" onsubmit="submitonce(this);"]
+      div#preview_section [style="display: none;"]
+        div.cat_bar
+          h3.catbg
+            span#preview_subject
+        div#preview_body.windowbg
+          br
+      br
+      div.cat_bar
+        h3.catbg
+          "Start new topic"
+      div#post_area
+        div.noup.roundframe
+          input [name="topic" type="hidden" value="#"]
+          div#errors.noticebox [style="display: none"]
+            dl
+              dt
+                strong#error_serious
+                  "The message has the following error or errors that must be corrected before continuing:"
+              dd#error_list.error
+          div#draft_section.infobox [style="display: none;"]
+            "The contents have been saved as a draft, and will be accessible from the"
+            a [href="{boardurl}/index.php?action=profile;u=#;area=showdrafts"]
+              "Show Drafts area"
+            "of your profile."
+            strong
+              "Please note that all drafts will be automatically deleted after {duration}."
+          dl#post_header
+            dt.clear.pf_subject
+              label#caption_subject [for="subject"]
+                "Subject"
+            dd.pf_subject
+              input#subject [maxlength="#" name="subject" required size="#" type="text" value]
+            dt.clear.pf_icon
+              label#caption_icon [for="icon"]
+                "Message icon"
+            dd.pf_icon
+              select#icon [name="icon" onchange="showimage();"]
+                option [selected value="xx"]
+                  "Standard"
+                option [value="thumbup"]
+                  "Thumb Up"
+                option [value="thumbdown"]
+                  "Thumb Down"
+                option [value="exclamation"]
+                  "Exclamation point"
+                option [value="question"]
+                  "Question mark"
+                option [value="lamp"]
+                  "Lamp"
+                option [value="smiley"]
+                  "Smiley"
+                option [value="angry"]
+                  "Angry"
+                option [value="cheesy"]
+                  "Cheesy"
+                option [value="grin"]
+                  "Grin"
+                option [value="sad"]
+                  "Sad"
+                option [value="wink"]
+                  "Wink"
+                option [value="poll"]
+                  "Poll"
+              img#icons [src="{boardurl}/Themes/default/images/post/xx.png"]
+          textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+          input#message_mode [name="message_mode" type="hidden" value="#"]
+          script
+            | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } }, "autofocus": false }; sceditor.create(textarea, options, '#', '#'); });
+          div#post_attachments_area.noup.roundframe
+            div#postAttachment
+              div.padding
+                div
+                  strong
+                    "Attachments"
+                  ":"
+                  input [multiple="multiple" name="attachment[]" type="file"]
+                  input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+                div.smalltext
+                  "Restrictions: {#} per post ("
+                  span.attach_remaining
+                    "#"
+                  "remaining), maximum total size , maximum individual size"
+                div.smalltext
+                  input [name="attach_del[]" type="hidden" value="#"]
+                  "Uncheck the attachments you no longer want attached"
+              div.attachments
+            div#attachment_upload
+              div#drop_zone_ui.centertext
+                div.attach_drop_zone_label
+                  "Click or drag files here to attach them."
+              div#attachment_previews.files
+                div#au-template
+                  div.attachment_preview_wrapper
+                    div.attach-ui.roundframe
+                      a.cancel.delete.floatright.main_icons [data-dz-remove]
+                      div.attached_BBC_width_height
+                        div.attached_BBC_width
+                          label
+                            span
+                              "Insert width (px):"
+                            input [min="#" name="attached_BBC_width" placeholder="auto" type="number" value]
+                        div.attached_BBC_height
+                          label
+                            span
+                              "Insert height (px):"
+                            input [min="#" name="attached_BBC_height" placeholder="auto" type="number" value]
+                    div.attach-preview
+                      img [data-dz-thumbnail]
+                    div.attachment_info
+                      span.name [data-dz-name]
+                      span.error [data-dz-errormessage]
+                      span.size [data-dz-size]
+                      span.message [data-dz-message]
+                      div.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+                        div.bar
+                div.attachment_spacer
+                  div.fallback
+                    input#attachment#.fallback [multiple="multiple" name="attachment[]" type="file"]
+                    "("
+                    a [href="javascript:void(#);" onclick="cleanFileInput('attachment#');"]
+                      "Clear attachments"
+                    ")"
+                    input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+            div#max_files_progress.max_files_progress.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+              div.bar
+              div#max_files_progress_text
+          details#post_options_toggle
+            summary
+              "Other options"
+            ul#post_options.smalltext
+              li
+                input [name="notify" type="hidden" value="#"]
+                label [for="check_notify"]
+                  input#check_notify [name="notify" type="checkbox" value="#"]
+                  "Notify me of replies"
+              li
+                input [name="already_locked" type="hidden" value]
+                input [name="lock" type="hidden" value="#"]
+                label [for="check_lock"]
+                  input#check_lock [name="lock" type="checkbox" value="#"]
+                  "Lock this topic"
+              li
+                label [for="check_back"]
+                  input#check_back [name="goback" type="checkbox" value="#"]
+                  "Return to this topic"
+              li
+                label [for="check_smileys"]
+                  input#check_smileys [name="ns" type="checkbox" value="NS"]
+                  "Do not use smileys"
+          span#post_confirm_buttons
+            span.smalltext
+              "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+            span.post_button_container
+              input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+              input#id_draft [name="id_draft" type="hidden" value="#"]
+              input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+              input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+      br.clear
+      input#additional_options [name="additional_options" type="hidden" value="#"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="seqnum" type="hidden" value="#"]
+    script
+      | var oPreviewPost = new smc_preview_post({ sPreviewSectionContainerID: "preview_section", sPreviewSubjectContainerID: "preview_subject", sPreviewBodyContainerID: "preview_body", sErrorsContainerID: "errors", sErrorsSeriousContainerID: "error_serious", sErrorsListContainerID: "error_list", sCaptionContainerID: "caption_%ID%", sNewImageContainerID: "image_new_%ID%", sPostBoxContainerID: 'message', bMakePoll: false, sTxtPreviewTitle: 'Preview post', sTxtPreviewFetch: 'Fetching preview...', sSessionVar: '{session_var}', newPostsTemplate:'\n\t\t<span id="new_replies"><' + '/span>\n\t\t<div class="windowbg">\n\t\t\t<div id="msg%PostID%">\n\t\t\t<h# clas(s)="floatleft">\n\t\t\t\tPosted by %PosterName%, %PostTime%&nbsp;&##; <span class="new_posts" id="image_new_%PostID%">New<' + '/span>\n\t\t\t<' + '/h#>\n\t\t\t<br class="clear">\n\t\t\t<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">You are ignoring this user.<a hr'+'ef="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">Show me the post.<' + '/a><' + '/div>\n\t\t\t<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%<' + '/div>\n\t\t\t<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">\n\t\t\t\t<li class="post_modify">\n\t\t\t\t\t<a hr'+'ef="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"><' + '/span>Quote<' + '/a>\n\t\t\t\t<' + '/li>\n\t\t\t<' + '/ul>\n\t\t<' + '/div>', iCurrentBoard: # }); document.getElementById('post_options_toggle').addEventListener('toggle', function () { document.getElementById('additional_options').value = this.open ? '#' : '#'; }); var oEditorID = "message";
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/post_reply.txt b/tests/Integration/Http/Snapshot/snapshots/member/post_reply.txt
new file mode 100644
index 00000000000..cf729f2c403
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/post_reply.txt
@@ -0,0 +1,344 @@
+status 200
+@ title
+title
+  "Post reply"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      span
+        strong.nav
+          "Post reply ("
+      a [href="{boardurl}/index.php?topic=#" itemprop="item"]
+        span [itemprop="name"]
+          "{subject}"
+      meta [content="#" itemprop="position"]
+      span
+        strong.nav
+          ")"
+@ #content_section
+div#content_section
+  main#main_content_section
+    script
+      | var icon_urls = {"xx":"{boardurl}/Themes/default/images/post/xx.png","thumbup":"{boardurl}/Themes/default/images/post/thumbup.png","thumbdown":"{boardurl}/Themes/default/images/post/thumbdown.png","exclamation":"{boardurl}/Themes/default/images/post/exclamation.png","question":"{boardurl}/Themes/default/images/post/question.png","lamp":"{boardurl}/Themes/default/images/post/lamp.png","smiley":"{boardurl}/Themes/default/images/post/smiley.png","angry":"{boardurl}/Themes/default/images/post/angry.png","cheesy":"{boardurl}/Themes/default/images/post/cheesy.png","grin":"{boardurl}/Themes/default/images/post/grin.png","sad":"{boardurl}/Themes/default/images/post/sad.png","wink":"{boardurl}/Themes/default/images/post/wink.png","poll":"{boardurl}/Themes/default/images/post/poll.png"};
+    form#postmodify.flow_hidden [accept-charset="UTF-#" action="{boardurl}/index.php?action=post#;start=#;board=#" enctype="multipart/form-data" method="post" name="postmodify" onsubmit="submitonce(this);"]
+      div#preview_section [style="display: none;"]
+        div.cat_bar
+          h3.catbg
+            span#preview_subject
+        div#preview_body.windowbg
+          br
+      br
+      div.cat_bar
+        h3.catbg
+          "Post reply"
+      div#post_area
+        div.noup.roundframe
+          input [name="topic" type="hidden" value="#"]
+          div#errors.noticebox
+            dl
+              dt
+                strong#error_serious
+                  "The message has the following error or errors that must be corrected before continuing:"
+              dd#error_list.error
+                "Warning: this topic has not been posted in for at least {duration}."
+                br
+                "Unless you are sure you want to reply, please consider starting a new topic."
+          div#draft_section.infobox [style="display: none;"]
+            "The contents have been saved as a draft, and will be accessible from the"
+            a [href="{boardurl}/index.php?action=profile;u=#;area=showdrafts"]
+              "Show Drafts area"
+            "of your profile."
+            strong
+              "Please note that all drafts will be automatically deleted after {duration}."
+          dl#post_header
+            dt.clear.pf_subject
+              label#caption_subject [for="subject"]
+                "Subject"
+            dd.pf_subject
+              input#subject [maxlength="#" name="subject" required size="#" type="text" value="{subject}"]
+            dt.clear.pf_icon
+              label#caption_icon [for="icon"]
+                "Message icon"
+            dd.pf_icon
+              select#icon [name="icon" onchange="showimage();"]
+                option [selected value="xx"]
+                  "Standard"
+                option [value="thumbup"]
+                  "Thumb Up"
+                option [value="thumbdown"]
+                  "Thumb Down"
+                option [value="exclamation"]
+                  "Exclamation point"
+                option [value="question"]
+                  "Question mark"
+                option [value="lamp"]
+                  "Lamp"
+                option [value="smiley"]
+                  "Smiley"
+                option [value="angry"]
+                  "Angry"
+                option [value="cheesy"]
+                  "Cheesy"
+                option [value="grin"]
+                  "Grin"
+                option [value="sad"]
+                  "Sad"
+                option [value="wink"]
+                  "Wink"
+                option [value="poll"]
+                  "Poll"
+              img#icons [src="{boardurl}/Themes/default/images/post/xx.png"]
+          textarea#message.editor [cols="#" name="message" style="width: #%; height: #px;"]
+          input#message_mode [name="message_mode" type="hidden" value="#"]
+          script
+            | document.addEventListener("DOMContentLoaded", function () { var textarea = document.getElementById("message"), options = { "width": "#%", "height": "#px", "style": "{boardurl}/Themes/default/css/jquery.sceditor.default.css?smf#alpha#dev_#", "emoticonsCompat": true, "emoticons": { "dropdown": { ":)": { "newRow": false, "url": "smiley.png", "tooltip": "Smiley" }, ";)": { "newRow": false, "url": "wink.png", "tooltip": "Wink" }, ":D": { "newRow": false, "url": "cheesy.png", "tooltip": "Cheesy" }, ";D": { "newRow": false, "url": "grin.png", "tooltip": "Grin" }, ">:(": { "newRow": false, "url": "angry.png", "tooltip": "Angry" }, ":(": { "newRow": false, "url": "sad.png", "tooltip": "Sad" }, ":o": { "newRow": false, "url": "shocked.png", "tooltip": "Shocked" }, "#)": { "newRow": false, "url": "cool.png", "tooltip": "Cool" }, "???": { "newRow": false, "url": "huh.png", "tooltip": "Huh?" }, "::)": { "newRow": false, "url": "rolleyes.png", "tooltip": "Roll Eyes" }, ":P": { "newRow": false, "url": "tongue.png", "tooltip": "Tongue" }, ":-[": { "newRow": false, "url": "embarrassed.png", "tooltip": "Embarrassed" }, ":-X": { "newRow": false, "url": "lipsrsealed.png", "tooltip": "Lips Sealed" }, ":-\\": { "newRow": false, "url": "undecided.png", "tooltip": "Undecided" }, ":-*": { "newRow": false, "url": "kiss.png", "tooltip": "Kiss" }, ":'(": { "newRow": false, "url": "cry.png", "tooltip": "Cry" } } }, "emoticonsEnabled": true, "emoticonsRoot": "{boardurl}/Smileys/fugue/", "colors": [ [ "black", "Black" ], [ "red", "Red" ], [ "yellow", "Yellow" ], [ "pink", "Pink" ], [ "green", "Green" ], [ "orange", "Orange" ], [ "purple", "Purple" ], [ "blue", "Blue" ], [ "beige", "Beige" ], [ "brown", "Brown" ], [ "teal", "Teal" ], [ "navy", "Navy" ], [ "maroon", "Maroon" ], [ "limegreen", "Lime Green" ], [ "white", "White" ] ], "fonts": "Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana", "icons": "monocons", "format": "bbcode", "plugins": "smf,autolinker", "toolbar": "bold,italic,underline,strike,superscript,subscript,tt,spoiler|pre,left,center,right,justify|font,size,color|removeformat||floatleft,floatright|youtube,image,email,link,unlink|table,code,quote,details|heading,bulletlist,orderedlist,horizontalrule|maximize,source", "customTextualCommands": { "tt": { "image": "tt", "code": "tt", "description": "Inline code" }, "spoiler": { "image": "hidden", "code": "spoiler", "description": "Spoiler" }, "details": { "image": "details", "code": "details", "description": "Details" }, "heading": { "image": "heading", "code": "heading", "description": "Heading" } }, "startInSourceMode": true, "bbcodeTrim": false, "resizeWidth": false, "resizeMaxHeight": -#, "locale": "en", "rtl": false, "commandsWithDropdown": { "color": true, "heading": true, "font": true, "size": true }, "textOnlyCommands": [], "commandsWithText": [], "parserOptions": { "txtVars": { "code": "Code" } }, "autofocus": true }; sceditor.create(textarea, options, '#', '#'); });
+          div#post_attachments_area.noup.roundframe
+            div#postAttachment
+              div.padding
+                div
+                  strong
+                    "Attachments"
+                  ":"
+                  input [multiple="multiple" name="attachment[]" type="file"]
+                  input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+                div.smalltext
+                  "Restrictions: {#} per post ("
+                  span.attach_remaining
+                    "#"
+                  "remaining), maximum total size , maximum individual size"
+                div.smalltext
+                  input [name="attach_del[]" type="hidden" value="#"]
+                  "Uncheck the attachments you no longer want attached"
+              div.attachments
+            div#attachment_upload
+              div#drop_zone_ui.centertext
+                div.attach_drop_zone_label
+                  "Click or drag files here to attach them."
+              div#attachment_previews.files
+                div#au-template
+                  div.attachment_preview_wrapper
+                    div.attach-ui.roundframe
+                      a.cancel.delete.floatright.main_icons [data-dz-remove]
+                      div.attached_BBC_width_height
+                        div.attached_BBC_width
+                          label
+                            span
+                              "Insert width (px):"
+                            input [min="#" name="attached_BBC_width" placeholder="auto" type="number" value]
+                        div.attached_BBC_height
+                          label
+                            span
+                              "Insert height (px):"
+                            input [min="#" name="attached_BBC_height" placeholder="auto" type="number" value]
+                    div.attach-preview
+                      img [data-dz-thumbnail]
+                    div.attachment_info
+                      span.name [data-dz-name]
+                      span.error [data-dz-errormessage]
+                      span.size [data-dz-size]
+                      span.message [data-dz-message]
+                      div.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+                        div.bar
+                div.attachment_spacer
+                  div.fallback
+                    input#attachment#.fallback [multiple="multiple" name="attachment[]" type="file"]
+                    "("
+                    a [href="javascript:void(#);" onclick="cleanFileInput('attachment#');"]
+                      "Clear attachments"
+                    ")"
+                    input [name="MAX_FILE_SIZE" type="hidden" value="#"]
+            div#max_files_progress.max_files_progress.progress_bar [aria-valuemax="#" aria-valuemin="#" aria-valuenow="#" role="progressBar"]
+              div.bar
+              div#max_files_progress_text
+          details#post_options_toggle
+            summary
+              "Other options"
+            ul#post_options.smalltext
+              li
+                input [name="notify" type="hidden" value="#"]
+                label [for="check_notify"]
+                  input#check_notify [checked name="notify" type="checkbox" value="#"]
+                  "Notify me of replies"
+              li
+                input [name="already_locked" type="hidden" value]
+                input [name="lock" type="hidden" value="#"]
+                label [for="check_lock"]
+                  input#check_lock [name="lock" type="checkbox" value="#"]
+                  "Lock this topic"
+              li
+                label [for="check_back"]
+                  input#check_back [name="goback" type="checkbox" value="#"]
+                  "Return to this topic"
+              li
+                label [for="check_smileys"]
+                  input#check_smileys [name="ns" type="checkbox" value="NS"]
+                  "Do not use smileys"
+          span#post_confirm_buttons
+            span.smalltext
+              "Shortcuts: ALT+S post, ALT+P preview, ALT+D save draft"
+            span.post_button_container
+              input.button [accesskey="d" name="save_draft" onclick="return confirm('This will save the text of your post, but it will not save attachments, poll or event information.');" type="submit" value="Save draft"]
+              input#id_draft [name="id_draft" type="hidden" value="#"]
+              input.button [accesskey="p" name="preview" type="submit" value="Preview"]
+              input.button [accesskey="s" name="post" onclick="return submitThisOnce(this);" type="submit" value="Post"]
+      br.clear
+      input [name="last_msg" type="hidden" value="#"]
+      input#additional_options [name="additional_options" type="hidden" value="#"]
+      input [name="{session_var}" type="hidden" value="{session_id}"]
+      input [name="seqnum" type="hidden" value="#"]
+    script
+      | var oPreviewPost = new smc_preview_post({ sPreviewSectionContainerID: "preview_section", sPreviewSubjectContainerID: "preview_subject", sPreviewBodyContainerID: "preview_body", sErrorsContainerID: "errors", sErrorsSeriousContainerID: "error_serious", sErrorsListContainerID: "error_list", sCaptionContainerID: "caption_%ID%", sNewImageContainerID: "image_new_%ID%", sPostBoxContainerID: 'message', bMakePoll: false, sTxtPreviewTitle: 'Preview post', sTxtPreviewFetch: 'Fetching preview...', sSessionVar: '{session_var}', newPostsTemplate:'\n\t\t<span id="new_replies"><' + '/span>\n\t\t<div class="windowbg">\n\t\t\t<div id="msg%PostID%">\n\t\t\t<h# clas(s)="floatleft">\n\t\t\t\tPosted by %PosterName%, %PostTime%&nbsp;&##; <span class="new_posts" id="image_new_%PostID%">New<' + '/span>\n\t\t\t<' + '/h#>\n\t\t\t<br class="clear">\n\t\t\t<div id="msg_%PostID%_ignored_prompt" class="smalltext" style="display: none;">You are ignoring this user.<a hr'+'ef="#" id="msg_%PostID%_ignored_link" style="%IgnoredStyle%">Show me the post.<' + '/a><' + '/div>\n\t\t\t<div class="list_posts smalltext" id="msg_%PostID%_body">%PostBody%<' + '/div>\n\t\t\t<ul class="quickbuttons sf-js-enabled sf-arrows" id="msg_%PostID%_quote" style="touch-action: pan-y;">\n\t\t\t\t<li class="post_modify">\n\t\t\t\t\t<a hr'+'ef="#postmodify" onclick="return insertQuoteFast(%PostID%);" class="quote_button"><span class="main_icons quote"><' + '/span>Quote<' + '/a>\n\t\t\t\t<' + '/li>\n\t\t\t<' + '/ul>\n\t\t<' + '/div>', iCurrentBoard: # }); document.getElementById('post_options_toggle').addEventListener('toggle', function () { document.getElementById('additional_options').value = this.open ? '#' : '#'; }); var oEditorID = "message";
+    div#recent.flow_hidden.main_section
+      div.cat_bar.cat_bar_round
+        h3.catbg
+          "Topic summary"
+      span#new_replies
+      div.windowbg
+        div#msg#
+          div
+            h5.floatleft
+              "Posted by Snapshot Other, {date}"
+          div#msg_#_body.list_posts.smalltext [data-msgid="#"]
+            "A reply from another member, with a smiley"
+            img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+          ul#msg_#_quote.quickbuttons
+            li#quoteSelected_# [data-msgid="#" style="display:none;"]
+              a [href="javascript:void(#)"]
+                span.main_icons.quote_selected
+                "Quote selected text"
+            li.post_modify
+              a [href="#postmodify" onclick="return insertQuoteFast(#);"]
+                span.main_icons.quote
+                "Quote"
+      div.windowbg
+        div#msg#
+          div
+            h5.floatleft
+              "Posted by Snapshot Admin, {date}"
+          div#msg_#_body.list_posts.smalltext [data-msgid="#"]
+            blockquote.bbc_standard_quote
+              cite
+                "Quote from: Snapshot Member"
+              "The quoted text."
+            "A reply from an administrator."
+          ul#msg_#_quote.quickbuttons
+            li#quoteSelected_# [data-msgid="#" style="display:none;"]
+              a [href="javascript:void(#)"]
+                span.main_icons.quote_selected
+                "Quote selected text"
+            li.post_modify
+              a [href="#postmodify" onclick="return insertQuoteFast(#);"]
+                span.main_icons.quote
+                "Quote"
+      div.windowbg
+        div#msg#
+          div
+            h5.floatleft
+              "Posted by Snapshot Guest, {date}"
+          div#msg_#_body.list_posts.smalltext [data-msgid="#"]
+            "A reply from a guest."
+          ul#msg_#_quote.quickbuttons
+            li#quoteSelected_# [data-msgid="#" style="display:none;"]
+              a [href="javascript:void(#)"]
+                span.main_icons.quote_selected
+                "Quote selected text"
+            li.post_modify
+              a [href="#postmodify" onclick="return insertQuoteFast(#);"]
+                span.main_icons.quote
+                "Quote"
+      div.windowbg
+        div#msg#
+          div
+            h5.floatleft
+              "Posted by Snapshot Member, {date}"
+          div#msg_#_body.list_posts.smalltext [data-msgid="#"]
+            "The first post, with"
+            strong
+              "bold"
+            ","
+            em
+              "italic"
+            ","
+            u
+              "underlined"
+            "and"
+            s
+              "struck"
+            "text."
+            br
+            a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+              "A link"
+            "and"
+            a.bbc_email [href="mailto:{email}"]
+              "{email}"
+            "."
+            br
+            blockquote.bbc_standard_quote
+              cite
+                "Quote"
+              "An unattributed quote."
+            div.codeheader
+              "Code"
+            pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+              code
+                "echo \"code\";"
+            ul.bbc_list
+              li
+                "One"
+              li
+                "Two"
+            span.bbc_color [style="color: red;"]
+              "Red"
+            span.bbc_size [style="font-size: #pt;"]
+              "Sized"
+            div.centertext
+              "Centred"
+            table.bbc_table
+              thead
+                tr
+                  th
+                    "A"
+                  th
+                    "B"
+              tbody
+            span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+              button [tabindex="#" title="Show or hide spoiler content" type="button"]
+              span
+                "Hidden"
+            hr.bbc_hr
+            "Smileys:"
+            img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+            img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+          ul#msg_#_quote.quickbuttons
+            li#quoteSelected_# [data-msgid="#" style="display:none;"]
+              a [href="javascript:void(#)"]
+                span.main_icons.quote_selected
+                "Quote selected text"
+            li.post_modify
+              a [href="#postmodify" onclick="return insertQuoteFast(#);"]
+                span.main_icons.quote
+                "Quote"
+    script
+      | var aIgnoreToggles = new Array(); function insertQuoteFast(messageid) { var e = document.getElementById("message"); sceditor.instance(e).insertQuoteFast(messageid); return true; } function onReceiveOpener(text) { var e = document.getElementById("message"); sceditor.instance(e).insert(text); }
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/printpage.txt b/tests/Integration/Http/Snapshot/snapshots/member/printpage.txt
new file mode 100644
index 00000000000..e245414e1d2
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/printpage.txt
@@ -0,0 +1,124 @@
+status 200
+@ head
+head
+  meta [charset="UTF-#"]
+  meta [content="noindex" name="robots"]
+  link [href="{boardurl}/index.php?topic=#" rel="canonical"]
+  title
+    "Print Page - Snapshot topic"
+  style
+    | body, a { color: ##; background: #fff; } body, td, .normaltext { font-family: Verdana, arial, helvetica, serif; font-size: small; } h##title { font-size: large; font-weight: bold; } h##linktree { margin: #em # #em #; font-size: small; font-weight: bold; } dl#posts { width: #%; margin: #; padding: #; list-style: none; } div.postheader, #poll_data { border: solid ##; border-width: #px #; padding: #px #; } div.postbody { margin: #em # #em #em; } table { empty-cells: show; } blockquote { margin: # # #px #; padding: #px #px; font-size: small; border: #px solid #d#dfe#; border-left: #px solid #aaa; border-right: #px solid #aaa; } blockquote cite { display: block; border-bottom: #px solid #aaa; font-size: #em; } blockquote cite:before { color: #aaa; font-size: #px; font-style: normal; margin-right: #px; } code { border: #px solid ##; margin: #px; padding: #px; display: block; } code { font: x-small monospace; } .smalltext, .codeheader { font-size: x-small; } .largetext { font-size: large; } .centertext { text-align: center; } hr { height: #px; border: #; color: black; background-color: black; } .voted { font-weight: bold; } #footer { font-family: Verdana, sans-serif; } @media print { .print_options { display: none; } } @media screen { .print_options { margin: #em #; } }
+@ body
+body
+  div.print_options
+    strong
+      a [href="{boardurl}/index.php?action=printpage;topic=#"]
+        "Text only"
+    "|"
+    a [href="{boardurl}/index.php?action=printpage;topic=#;images"]
+      "Text with Images"
+  h1#title
+    "{forum_name}"
+  h2#linktree
+    "Snapshot fixtures ▸ Snapshot board ▸ Started by Snapshot Member, {date}"
+  div#posts
+    div.postheader
+      div
+        strong
+          "Snapshot topic"
+      div
+        "Posted by Snapshot Member, {date}"
+    div.postbody
+      "The first post, with"
+      strong
+        "bold"
+      ","
+      em
+        "italic"
+      ","
+      u
+        "underlined"
+      "and"
+      s
+        "struck"
+      "text."
+      br
+      "A link (https://www.simplemachines.org) and {email}."
+      br
+      blockquote.bbc_standard_quote
+        cite
+          "Quote"
+        "An unattributed quote."
+      div.codeheader
+        "Code"
+      pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+        code
+          "echo \"code\";"
+      ul.bbc_list
+        li
+          "One"
+        li
+          "Two"
+      "Red"
+      span.bbc_size [style="font-size: #pt;"]
+        "Sized"
+      div.centertext
+        "Centred"
+      table.bbc_table
+        thead
+          tr
+            th
+              "A"
+            th
+              "B"
+        tbody
+      span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+        button [tabindex="#" title="Show or hide spoiler content" type="button"]
+        span
+          "Hidden"
+      hr.bbc_hr
+      "Smileys:"
+      img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+      img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Guest, {date}"
+    div.postbody
+      "A reply from a guest."
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Admin, {date}"
+    div.postbody
+      blockquote.bbc_standard_quote
+        cite
+          "Quote from: Snapshot Member"
+        "The quoted text."
+      "A reply from an administrator."
+    div.postheader
+      div
+        strong
+          "Re: Snapshot topic"
+      div
+        "Posted by Snapshot Other, {date}"
+    div.postbody
+      "A reply from another member, with a smiley"
+      img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+  div.print_options
+    strong
+      a [href="{boardurl}/index.php?action=printpage;topic=#"]
+        "Text only"
+    "|"
+    a [href="{boardurl}/index.php?action=printpage;topic=#;images"]
+      "Text with Images"
+  div#footer.smalltext
+    a [href="{boardurl}/index.php?action=credits" rel="noopener" target="_blank" title="License"]
+      "SMF # Alpha(s) #-dev © #"
+    ","
+    a [href="https://www.simplemachines.org" rel="noopener" target="_blank" title="Simple Machines"]
+      "Simple Machines"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_account.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_account.txt
new file mode 100644
index 00000000000..ab28256c617
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_account.txt
@@ -0,0 +1,257 @@
+status 200
+@ title
+title
+  "Profile - Account Settings"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=account" itemprop="item"]
+        span [itemprop="name"]
+          "Account Settings"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.chosen.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=account;u=#" autocomplete="off" enctype="multipart/form-data" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Profile"
+        p.information
+          "These are your account settings. This page holds all critical information that identifies you on this forum. For security reasons, you will need to enter your (current) password to make changes to this information."
+        div.roundframe
+          dl.settings
+            dt
+              strong
+                "Username"
+            dd
+              "snapshot_member"
+            dt
+              strong
+                label [for="real_name"]
+                  "Name"
+              br
+              span.smalltext
+                "This is the displayed name that people will see."
+            dd
+              input#real_name [maxlength="#" name="real_name" size="#" type="text" value="Snapshot Member"]
+            dt
+              strong
+                label [for="lngfile"]
+                  "Preferred language"
+            dd
+              select#lngfile [name="lngfile"]
+                option [selected value="en_US"]
+                  "English (US)"
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="email_address"]
+                  "Email address"
+              br
+              span.smalltext
+                "This must be a valid email address."
+            dd
+              input#email_address [name="email_address" size="#" type="email" value="{email}"]
+            dt
+              strong
+                label [for="show_online"]
+                  "Show others my online status"
+            dd
+              input [name="show_online" type="hidden" value="#"]
+              input#show_online [checked name="show_online" type="checkbox" value="#"]
+          hr
+          dl.settings
+            dt
+              strong
+                "Two-Factor Authentication"
+              br
+              div.smalltext
+                "#FA allows you to have a secondary layer of security by assigning a dedicated device without which no one would be able to log into your account even if they have your username and password"
+            dd
+              a#enable_tfa [href="{boardurl}/index.php?action=profile;area=tfasetup"]
+                "Enable Two-Factor Authentication"
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="passwrd#"]
+                  "Choose Password"
+              br
+              span.smalltext
+                "For best security, you should use eight or more characters. It is a good idea to use a phrase with multiple words."
+            dd
+              input#passwrd# [name="passwrd#" size="#" type="password" value]
+            dt
+              strong
+                label [for="passwrd#"]
+                  "Verify Password"
+            dd
+              input#passwrd# [name="passwrd#" size="#" type="password" value]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="secret_question"]
+                  "Secret Question"
+              br
+              span.smalltext
+                "To help retrieve your password, enter a question here with an answer that"
+                strong
+                  "only"
+                "you know."
+            dd
+              input#secret_question [name="secret_question" size="#" type="text" value]
+            dt
+              strong
+                label [for="secret_answer"]
+                  "Answer"
+              br
+              span.smalltext
+                "Choose carefully. You would not want someone guessing your answer!"
+            dd
+              input#secret_answer [name="secret_answer" size="#" type="text" value]
+              span.smalltext
+                a [href="{boardurl}/index.php?action=helpadmin;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons
+                  "why is this blank?"
+          dl.settings
+            dt
+              strong
+                label [for="oldpasswrd"]
+                  "Current Password"
+              br
+              span.smalltext
+                "For security reasons, your current password is required to make changes to your account."
+            dd
+              input#oldpasswrd [name="oldpasswrd" size="#" type="password"]
+          input.button.floatright [name="save" type="submit" value="Change profile"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="account"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_alerts.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_alerts.txt
new file mode 100644
index 00000000000..1adcc72883b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_alerts.txt
@@ -0,0 +1,144 @@
+status 200
+@ title
+title
+  "Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showalerts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Alerts"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Alerts"
+      div.information
+        "You have no alerts."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_attachments.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_attachments.txt
new file mode 100644
index 00000000000..a801a18fd8b
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_attachments.txt
@@ -0,0 +1,201 @@
+status 200
+@ title
+title
+  "Attachments - Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach" itemprop="item"]
+        span [itemprop="name"]
+          "Attachments"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.chosen.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Show Posts"
+      p.information
+        "This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Show Posts Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Show Posts Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                    "Messages"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                    "Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                    "Unwatched topics"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                    "Attachments"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Attachments"
+      table#attachments.table_grid [style="width:#%"]
+        thead
+          tr.title_bar
+            th#header_attachments_filename.filename.lefttext [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#;sort=filename;desc" rel="nofollow"]
+                "Filename"
+                span.main_icons.sort_up
+            th#header_attachments_downloads.downloads [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#;sort=downloads" rel="nofollow"]
+                "Downloads"
+            th#header_attachments_subject.lefttext.subject [scope="col" style="width: #%;"]
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#;sort=subject" rel="nofollow"]
+                "Message"
+            th#header_attachments_posted.lefttext.posted [scope="col"]
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#;sort=posted" rel="nofollow"]
+                "Posted"
+        tbody
+          tr.windowbg
+            td.centertext [colspan="#"]
+              "No attachments have been posted yet."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_buddies.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_buddies.txt
new file mode 100644
index 00000000000..d64d27013bc
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_buddies.txt
@@ -0,0 +1,207 @@
+status 200
+@ title
+title
+  "Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=lists" itemprop="item"]
+        span [itemprop="name"]
+          "Buddies/Ignore List"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies" itemprop="item"]
+        span [itemprop="name"]
+          "Edit Buddies"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.chosen.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Buddies/Ignore List"
+      p.information
+        "This area allows you to maintain your buddy and ignore lists for this forum. Adding members to these lists will, amongst other things, help control mail and PM traffic, depending on your preferences."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Buddies/Ignore List Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Buddies/Ignore List Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                    "Edit Buddies"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                    "Edit Ignore List"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div#edit_buddies
+        div.cat_bar
+          h3.catbg
+            span.icon.main_icons.people
+            "Edit Buddies"
+        table.table_grid
+          thead
+            tr.title_bar
+              th.buddy_link.quarter_table [scope="col"]
+                "Name"
+              th.buddy_status [scope="col"]
+                "Status"
+              th.buddy_remove [scope="col"]
+                "Remove"
+          tbody
+            tr.windowbg
+              td [colspan="#"]
+                strong
+                  "Your buddy list is currently empty"
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;u=#;area=lists;sa=buddies" method="post"]
+        div.cat_bar
+          h3.catbg
+            "Add to buddy list"
+        div.information
+          dl.settings
+            dt
+              label [for="new_buddy"]
+                strong
+                  "Member:"
+            dd
+              input#new_buddy [name="new_buddy" size="#" type="text"]
+              input.button.floatnone [type="submit" value="Add"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+      script
+        | var oAddBuddySuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'new_buddy', sControlId: 'new_buddy', sSearchType: 'member', sTextDeleteItem: 'Delete Item', });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_delete.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_delete.txt
new file mode 100644
index 00000000000..266964526cc
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_delete.txt
@@ -0,0 +1,162 @@
+status 200
+@ title
+title
+  "Delete this account"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=deleteaccount" itemprop="item"]
+        span [itemprop="name"]
+          "Delete this account"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.chosen.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=deleteaccount;save" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Delete this account"
+        div.windowbg
+          div.errorbox
+            "Are you sure you want to delete your account?"
+          fieldset
+            label [for="anonymize"]
+              input#anonymize [name="anonymize" type="checkbox" value="#"]
+              "Anonymize personally identifying information when account is deleted"
+          fieldset
+            legend
+              "For security reasons, your current password is required to make changes to your account."
+            strong
+              "Current Password"
+            input [name="oldpasswrd" size="#" type="password"]
+          input.button.floatright [type="submit" value="Delete"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="deleteaccount"]
+        br
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_drafts.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_drafts.txt
new file mode 100644
index 00000000000..2aba0d9ded6
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_drafts.txt
@@ -0,0 +1,162 @@
+status 200
+@ title
+title
+  "Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showdrafts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Drafts"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.chosen.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.drafts.icon.main_icons
+          "Show Drafts"
+      p.information
+        "This area shows you all the drafts you currently have saved. From here you can edit them before posting, or you can remove them"
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar.cat_bar_round
+        h3.catbg
+          "Drafts"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.centertext.windowbg
+        "You have no drafts."
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_forum.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_forum.txt
new file mode 100644
index 00000000000..8bfdbe911c9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_forum.txt
@@ -0,0 +1,343 @@
+status 200
+@ title
+title
+  "Profile - Forum Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=forumprofile" itemprop="item"]
+        span [itemprop="name"]
+          "Forum Profile"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.chosen.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=forumprofile;u=#" enctype="multipart/form-data" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Profile"
+        p.information
+          "You can change your personal information on this page. This information will be displayed throughout {forum_name}. If you are not comfortable with sharing some information, simply skip it - nothing here is required."
+        div.roundframe
+          dl.settings
+            dt
+              strong#personal_picture
+                label [for="avatar_upload_box"]
+                  "Personalized picture"
+              input#avatar_choice_none [checked="checked" name="avatar_choice" type="radio" value="none"]
+              label [for="avatar_choice_none"]
+                "No avatar"
+              br
+              input#avatar_choice_server_stored [name="avatar_choice" type="radio" value="server_stored"]
+              label [for="avatar_choice_server_stored"]
+                "Choose avatar from gallery"
+              br
+              input#avatar_choice_external [name="avatar_choice" type="radio" value="external"]
+              label [for="avatar_choice_external"]
+                "Specify avatar by URL"
+              br
+              input#avatar_choice_upload [name="avatar_choice" type="radio" value="upload"]
+              label [for="avatar_choice_upload"]
+                "Upload an avatar"
+              br
+            dd
+              div#avatar_server_stored [data-avatar-choice="server_stored"]
+                div
+                  select#cat [data-avatardir="{boardurl}/avatars/" name="cat" size="#"]
+                    option [selected value="blank.png"]
+                      "(no pic)"
+                    optgroup [label="[Oxygen]"]
+                      option [value="Oxygen/beagle.png"]
+                        "beagle"
+                      option [value="Oxygen/bug.png"]
+                        "bug"
+                      option [value="Oxygen/cards.png"]
+                        "cards"
+                      option [value="Oxygen/cookie.png"]
+                        "cookie"
+                      option [value="Oxygen/dice.png"]
+                        "dice"
+                      option [value="Oxygen/Earl.png"]
+                        "Earl"
+                      option [value="Oxygen/flish.png"]
+                        "flish"
+                      option [value="Oxygen/game.png"]
+                        "game"
+                      option [value="Oxygen/golf.png"]
+                        "golf"
+                      option [value="Oxygen/hardware.png"]
+                        "hardware"
+                      option [value="Oxygen/invisible-user.png"]
+                        "invisible-user"
+                      option [value="Oxygen/lense.png"]
+                        "lense"
+                      option [value="Oxygen/love.png"]
+                        "love"
+                      option [value="Oxygen/megaphone.png"]
+                        "megaphone"
+                      option [value="Oxygen/pi.png"]
+                        "pi"
+                      option [value="Oxygen/scope.png"]
+                        "scope"
+                      option [value="Oxygen/smiley.png"]
+                        "smiley"
+                      option [value="Oxygen/tea.png"]
+                        "tea"
+                      option [value="Oxygen/wine.png"]
+                        "wine"
+                    option [value="default.png"]
+                      "default"
+                div.edit_avatar_img
+                  img#avatar [alt src="{boardurl}/avatars/blank.png"]
+              div#avatar_external [data-avatar-choice="external"]
+                div.smalltext
+                  "Specify your own avatar by URL. (e.g.:"
+                  em
+                    "https://www.example.com/mypic.png"
+                  ")"
+                input [name="userpicpersonal" size="#" type="text" value="http://"]
+                br
+              div#avatar_upload [data-avatar-choice="upload"]
+                input#avatar_upload_box [accept="image/gif, image/jpeg, image/jpg, image/png, image/svg+xml, image/webp" name="attachment" size="#" type="file" value]
+                div.smalltext
+                  "Max size: #px by #px"
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="personal_text"]
+                  "Personal text"
+            dd
+              input#personal_text [maxlength="#" name="personal_text" size="#" type="text" value="Personal text for Snapshot Member"]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="birthdate"]
+                  "Date of birth"
+            dd
+              input#birthdate [name="birthdate" size="#" type="date" value]
+            dt#current_signature [style="display:none"]
+              strong
+                "Current signature"
+            dd#current_signature_display [style="display:none"]
+              hr
+            dt#preview_signature [style="display:none"]
+              strong
+                "Signature preview"
+            dd#preview_signature_display [style="display:none"]
+              hr
+            dt
+              label [for="signature"]
+                strong
+                  "Signature"
+              br
+              span.smalltext
+                "Signatures are displayed at the bottom of each post or personal message. BBCode and smileys may be used in your signature."
+              br
+            dd
+              textarea#signature.editor [cols="#" data-max-length="#" name="signature" rows="#"]
+                "A signature with [b]bold[/b] text."
+              br
+              span.smalltext
+                "Max characters: #; characters remaining:"
+                span#signatureLeft
+                  "#"
+              br
+              input#preview_button.button.floatright [name="preview_signature" type="button" value="Preview signature"]
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="website_title"]
+                  "Website title"
+              br
+              span.smalltext
+                "This must be included if you specify a URL below."
+            dd
+              input#website_title [name="website_title" size="#" type="text" value="Example"]
+            dt
+              strong
+                label [for="website_url"]
+                  "Website URL"
+              br
+              span.smalltext
+                "This must be a complete URL."
+            dd
+              input#website_url [name="website_url" size="#" type="url" value="https://www.example.com"]
+          hr
+          dl.settings
+            dt
+              strong
+                "ICQ"
+              br
+              span.smalltext
+                "This is your ICQ number."
+            dd
+              input#customfield[cust_icq] [maxlength="#" name="customfield[cust_icq]" size="#" type="text" value]
+            dt
+              strong
+                "Skype"
+              br
+              span.smalltext
+                "Your Skype username"
+            dd
+              input#customfield[cust_skype] [maxlength="#" name="customfield[cust_skype]" size="#" type="text" value]
+            dt
+              strong
+                "Location"
+              br
+              span.smalltext
+                "Geographic location."
+            dd
+              input#customfield[cust_loca] [maxlength="#" name="customfield[cust_loca]" size="#" type="text" value]
+            dt
+              strong
+                "Gender"
+              br
+              span.smalltext
+                "Your gender."
+            dd
+              fieldset
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [checked name="customfield[cust_gender]" type="radio" value="#"]
+                  "None"
+                br
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [name="customfield[cust_gender]" type="radio" value="#"]
+                  "Male"
+                br
+                label [for="customfield_cust_gender_#"]
+                  input#customfield_cust_gender_# [name="customfield[cust_gender]" type="radio" value="#"]
+                  "Female"
+                br
+          input.button.floatright [name="save" type="submit" value="Change profile"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="forumprofile"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_groups.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_groups.txt
new file mode 100644
index 00000000000..6727b0eceb1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_groups.txt
@@ -0,0 +1,218 @@
+status 200
+@ title
+title
+  "Profile of Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Member"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="mailto:{email}" rel="nofollow" title="{email}"]
+                span.mail.main_icons [title="Email"]
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+            "Show Drafts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Username"
+            dd
+              "snapshot_member"
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Email"
+            dd
+              a [href="mailto:{email}"]
+                "{email}"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Member"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_boards.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_boards.txt
new file mode 100644
index 00000000000..6727b0eceb1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_boards.txt
@@ -0,0 +1,218 @@
+status 200
+@ title
+title
+  "Profile of Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Member"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="mailto:{email}" rel="nofollow" title="{email}"]
+                span.mail.main_icons [title="Email"]
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+            "Show Drafts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Username"
+            dd
+              "snapshot_member"
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Email"
+            dd
+              a [href="mailto:{email}"]
+                "{email}"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Member"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_list.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_list.txt
new file mode 100644
index 00000000000..644161f635e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_ignore_list.txt
@@ -0,0 +1,206 @@
+status 200
+@ title
+title
+  "Profile"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=lists" itemprop="item"]
+        span [itemprop="name"]
+          "Buddies/Ignore List"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore" itemprop="item"]
+        span [itemprop="name"]
+          "Edit Ignore List"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.chosen.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Buddies/Ignore List"
+      p.information
+        "This area allows you to maintain your buddy and ignore lists for this forum. Adding members to these lists will, amongst other things, help control mail and PM traffic, depending on your preferences."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Buddies/Ignore List Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Buddies/Ignore List Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                    "Edit Buddies"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                    "Edit Ignore List"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div#edit_buddies
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Edit Ignore List"
+        table.table_grid
+          thead
+            tr.title_bar
+              th.buddy_link.quarter_table [scope="col"]
+                "Name"
+              th.buddy_status [scope="col"]
+                "Status"
+              th.buddy_remove [scope="col"]
+                "Remove from ignore list"
+          tbody
+            tr.windowbg
+              td [colspan="#"]
+                strong
+                  "Your ignore list is currently empty"
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;u=#;area=lists;sa=ignore" method="post"]
+        div.cat_bar
+          h3.catbg
+            "Add to ignore list"
+        div.information
+          dl.settings
+            dt
+              label [for="new_ignore"]
+                strong
+                  "Member"
+            dd
+              input#new_ignore [name="new_ignore" size="#" type="text"]
+              input.button [type="submit" value="Add"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+      script
+        | var oAddIgnoreSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sSuggestId: 'new_ignore', sControlId: 'new_ignore', sSearchType: 'member', sTextDeleteItem: 'Delete Item', });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_notification.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification.txt
new file mode 100644
index 00000000000..626d8806ea5
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification.txt
@@ -0,0 +1,348 @@
+status 200
+@ title
+title
+  "Profile - Notifications"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification" itemprop="item"]
+        span [itemprop="name"]
+          "Notifications"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts" itemprop="item"]
+        span [itemprop="name"]
+          "Notification Preferences"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          "Notifications"
+      p.information
+        "SMF allows you to be notified of replies to posts, newly posted topics, and forum announcements. You can change those settings here, or oversee the topics and boards you are currently receiving notifications for."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Notifications Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Notifications Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                    "Notification Preferences"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                    "Watched Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                    "Watched Boards"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Notification Preferences"
+      p.information
+        "This page will allow you to configure when and how you get notified about new content."
+      form#notify_options.flow_auto [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#" method="post"]
+        div.cat_bar
+          h3.catbg
+            "General Settings"
+        div.windowbg
+          dl.settings
+            dt
+              label [for="notify_announcements"]
+                "Receive forum newsletters, announcements and important notifications by email."
+            dd
+              input [name="notify_announcements" type="hidden" value="#"]
+              input#notify_announcements [name="notify_announcements" type="checkbox" value="#"]
+            dt
+              label [for="notify_alert_timeout"]
+                "Timeout for Alert desktop notifications (in seconds)"
+            dd
+              input#notify_alert_timeout [max="#" min="#" name="opt_alert_timeout" size="#" type="number" value="#"]
+        div.cat_bar
+          h3.catbg
+            "Alert Preferences"
+        table.table_grid
+          tbody
+            tr.title_bar
+              th
+                "Boards and Topics"
+              th
+                "Receive alert"
+              th
+                "Receive email"
+            tr.windowbg
+            tr.windowbg
+              td [colspan="#"]
+                input#opt_msg_auto_notify [name="opt_msg_auto_notify" type="checkbox"]
+                label [for="opt_msg_auto_notify"]
+                  "Follow topics I create and reply to"
+            tr.windowbg
+              td [colspan="#"]
+                input#opt_msg_receive_body [name="opt_msg_receive_body" type="checkbox"]
+                label [for="opt_msg_receive_body"]
+                  "Receive message body in e-mails"
+            tr.windowbg
+              td [colspan="#"]
+                label [for="opt_msg_notify_pref"]
+                  "How frequently to tell me:"
+                select#opt_msg_notify_pref [name="opt_msg_notify_pref"]
+                  option [value="#"]
+                    "Never"
+                  option [selected value="#"]
+                    "Immediately"
+                  option [value="#"]
+                    "Immediately (but only for the first unread message)"
+                  option [value="#"]
+                    "Send me a daily summary"
+                  option [value="#"]
+                    "Send me a weekly summary"
+            tr.windowbg
+              td [colspan="#"]
+                label [for="opt_msg_notify_type"]
+                  "Notify me of:"
+                select#opt_msg_notify_type [name="opt_msg_notify_type"]
+                  option [selected value="#"]
+                    "Replies and moderation"
+                  option [value="#"]
+                    "Moderation only if I started the topic and am following it"
+                  option [value="#"]
+                    "Only replies"
+                  option [value="#"]
+                    "Nothing at all"
+            tr.windowbg
+              td
+                "When a topic I follow receives a reply, I normally want to know via..."
+              td.centercol
+                input [checked name="alert_topic_notify" type="checkbox"]
+              td.centercol
+                input [name="email_topic_notify" type="checkbox"]
+            tr.windowbg
+              td
+                "When a new topic is created in a board I follow, I normally want to know via..."
+              td.centercol
+                input [checked name="alert_board_notify" type="checkbox"]
+              td.centercol
+                input [name="email_board_notify" type="checkbox"]
+            tr.title_bar
+              th
+                "Posts"
+              th
+                "Receive alert"
+              th
+                "Receive email"
+            tr.windowbg
+            tr.windowbg
+              td
+                "When one of my posts is quoted"
+              td.centercol
+                input [checked name="alert_msg_quote" type="checkbox"]
+              td.centercol
+                input [name="email_msg_quote" type="checkbox"]
+            tr.windowbg
+              td
+                "When a reply is made to my unapproved topic"
+              td.centercol
+                input [checked name="alert_unapproved_reply" type="checkbox"]
+              td.centercol
+                input [checked name="email_unapproved_reply" type="checkbox"]
+            tr.title_bar
+              th
+                "Personal Messages"
+              th
+                "Receive alert"
+              th
+                "Receive email"
+            tr.windowbg
+            tr.windowbg
+              td [colspan="#"]
+                label [for="opt_pm_notify"]
+                  "If enabled, notify me of personal messages from:"
+                select#opt_pm_notify [name="opt_pm_notify"]
+                  option [selected value="#"]
+                    "All members"
+                  option [value="#"]
+                    "Buddies Only"
+            tr.windowbg
+              td
+                "When I receive a new personal message"
+                a.floatright.help [href="{boardurl}/index.php?action=helpadmin;help=alert_pm_new" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons [title="Help"]
+              td.centercol
+                input [disabled type="checkbox"]
+              td.centercol
+                input [name="email_pm_new" type="checkbox"]
+            tr.windowbg
+              td
+                "When I receive a reply to a personal message"
+                a.floatright.help [href="{boardurl}/index.php?action=helpadmin;help=alert_pm_new" onclick="return reqOverlayDiv(this.href);"]
+                  span.help.main_icons [title="Help"]
+              td.centercol
+                input [disabled type="checkbox"]
+              td.centercol
+                input [name="email_pm_reply" type="checkbox"]
+            tr.title_bar
+              th
+                "Members"
+              th
+                "Receive alert"
+              th
+                "Receive email"
+            tr.windowbg
+            tr.windowbg
+              td
+                "When other members add me as their buddy"
+              td.centercol
+                input [checked name="alert_buddy_request" type="checkbox"]
+              td.centercol
+                input [disabled type="checkbox"]
+            tr.windowbg
+              td
+                "When it is my birthday"
+              td.centercol
+                input [name="alert_birthday" type="checkbox"]
+              td.centercol
+                input [checked name="email_birthday" type="checkbox"]
+        br
+        div
+          input#notify_submit.button [name="notify_submit" type="submit" value="Save settings"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="notification"]
+      br
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_boards.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_boards.txt
new file mode 100644
index 00000000000..c63491a5a68
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_boards.txt
@@ -0,0 +1,207 @@
+status 200
+@ title
+title
+  "Profile - Notifications"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification" itemprop="item"]
+        span [itemprop="name"]
+          "Notifications"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards" itemprop="item"]
+        span [itemprop="name"]
+          "Watched Boards"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          "Notifications"
+      p.information
+        "SMF allows you to be notified of replies to posts, newly posted topics, and forum announcements. You can change those settings here, or oversee the topics and boards you are currently receiving notifications for."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Notifications Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Notifications Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                    "Notification Preferences"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                    "Watched Topics"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                    "Watched Boards"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Watched Boards"
+      p.information
+        "This page lets you review which boards you are watching; when boards that you are watching have new topics, you can be notified."
+      br
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=notification;sa=boards" method="post"]
+        table#board_notification_list.table_grid [style="width:#%"]
+          thead
+            tr.title_bar
+              th#header_board_notification_list_board_name.board_name.lefttext [scope="col"]
+                a [href="{boardurl}/index.php?action=profile;u=#;area=notification;sa=boards;sort=board_name;desc" rel="nofollow"]
+                  "Current Board Notifications"
+                  span.main_icons.sort_up
+              th#header_board_notification_list_alert_pref.alert_pref.lefttext [scope="col"]
+                "Alert Preferences"
+              th#header_board_notification_list_delete.centercol.delete [scope="col" style="width: #%;"]
+                input [onclick="invertAll(this, this.form);" type="checkbox"]
+          tbody
+            tr.windowbg
+              td.left [colspan="#"]
+                "You are not receiving notifications on any boards right now."
+                br
+                "To request notifications from a specific board, click the \"notify\" button in the index of that board."
+        div.additional_row.floatright
+          input.button [name="edit_notify_boards" type="submit" value="Unnotify"]
+          input.button [name="remove_notify_boards" type="submit" value="Use default preference"]
+        input [name="u" type="hidden" value="#"]
+        input [name="sa" type="hidden" value="notification"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input [name="sort" type="hidden" value="board_name"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_topics.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_topics.txt
new file mode 100644
index 00000000000..6f320bc8b80
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_notification_topics.txt
@@ -0,0 +1,213 @@
+status 200
+@ title
+title
+  "Profile - Notifications"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification" itemprop="item"]
+        span [itemprop="name"]
+          "Notifications"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics" itemprop="item"]
+        span [itemprop="name"]
+          "Watched Topics"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          "Notifications"
+      p.information
+        "SMF allows you to be notified of replies to posts, newly posted topics, and forum announcements. You can change those settings here, or oversee the topics and boards you are currently receiving notifications for."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Notifications Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Notifications Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                    "Notification Preferences"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                    "Watched Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                    "Watched Boards"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar
+        h3.catbg
+          "Watched Topics"
+      p.information
+        "This page lets you review which topics you are watching; when topics that you are watching have been replied to, you can be notified."
+      br
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=notification;sa=topics" method="post"]
+        table#topic_notification_list.table_grid [style="width:#%"]
+          thead
+            tr.title_bar
+              th#header_topic_notification_list_subject.lefttext.subject [scope="col"]
+                a [href="{boardurl}/index.php?action=profile;u=#;area=notification;sa=topics;sort=subject" rel="nofollow"]
+                  "Current Topic Notifications"
+              th#header_topic_notification_list_started_by.lefttext.started_by [scope="col"]
+                a [href="{boardurl}/index.php?action=profile;u=#;area=notification;sa=topics;sort=started_by" rel="nofollow"]
+                  "Started by"
+              th#header_topic_notification_list_last_post.last_post.lefttext [scope="col"]
+                a [href="{boardurl}/index.php?action=profile;u=#;area=notification;sa=topics;sort=last_post;desc" rel="nofollow"]
+                  "Last post"
+                  span.main_icons.sort_up
+              th#header_topic_notification_list_alert_pref.alert_pref.lefttext [scope="col"]
+                "Alert Preferences"
+              th#header_topic_notification_list_delete.centercol.delete [scope="col" style="width: #%;"]
+                input [onclick="invertAll(this, this.form);" type="checkbox"]
+          tbody
+            tr.windowbg
+              td.left [colspan="#"]
+                "You are not currently receiving any notifications from topics."
+                br
+                "To receive notifications from a topic, click the \"notify\" button while viewing it."
+        div.additional_row.floatright
+          input.button [name="edit_notify_topics" type="submit" value="Unnotify"]
+          input.button [name="remove_notify_topics" type="submit" value="Use default preference"]
+        input [name="u" type="hidden" value="#"]
+        input [name="sa" type="hidden" value="notification"]
+        input [name="{session_var}" type="hidden" value="{session_id}"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
+        input [name="sort" type="hidden" value="last_post"]
+        input [name="{token_var}" type="hidden" value="{hash}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_permissions.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_permissions.txt
new file mode 100644
index 00000000000..6727b0eceb1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_permissions.txt
@@ -0,0 +1,218 @@
+status 200
+@ title
+title
+  "Profile of Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Member"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="mailto:{email}" rel="nofollow" title="{email}"]
+                span.mail.main_icons [title="Email"]
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+            "Show Drafts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Username"
+            dd
+              "snapshot_member"
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Email"
+            dd
+              a [href="mailto:{email}"]
+                "{email}"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Member"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_posts.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_posts.txt
new file mode 100644
index 00000000000..f249e9597c9
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_posts.txt
@@ -0,0 +1,303 @@
+status 200
+@ title
+title
+  "Show Posts - Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages" itemprop="item"]
+        span [itemprop="name"]
+          "Messages"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.chosen.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Show Posts"
+      p.information
+        "This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Show Posts Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Show Posts Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                    "Messages"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                    "Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                    "Unwatched topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                    "Attachments"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar.cat_bar_round
+        h3.catbg
+          "Messages"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "A second topic in the child board."
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+          li.you_sure
+            a [data-confirm="Remove this post" href="{boardurl}/index.php?action=deletemsg;msg=#;topic=#;profile;u=#;start=#;{session_var}={session_id}"]
+              span.main_icons.remove_button
+              "Remove"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "The first post, with"
+            strong
+              "bold"
+            ","
+            em
+              "italic"
+            ","
+            u
+              "underlined"
+            "and"
+            s
+              "struck"
+            "text."
+            br
+            a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+              "A link"
+            "and"
+            a.bbc_email [href="mailto:{email}"]
+              "{email}"
+            "."
+            br
+            blockquote.bbc_standard_quote
+              cite
+                "Quote"
+              "An unattributed quote."
+            div.codeheader
+              "Code"
+            pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+              code
+                "echo \"code\";"
+            ul.bbc_list
+              li
+                "One"
+              li
+                "Two"
+            span.bbc_color [style="color: red;"]
+              "Red"
+            span.bbc_size [style="font-size: #pt;"]
+              "Sized"
+            div.centertext
+              "Centred"
+            table.bbc_table
+              thead
+                tr
+                  th
+                    "A"
+                  th
+                    "B"
+              tbody
+            span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+              button [tabindex="#" title="Show or hide spoiler content" type="button"]
+              span
+                "Hidden"
+            hr.bbc_hr
+            "Smileys:"
+            img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+            img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_statistics.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_statistics.txt
new file mode 100644
index 00000000000..ee2a85b28fd
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_statistics.txt
@@ -0,0 +1,215 @@
+status 200
+@ title
+title
+  "User statistics for Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=statistics" itemprop="item"]
+        span [itemprop="name"]
+          "Show Stats"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.chosen.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          img.icon [alt src="{boardurl}/Themes/default/images/icons/stats_info.png"]
+          "User statistics for Snapshot Member"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.noup.roundframe
+        div#generalstats
+          dl.stats
+            dt
+              "Total time spent online"
+            dd
+              "{duration}"
+            dt
+              "Total posts"
+            dd
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                "# post(s)"
+            dt
+              "Total topics started"
+            dd
+              a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                "# topic(s)"
+            dt
+              "Number of polls created"
+            dd
+              "# poll(s)"
+            dt
+              "Number of votes cast"
+            dd
+              "# vote(s)"
+        div#activitytime.flow_hidden
+          div.title_bar
+            h3.titlebg
+              span.history.main_icons
+              "Posting activity by time"
+          ul.activity_stats.flow_hidden
+            li
+              div.generic_bar.vertical
+                div.bar [style="height: #%;"]
+                  span
+                    "# post(s) (#%)"
+              span.stats_hour
+                "# am(s)"
+            li
+              div.generic_bar.vertical
+                div.bar [style="height: #%;"]
+                  span
+                    "# post(s) (#%)"
+              span.stats_hour
+                "# pm(s)"
+        div.flow_hidden
+          div.half_content
+            div.title_bar
+              h3.titlebg
+                span.main_icons.replies
+                "Most popular boards by posts"
+            dl.stats
+              dt
+                a [href="{boardurl}/index.php?board=#"]
+                  "{board}"
+              dd
+                div.profile_pie [style="background-position: -#px #;" title="# post(s) of the member’s # post(s) (#%)"]
+                  "# post(s) of the member’s # post(s) (#%)"
+                "#"
+          div.half_content
+            div.title_bar
+              h3.titlebg
+                span.main_icons.replies
+                "Most popular boards by activity"
+            dl.stats
+              dt
+                a [href="{boardurl}/index.php?board=#"]
+                  "{board}"
+              dd
+                div.profile_pie [style="background-position: -#px #;" title="# post(s) of the board’s # post(s) (#%)"]
+                  "# post(s) of the board’s # post(s) (#%)"
+                "#%"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_summary.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_summary.txt
new file mode 100644
index 00000000000..6727b0eceb1
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_summary.txt
@@ -0,0 +1,218 @@
+status 200
+@ title
+title
+  "Profile of Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=summary" itemprop="item"]
+        span [itemprop="name"]
+          "{member}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.chosen.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "{member}"
+      div#profile_error.errorbox [style="display:none"]
+      div#profileview.flow_auto.noup.roundframe
+        div#basicinfo
+          div.clear.username
+            h4
+              "Snapshot Member"
+              span.position
+                "Newbie"
+          img.avatar [alt src="{boardurl}/avatars/default.png"]
+          ul.clear.icon_fields
+            li
+              a [href="mailto:{email}" rel="nofollow" title="{email}"]
+                span.mail.main_icons [title="Email"]
+            li
+              a [href="https://www.example.com" rel="noopener" target="_blank" title="Example"]
+                span.main_icons.www [title="Example"]
+            li.custom_field
+              span.gender_0.main_icons [title="None"]
+          span#userstatus
+            a [href="{boardurl}/index.php?action=pm;sa=send;u=#" rel="nofollow" title="Offline"]
+              span.off [title="Offline"]
+            span.smalltext
+              "Offline"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+            "Show Posts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+            "Show Drafts"
+          a.infolinks [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+            "Show Stats"
+        div#detailedinfo
+          dl.settings
+            dt
+              "Username"
+            dd
+              "snapshot_member"
+            dt
+              "Posts"
+            dd
+              "# (# per(s) day)"
+            dt
+              "Email"
+            dd
+              a [href="mailto:{email}"]
+                "{email}"
+            dt
+              "Personal text"
+            dd
+              "Personal text for Snapshot Member"
+            dt
+              "Age"
+            dd
+              "N/A"
+          dl.settings
+            dt
+              "Date registered"
+            dd
+              "{date}"
+            dt
+              "Local Time"
+            dd
+              "{date}"
+            dt
+              "Language"
+            dd
+              "English (US)"
+            dt
+              "Last active"
+            dd
+              "{date}"
+          div.signature
+            h5
+              "Signature"
+            "A signature with"
+            strong
+              "bold"
+            "text."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_theme.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_theme.txt
new file mode 100644
index 00000000000..e633f1de528
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_theme.txt
@@ -0,0 +1,345 @@
+status 200
+@ title
+title
+  "Profile - Look and Layout"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=theme" itemprop="item"]
+        span [itemprop="name"]
+          "Look and Layout"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.chosen.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div#profile_error.errorbox [style="display:none"]
+      form#creator [accept-charset="UTF-#" action="{boardurl}/index.php?action=profile;area=theme;u=#" enctype="multipart/form-data" method="post" name="creator"]
+        div.cat_bar
+          h3.catbg.profile_hd
+            "Profile"
+        p.information
+          "This section allows you to customize the look and layout of the forum."
+        div.roundframe
+          dl.settings
+            dt
+              strong
+                "Current Theme"
+            dd
+              "Forum or Board Default"
+              a.button [href="{boardurl}/index.php?action=themechooser;u=#"]
+                "change"
+          hr
+          dl.settings
+            dt
+              strong
+                label [for="easyformat"]
+                  "Time Format"
+              br
+              a.help [href="{boardurl}/index.php?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);"]
+                span.help.main_icons [title="Help"]
+              span.smalltext
+                label [for="time_format"]
+                  "The format here will be used to show dates throughout this forum."
+            dd
+              select#easyformat [name="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;"]
+                option [selected value]
+                  "(Forum Default)"
+                option [value="%B %d, %Y, %I:%M:%S %p"]
+                  "Month Day, Year, HH:MM:SS am/pm"
+                option [value="%B %d, %Y, %H:%M:%S"]
+                  "Month Day, Year, HH:MM:SS ({duration})"
+                option [value="%Y-%m-%d, %H:%M:%S"]
+                  "YYYY-MM-DD, HH:MM:SS"
+                option [value="%d %B %Y, %H:%M:%S"]
+                  "DD Month YYYY, HH:MM:SS"
+                option [value="%d-%m-%Y, %H:%M:%S"]
+                  "DD-MM-YYYY, HH:MM:SS"
+                option [disabled value="other"]
+                  "Other"
+              input#time_format [name="time_format" onchange="document.forms.creator.easyformat.value = 'other'" size="#" type="text" value]
+            dt
+              strong
+                label [for="timezone"]
+                  "Time zone"
+            dd
+              snapshot-ignored [selector="#timezone"]
+          hr
+          dl.settings
+            dt
+              strong
+                "Theme Color Mode"
+            dd
+            dt
+              label [for="theme_colormode"]
+                "Select Color Mode"
+            dd
+              select#theme_colormode [name="default_options[theme_colormode]"]
+                option [value="light"]
+                  "Light"
+                option [value="system"]
+                  "System Default"
+                option [value="dark"]
+                  "Dark"
+          hr
+          dl.settings
+            dt
+              strong
+                "Board and Topic display"
+            dd
+            dt
+              label [for="show_children"]
+                "Show sub-boards on every page inside boards, not just the first"
+            dd
+              input [name="default_options[show_children]" type="hidden" value="#"]
+              input#show_children [name="default_options[show_children]" type="checkbox" value="#"]
+            dt
+              label [for="topics_per_page"]
+                "Topics to display per page"
+            dd
+              select#topics_per_page [name="default_options[topics_per_page]"]
+                option [selected value="#"]
+                  "forum default"
+                option [value="#"]
+                  "#"
+            dt
+              label [for="messages_per_page"]
+                "Messages to display per page"
+            dd
+              select#messages_per_page [name="default_options[messages_per_page]"]
+                option [selected value="#"]
+                  "forum default"
+                option [value="#"]
+                  "#"
+            dt
+              label [for="view_newest_first"]
+                "Show most recent posts at the top in topic view"
+            dd
+              input [name="default_options[view_newest_first]" type="hidden" value="#"]
+              input#view_newest_first [name="default_options[view_newest_first]" type="checkbox" value="#"]
+            dt
+              label [for="show_no_avatars"]
+                "Don’t show users’ avatars"
+            dd
+              input [name="default_options[show_no_avatars]" type="hidden" value="#"]
+              input#show_no_avatars [name="default_options[show_no_avatars]" type="checkbox" value="#"]
+            dt
+              label [for="show_no_signatures"]
+                "Don’t show users’ signatures"
+            dd
+              input [name="default_options[show_no_signatures]" type="hidden" value="#"]
+              input#show_no_signatures [name="default_options[show_no_signatures]" type="checkbox" value="#"]
+            dt
+              label [for="posts_apply_ignore_list"]
+                "Hide messages posted by members on my ignore list"
+            dd
+              input [name="default_options[posts_apply_ignore_list]" type="hidden" value="#"]
+              input#posts_apply_ignore_list [name="default_options[posts_apply_ignore_list]" type="checkbox" value="#"]
+          hr
+          dl.settings
+            dt
+              strong
+                "Posting"
+            dd
+            dt
+              label [for="return_to_post"]
+                "Return to topics after posting by default"
+            dd
+              input [name="default_options[return_to_post]" type="hidden" value="#"]
+              input#return_to_post [name="default_options[return_to_post]" type="checkbox" value="#"]
+            dt
+              label [for="no_new_reply_warning"]
+                "Don’t warn on new replies made while posting."
+            dd
+              input [name="default_options[no_new_reply_warning]" type="hidden" value="#"]
+              input#no_new_reply_warning [name="default_options[no_new_reply_warning]" type="checkbox" value="#"]
+            dt
+              label [for="wysiwyg_default"]
+                "Load editor in"
+                abbr [title="What You See Is What You Get"]
+                  "WYSIWYG"
+                "mode by default"
+            dd
+              input [name="default_options[wysiwyg_default]" type="hidden" value="#"]
+              input#wysiwyg_default [name="default_options[wysiwyg_default]" type="checkbox" value="#"]
+            dt
+              label [for="drafts_autosave_enabled"]
+                "Enable automatic saving of drafts"
+            dd
+              input [name="default_options[drafts_autosave_enabled]" type="hidden" value="#"]
+              input#drafts_autosave_enabled [name="default_options[drafts_autosave_enabled]" type="checkbox" value="#"]
+            dt
+              label [for="drafts_show_saved_enabled"]
+                "Enable the selection of drafts from the posting screen"
+            dd
+              input [name="default_options[drafts_show_saved_enabled]" type="hidden" value="#"]
+              input#drafts_show_saved_enabled [name="default_options[drafts_show_saved_enabled]" type="checkbox" value="#"]
+          hr
+          dl.settings
+            dt
+              strong
+                "Moderation"
+            dd
+            dt
+              label [for="display_quick_mod"]
+                "Show quick-moderation as"
+            dd
+              select#display_quick_mod [name="default_options[display_quick_mod]"]
+                option [selected value="#"]
+                  "don’t show"
+                option [value="#"]
+                  "checkboxes"
+                option [value="#"]
+                  "icons"
+          hr
+          dl.settings
+            dt
+              strong
+                "Personal Messages"
+            dd
+            dt
+              label [for="popup_messages"]
+                "Show a popup when I receive new messages."
+            dd
+              input [name="default_options[popup_messages]" type="hidden" value="#"]
+              input#popup_messages [name="default_options[popup_messages]" type="checkbox" value="#"]
+            dt
+              label [for="view_newest_pm_first"]
+                "Show most recent personal messages at top"
+            dd
+              input [name="default_options[view_newest_pm_first]" type="hidden" value="#"]
+              input#view_newest_pm_first [name="default_options[view_newest_pm_first]" type="checkbox" value="#"]
+            dt
+              label [for="pm_remove_inbox_label"]
+                "Remove the inbox label when applying another label"
+            dd
+              input [name="default_options[pm_remove_inbox_label]" type="hidden" value="#"]
+              input#pm_remove_inbox_label [name="default_options[pm_remove_inbox_label]" type="checkbox" value="#"]
+          input.button.floatright [name="save" type="submit" value="Change profile"]
+          input [name="{token_var}" type="hidden" value="{hash}"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
+          input [name="u" type="hidden" value="#"]
+          input [name="sa" type="hidden" value="theme"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/profile_topics.txt b/tests/Integration/Http/Snapshot/snapshots/member/profile_topics.txt
new file mode 100644
index 00000000000..9ce3f13004c
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/profile_topics.txt
@@ -0,0 +1,299 @@
+status 200
+@ title
+title
+  "Topics - Snapshot Member"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile" itemprop="item"]
+        span [itemprop="name"]
+          "Profile of Snapshot Member"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts" itemprop="item"]
+        span [itemprop="name"]
+          "Show Posts"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics" itemprop="item"]
+        span [itemprop="name"]
+          "Topics"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    nav#genericmenu [aria-label=" Menu"]
+      a.mobile_generic_menu_1
+        span.menu_icon
+        span.text_menu
+          "Menu"
+      div#mobile_generic_menu_#.popup_container
+        div.description.popup_window
+          div.popup_heading
+            "Menu"
+            a.hide_popup.main_icons [href="javascript:void(#);"]
+          div.generic_menu
+            ul.dropdown_menu_1.dropmenu
+              li.subsections
+                a.active [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                  "{member}"
+                ul
+                  li
+                    a.administration.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=summary;u=#"]
+                      span.administration.main_icons
+                      "{member}"
+                  li
+                    a.profile_menu_icon.stats [href="{boardurl}/index.php?action=profile;area=statistics;u=#"]
+                      span.main_icons.stats
+                      "Show Stats"
+                  li.subsections
+                    a.chosen.posts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showposts;u=#"]
+                      span.main_icons.posts
+                      "Show Posts"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                          "Messages"
+                      li
+                        a.chosen [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                          "Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                          "Unwatched topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                          "Attachments"
+                  li
+                    a.drafts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showdrafts;u=#"]
+                      span.drafts.main_icons
+                      "Show Drafts"
+                  li
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=showalerts;u=#"]
+                      span.alerts.main_icons
+                      "Show Alerts"
+                  li.subsections
+                    a.logs.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=tracking;u=#"]
+                      span.logs.main_icons
+                      "Track User"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=tracking;sa=logins;u=#"]
+                          "Logins"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                  "Forum Profile"
+                ul
+                  li
+                    a.maintain.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=account;u=#"]
+                      span.main_icons.maintain
+                      "Account Settings"
+                  li
+                    a.members.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=forumprofile;u=#"]
+                      span.main_icons.members
+                      "Forum Profile"
+                  li
+                    a.features.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=theme;u=#"]
+                      span.features.main_icons
+                      "Look and Layout"
+                  li.subsections
+                    a.alerts.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=notification;u=#"]
+                      span.alerts.main_icons
+                      "Notifications"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=alerts;u=#"]
+                          "Notification Preferences"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=topics;u=#"]
+                          "Watched Topics"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=notification;sa=boards;u=#"]
+                          "Watched Boards"
+                  li.subsections
+                    a.frenemy.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=lists;u=#"]
+                      span.frenemy.main_icons
+                      "Buddies/Ignore List"
+                    ul
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=buddies;u=#"]
+                          "Edit Buddies"
+                      li
+                        a [href="{boardurl}/index.php?action=profile;area=lists;sa=ignore;u=#"]
+                          "Edit Ignore List"
+              li.subsections
+                a [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                  "Actions"
+                ul
+                  li
+                    a.members_delete.profile_menu_icon [href="{boardurl}/index.php?action=profile;area=deleteaccount;u=#"]
+                      span.main_icons.members_delete
+                      "Delete this account"
+    script
+      | $( ".mobile_generic_menu_#" ).click(function() { $( "#mobile_generic_menu_#" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#" ).hide(); });
+    div#admin_content
+      div.cat_bar
+        h3.catbg
+          span.icon.main_icons.profile_hd
+          "Show Posts"
+      p.information
+        "This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to."
+      a.mobile_generic_menu_1_tabs
+        span.menu_icon
+        span.text_menu
+          "Show Posts Menu"
+      div#adm_submenus
+        div#mobile_generic_menu_#_tabs.popup_container
+          div.description.popup_window
+            div.popup_heading
+              "Show Posts Menu"
+              a.hide_popup.main_icons [href="javascript:void(#);"]
+            div.generic_menu
+              ul.dropdown_menu_1_tabs.dropmenu
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=messages;u=#"]
+                    "Messages"
+                li
+                  a.active [href="{boardurl}/index.php?action=profile;area=showposts;sa=topics;u=#"]
+                    "Topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=unwatchedtopics;u=#"]
+                    "Unwatched topics"
+                li
+                  a [href="{boardurl}/index.php?action=profile;area=showposts;sa=attach;u=#"]
+                    "Attachments"
+      script
+        | $( ".mobile_generic_menu_#_tabs" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).show(); }); $( ".hide_popup" ).click(function() { $( "#mobile_generic_menu_#_tabs" ).hide(); });
+      div#profile_error.errorbox [style="display:none"]
+      div.cat_bar.cat_bar_round
+        h3.catbg
+          "Topics"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "A second topic in the child board."
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h4
+            strong
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+          span.smalltext
+            "{date}"
+        div.post
+          div.inner
+            "The first post, with"
+            strong
+              "bold"
+            ","
+            em
+              "italic"
+            ","
+            u
+              "underlined"
+            "and"
+            s
+              "struck"
+            "text."
+            br
+            a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+              "A link"
+            "and"
+            a.bbc_email [href="mailto:{email}"]
+              "{email}"
+            "."
+            br
+            blockquote.bbc_standard_quote
+              cite
+                "Quote"
+              "An unattributed quote."
+            div.codeheader
+              "Code"
+            pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+              code
+                "echo \"code\";"
+            ul.bbc_list
+              li
+                "One"
+              li
+                "Two"
+            span.bbc_color [style="color: red;"]
+              "Red"
+            span.bbc_size [style="font-size: #pt;"]
+              "Sized"
+            div.centertext
+              "Centred"
+            table.bbc_table
+              thead
+                tr
+                  th
+                    "A"
+                  th
+                    "B"
+              tbody
+            span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+              button [tabindex="#" title="Show or hide spoiler content" type="button"]
+              span
+                "Hidden"
+            hr.bbc_hr
+            "Smileys:"
+            img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+            img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+        ul.quickbuttons.quickbuttons_profile_showposts
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#.msg#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/recent.txt b/tests/Integration/Http/Snapshot/snapshots/member/recent.txt
new file mode 100644
index 00000000000..d88db15fc6f
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/recent.txt
@@ -0,0 +1,316 @@
+status 200
+@ title
+title
+  "Recent posts"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=recent;c=#" itemprop="item"]
+        span [itemprop="name"]
+          "Recent posts"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#recent.main_section
+      div#display_head.information
+        h2.display_title
+          span#top_subject
+            "Recent posts"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A second topic in the child board."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+          li.you_sure
+            a [data-confirm="Remove this post" href="{boardurl}/index.php?action=deletemsg;msg=#;topic=#;recent;{session_var}={session_id}"]
+              span.main_icons.remove_button
+              "Remove"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A topic in a child board."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "Another topic, so the board lists more than one."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A sticky, locked topic with a poll."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "A reply from another member, with a smiley"
+          img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          blockquote.bbc_standard_quote
+            cite
+              "Quote from: {member}"
+            "The quoted text."
+          "A reply from an administrator."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by Snapshot Guest on {date}"
+        div.list_posts
+          "A reply from a guest."
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.windowbg
+        div.floatright.page_number
+          "##"
+        div.topic_details
+          h5
+            a [href="{boardurl}/index.php?board=#"]
+              "{board}"
+            "/"
+            a [href="{boardurl}/index.php?msg=#" rel="nofollow"]
+              "{subject}"
+          span.smalltext
+            "Last post by"
+            a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+              "{member}"
+            "on {date}"
+        div.list_posts
+          "The first post, with"
+          strong
+            "bold"
+          ","
+          em
+            "italic"
+          ","
+          u
+            "underlined"
+          "and"
+          s
+            "struck"
+          "text."
+          br
+          a.bbc_link [href="https://www.simplemachines.org" rel="noopener" target="_blank"]
+            "A link"
+          "and"
+          a.bbc_email [href="mailto:{email}"]
+            "{email}"
+          "."
+          br
+          blockquote.bbc_standard_quote
+            cite
+              "Quote"
+            "An unattributed quote."
+          div.codeheader
+            "Code"
+          pre.bbc_code [data-expand-txt="Expand" data-select-txt="Select" data-shrink-txt="Shrink"]
+            code
+              "echo \"code\";"
+          ul.bbc_list
+            li
+              "One"
+            li
+              "Two"
+          span.bbc_color [style="color: red;"]
+            "Red"
+          span.bbc_size [style="font-size: #pt;"]
+            "Sized"
+          div.centertext
+            "Centred"
+          table.bbc_table
+            thead
+              tr
+                th
+                  "A"
+                th
+                  "B"
+            tbody
+          span.bbc_inline_spoiler [title="Show or hide spoiler content"]
+            button [tabindex="#" title="Show or hide spoiler content" type="button"]
+            span
+              "Hidden"
+          hr.bbc_hr
+          "Smileys:"
+          img.smiley [alt=":)" src="{boardurl}/Smileys/fugue/smiley.png" title="Smiley"]
+          img.smiley [alt=";)" src="{boardurl}/Smileys/fugue/wink.png" title="Wink"]
+        ul.quickbuttons.quickbuttons_recent
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#"]
+              span.main_icons.reply_button
+              "Reply"
+          li
+            a [href="{boardurl}/index.php?action=post;topic=#;quote=#"]
+              span.main_icons.quote
+              "Quote"
+      div.pagesection
+        div.pagelinks
+          span.pages
+            "Pages"
+          span.current_page
+            "#"
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/report_to_moderator.txt b/tests/Integration/Http/Snapshot/snapshots/member/report_to_moderator.txt
new file mode 100644
index 00000000000..5fe760f763e
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/report_to_moderator.txt
@@ -0,0 +1,56 @@
+status 200
+@ title
+title
+  "Report to moderator"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php#c#" itemprop="item"]
+        span [itemprop="name"]
+          "Snapshot fixtures"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?board=#" itemprop="item"]
+        span [itemprop="name"]
+          "{board}"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#preview_section.hidden
+      div.cat_bar
+        h3.catbg
+          span
+            "Preview"
+      div.windowbg
+        div#preview_body.post
+          br
+    div#report_form
+      form [accept-charset="UTF-#" action="{boardurl}/index.php?action=reporttm;msg=#;topic=#" method="post"]
+        input [name="msg" type="hidden" value="#"]
+        div.cat_bar
+          h3.catbg
+            "Report to moderator"
+        div.windowbg
+          div#error_box.errorbox.hidden
+          p.noticebox
+            "Use this function to inform the moderators and administrators of an abusive or problematic message."
+          dl#report_post.settings
+            dt
+              label [for="report_comment"]
+                "Enter comment"
+            dd
+              textarea#report_comment [maxlength="#" name="comment" type="text"]
+          input.button [name="preview" type="submit" value="Preview"]
+          input.button [name="save" type="submit" value="Submit"]
+          input [name="{session_var}" type="hidden" value="{session_id}"]
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/search.txt b/tests/Integration/Http/Snapshot/snapshots/member/search.txt
new file mode 100644
index 00000000000..c813eae7226
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/search.txt
@@ -0,0 +1,122 @@
+status 200
+@ title
+title
+  "Set Search Parameters"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#searchform [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post" name="searchform"]
+      div.cat_bar
+        h3.catbg
+          span.filter.main_icons
+          "Set Search Parameters"
+      div#advanced_search.roundframe
+        dl#search_options.settings
+          dt
+            strong
+              label [for="searchfor"]
+                "Search for"
+          dd
+            input#searchfor [maxlength="#" name="search" size="#" type="search"]
+            br
+            em.smalltext
+              em
+                "e.g."
+              "Orwell \"Animal Farm\" -movie"
+          dt
+            label [for="searchtype"]
+              "Match"
+          dd
+            select#searchtype [name="searchtype"]
+              option [selected value="#"]
+                "Match all words"
+              option [value="#"]
+                "Match any words"
+          dt
+            label [for="userspec"]
+              "By user"
+          dd
+            input#userspec [name="userspec" size="#" type="text" value="*"]
+          dt
+            label [for="sort"]
+              "Search order"
+          dd
+            select#sort [name="sort"]
+              option [value="relevance|desc"]
+                "Most relevant results first"
+              option [value="num_replies|desc"]
+                "Largest topics first"
+              option [value="num_replies|asc"]
+                "Smallest topics first"
+              option [value="id_msg|desc"]
+                "Most recent topics first"
+              option [value="id_msg|asc"]
+                "Oldest topics first"
+          dt.options.righttext
+            "Options"
+          dd.options
+            ul
+              li
+                label
+                  input#show_complete [name="show_complete" type="checkbox" value="#"]
+                  span
+                    "Show results as messages"
+              li
+                label
+                  input#subject_only [name="subject_only" type="checkbox" value="#"]
+                  span
+                    "Search in topic subjects only"
+          dt.between
+            "Message age"
+          dd
+            "between"
+            input#minage [max="#" min="#" name="minage" type="number" value="#"]
+            "and"
+            input#maxage [max="#" min="#" name="maxage" type="number" value="#"]
+            "days"
+        script
+          | window.addEventListener("load", initSearch, false);
+        input [name="advanced" type="hidden" value="#"]
+      fieldset.flow_hidden
+        div.alt.roundframe
+          details#advanced_panel
+            summary.title_bar.titlebg
+              "Choose boards to search in, or search all"
+            div.boardslist.flow_auto
+              ul
+                li
+                  a [href="javascript:void(#);" onclick="selectBoards([#, #, #, #], 'searchform'); return false;"]
+                    "Snapshot fixtures"
+                  ul
+                    li
+                      label [for="brd#"]
+                        input#brd# [checked name="brd[#]" type="checkbox" value="#"]
+                        "Snapshot board"
+                    li
+                      label [for="brd#"]
+                        input#brd# [checked name="brd[#]" type="checkbox" value="#"]
+                        "Snapshot empty board"
+          br.clear
+          div.padding
+            input#check_all [checked name="all" onclick="invertAll(this, this.form, 'brd');" type="checkbox" value]
+            label [for="check_all"]
+              em
+                "Select all"
+            input.button.floatright [name="b_search" type="submit" value="Search"]
+    script
+      | var oAddMemberSuggest = new smc_AutoSuggest({ sSessionId: smf_session_id, sSessionVar: smf_session_var, sControlId: 'userspec', sSearchType: 'member' });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/search_results.txt b/tests/Integration/Http/Snapshot/snapshots/member/search_results.txt
new file mode 100644
index 00000000000..87dc9ad5ad3
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/search_results.txt
@@ -0,0 +1,101 @@
+status 200
+@ title
+title
+  "Search Results"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search;params={params}" itemprop="item"]
+        span [itemprop="name"]
+          "Search"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=search#;params={params}" itemprop="item"]
+        span [itemprop="name"]
+          "Search Results"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    form#new_search [accept-charset="UTF-#" action="{boardurl}/index.php?action=search#" method="post" name="new_search"]
+      input [maxlength="#" name="search" size="#" type="hidden" value="bold"]
+      input [name="searchtype" type="hidden" value="#"]
+      input [name="userspec" type="hidden" value]
+      input [name="show_complete" type="hidden" value="#"]
+      input [name="subject_only" type="hidden" value="#"]
+      input [name="minage" type="hidden" value="#"]
+      input [name="maxage" type="hidden" value="#"]
+      input [name="sort" type="hidden" value="relevance"]
+      input [name="brd[#]" type="hidden" value="#"]
+    div#display_head.information
+      h2.display_title
+        span
+          "Search Results"
+      div.floatleft
+        a.button [href="{boardurl}/index.php?action=search;params={params}"]
+          "Adjust Search Parameters"
+      div.floatright
+        span.padding
+          "Search order"
+        select.floatright [form="new_search" name="sort" onchange="document.forms.new_search.submit()"]
+          option [selected value="relevance|desc"]
+            "Most relevant results first"
+          option [value="num_replies|desc"]
+            "Largest topics first"
+          option [value="num_replies|asc"]
+            "Smallest topics first"
+          option [value="id_msg|desc"]
+            "Most recent topics first"
+          option [value="id_msg|asc"]
+            "Oldest topics first"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+    div.windowbg
+      div.block
+        div.floatright.page_number
+          "##"
+        div.half_content
+          div.topic_details
+            h5
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+              "/"
+              a [href="{boardurl}/index.php?topic=#.msg##msg#"]
+                "{subject}"
+            span.smalltext
+              "{date} by"
+              strong
+                a [href="{boardurl}/index.php?action=profile;u=#" title="View the profile of {member}"]
+                  "{member}"
+      div.list_posts.word_break
+        strong
+          "......"
+        "first post, with"
+        mark.highlight
+          "bold"
+        ", italic, underlined and struck text. A link and"
+        strong
+          "......"
+    div.pagesection
+      div.pagelinks
+        span.pages
+          "Pages"
+        span.current_page
+          "#"
+      div#search_jump_to.floatright.pagelinks.smalltext
+      script
+        | window.addEventListener("DOMContentLoaded", function() { new JumpTo({ sContainerId: "search_jump_to", sJumpToTemplate: "<label class=\"smalltext jump_to\" for=\"%select_id%\">Jump to<" + "/label> %dropdown_list%", iCurBoardId: #, iCurBoardChildLevel: #, sCurBoardName: "Please select a destination", sBoardChildLevelIndicator: "==", sBoardPrefix: "=> ", sCatSeparator: "-----------------------------", sCatPrefix: "", sGoButtonLabel: "Go" }); });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/stats.txt b/tests/Integration/Http/Snapshot/snapshots/member/stats.txt
new file mode 100644
index 00000000000..1ca785edae8
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/stats.txt
@@ -0,0 +1,204 @@
+status 200
+@ title
+title
+  "{forum_name} - Statistics Center"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=stats" itemprop="item"]
+        span [itemprop="name"]
+          "Statistics Center"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#statistics.main_section
+      div.cat_bar
+        h3.catbg
+          "{forum_name} - Statistics Center"
+      div.roundframe
+        div.title_bar
+          h4.titlebg
+            span.general.main_icons
+            "General Statistics"
+        dl.half_content.stats
+          dt
+            "Total Members"
+          dd
+            a [href="{boardurl}/index.php?action=mlist"]
+              "#"
+          dt
+            "Total Posts"
+          dd
+            "#"
+          dt
+            "Total Topics"
+          dd
+            "#"
+          dt
+            "Total Categories"
+          dd
+            "#"
+          dt
+            "Users Online"
+          dd
+            "#"
+          dt
+            "Most Online"
+          dd
+            "# on(s) {date}"
+          dt
+            "Online today"
+          dd
+            "#"
+        dl.half_content.stats
+          dt
+            "Average registrations per day"
+          dd
+            "#"
+          dt
+            "Average posts per day"
+          dd
+            "#"
+          dt
+            "Average topics per day"
+          dd
+            "#"
+          dt
+            "Total Boards"
+          dd
+            "#"
+          dt
+            "Latest Member"
+          dd
+            a [href="{boardurl}/index.php?action=profile;u=#"]
+              "{member}"
+          dt
+            "Average online per day"
+          dd
+            "#"
+          dt
+            "Gender stats"
+          dd
+            "None: #"
+            br
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.posters
+              "Top # Poster(s)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.boards.main_icons
+              "Top # Board(s)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?board=#"]
+                "{board}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.topics_replies
+              "Top # Topic(s) (by Replies)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?topic=#"]
+                "{subject}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.topics_views
+              "Top # Topic(s) (by Views)"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?topic=#"]
+                "{subject}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.starters
+              "Top Topic Starters"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+                "#"
+        div.half_content
+          div.title_bar
+            h4.titlebg
+              span.main_icons.time_online
+              "Most Time Online"
+          dl.stats
+            dt
+              a [href="{boardurl}/index.php?action=profile;u=#"]
+                "{member}"
+            dd.generic_bar.righttext.statsbar
+              snapshot-ignored [selector=".statsbar > .bar"]
+              span
+      br.clear
+      div.cat_bar
+        h3.catbg
+          span.history.main_icons
+          "Forum History (using forum time offset)"
+      table#stats.table_grid
+        thead
+          tr.title_bar
+            th.lefttext
+              "Yearly Summary"
+            th
+              "New Topics"
+            th
+              "New Posts"
+            th
+              "New Members"
+            th
+              "Most Online"
+        tbody
+          tr#year_#.windowbg
+            th.lefttext
+              img#year_img_# [alt="*" src="{boardurl}/Themes/default/images/selected_open.png"]
+              a#year_link_# [href="#year_#"]
+                "#"
+            th
+              "#"
+          tr#tr_month_#.windowbg
+            th.stats_month
+              img#img_# [alt src="{boardurl}/Themes/default/images/selected.png"]
+              a#m# [href="{boardurl}/index.php?action=stats;expand=##m#" onclick="return doingExpandCollapse;"]
+                "{date}"
+            th
+              "#"
+    script
+      | var oStatsCenter = new smf_StatsCenter({ sTableId: 'stats', reYearPattern: /year_(\d+)/, sYearImageCollapsed: 'selected.png', sYearImageExpanded: 'selected_open.png', sYearImageIdPrefix: 'year_img_', sYearLinkIdPrefix: 'year_link_', reMonthPattern: /tr_month_(\d+)/, sMonthImageCollapsed: 'selected.png', sMonthImageExpanded: 'selected_open.png', sMonthImageIdPrefix: 'img_', sMonthLinkIdPrefix: 'm', reDayPattern: /tr_day_(\d+-\d+-\d+)/, sDayRowClassname: 'windowbg', sDayRowIdPrefix: 'tr_day_', aCollapsedYears: [ ], aDataCells: [ 'date', 'new_topics', 'new_posts', 'new_members', 'most_members_online' ] });
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/theme_picker.txt b/tests/Integration/Http/Snapshot/snapshots/member/theme_picker.txt
new file mode 100644
index 00000000000..4ad5f2aa801
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/theme_picker.txt
@@ -0,0 +1,5 @@
+status 302
+location {boardurl}/index.php?action=themechooser
+(nothing matches title)
+(nothing matches .navigate_section)
+(nothing matches #content_section)
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/unread.txt b/tests/Integration/Http/Snapshot/snapshots/member/unread.txt
new file mode 100644
index 00000000000..5968ef3a086
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/unread.txt
@@ -0,0 +1,33 @@
+status 200
+@ title
+title
+  "Recent Unread Topics"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=unread;boards=#;start=#" itemprop="item"]
+        span [itemprop="name"]
+          "Recent Unread Topics"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#recent.main_content
+      div#display_head.information
+        h2.display_title
+          span
+            "Recent Unread Topics"
+      div.infobox
+        p.centertext
+          "No unread topics found since your last visit."
+          a [href="{boardurl}/index.php?action=unread;all;boards=#;start=#"]
+            "Click here to try all unread topics"
+          "."
diff --git a/tests/Integration/Http/Snapshot/snapshots/member/unread_replies.txt b/tests/Integration/Http/Snapshot/snapshots/member/unread_replies.txt
new file mode 100644
index 00000000000..d6cd5b64614
--- /dev/null
+++ b/tests/Integration/Http/Snapshot/snapshots/member/unread_replies.txt
@@ -0,0 +1,30 @@
+status 200
+@ title
+title
+  "Updated Topics"
+@ .navigate_section
+nav.navigate_section [aria-label="Breadcrumb"]
+  ol [itemscope itemtype="https://schema.org/BreadcrumbList"]
+    li [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      a [href="{boardurl}/index.php" itemprop="item"]
+        span [itemprop="name"]
+          "{forum_name}"
+      meta [content="#" itemprop="position"]
+    li.last [itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"]
+      span.dividers
+        "►"
+      a [href="{boardurl}/index.php?action=unreadreplies;boards=#;start=#" itemprop="item"]
+        span [itemprop="name"]
+          "Updated Topics"
+      meta [content="#" itemprop="position"]
+@ #content_section
+div#content_section
+  main#main_content_section
+    div#recent
+      div#display_head.information
+        h2.display_title
+          span
+            "Updated Topics"
+      div.infobox
+        p.centertext
+          "No updated topics found since your last visit."
diff --git a/tests/Integration/Http/ThemeCopyListTest.php b/tests/Integration/Http/ThemeCopyListTest.php
index feaea2c111a..2baa421483b 100644
--- a/tests/Integration/Http/ThemeCopyListTest.php
+++ b/tests/Integration/Http/ThemeCopyListTest.php
@@ -36,7 +36,7 @@ public function testThePageLogsNothing(): void
 
 		$page = $this->fetch('?action=admin;area=theme;th=1;sa=copy');
 
-		$this->assertStringContainsString('Stats.template.php', $page->text(), 'the copy page does not list the templates. The forum said: ' . $page->errorText());
+		$this->assertStringContainsString('templates/Stats/', $page->text(), 'the copy page does not list the templates. The forum said: ' . $page->errorText());
 
 		$this->assertNoErrorsLogged('the copy page logged something.' . "\n");
 	}
diff --git a/tests/Integration/Http/ThemeCopyTest.php b/tests/Integration/Http/ThemeCopyTest.php
index b88fcf7dfe7..a150038bb9e 100644
--- a/tests/Integration/Http/ThemeCopyTest.php
+++ b/tests/Integration/Http/ThemeCopyTest.php
@@ -7,32 +7,22 @@
 use PHPUnit\Framework\Attributes\CoversNothing;
 use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
+use SMF\TemplateEngine;
 use SMF\Tests\Support\HttpResponse;
 
 /**
- * Copying one of the default theme's templates into a theme, from the admin
- * panel.
+ * Copying a template written for Plates into a theme, from the admin panel.
  *
- * The copy opens the destination for writing, which empties it, and only then
- * reads the file being copied. So it must never be asked to copy a file onto
- * itself, and a link that makes it do so must not be forgeable.
+ * The page offers every template the default theme has so that a theme author
+ * can start from it. A Plates template is a directory rather than a file, and
+ * is copied whole.
  *
- * The theme copied into is made for the test, in a directory of its own under
- * Themes, and removed again afterwards along with its rows. A default template
- * that a regression manages to empty is put back from the copy taken first.
+ * The theme this copies into is made for the test, in a directory of its own
+ * under Themes, and removed again afterwards along with its rows.
  */
 #[CoversNothing]
 class ThemeCopyTest extends HttpTestCase
 {
-	/*****************
-	 * Class constants
-	 *****************/
-
-	/**
-	 * @var string The default template the tests copy.
-	 */
-	private const TEMPLATE = 'Stats';
-
 	/*********************
 	 * Internal properties
 	 *********************/
@@ -47,81 +37,104 @@ class ThemeCopyTest extends HttpTestCase
 	 */
 	private string $theme_dir = '';
 
-	/**
-	 * @var ?string The default template as it was before the test.
-	 */
-	private ?string $original = null;
-
 	/****************
 	 * Public methods
 	 ****************/
 
-	public function testATemplateIsCopiedIntoATheme(): void
+	/**
+	 * A Plates template is copied into a theme as a whole directory.
+	 *
+	 * Expected: following the copy link for Stats copies its main.php and an
+	 *           index.php into the theme's Stats directory, leaves an index.php
+	 *           in the new templates directory, lists Stats as already existing
+	 *           and logs nothing.
+	 */
+	public function testAPlatesTemplateIsCopiedWhole(): void
 	{
 		$this->makeTheme();
 		$this->signInAsAdminPastThePrompt();
 
 		$page = $this->fetch('?action=admin;area=theme;th=' . $this->theme_id . ';sa=copy');
-		$link = $this->copyLink($page);
+		$link = $this->copyLink($page, 'Stats');
 
-		$this->assertNotNull($link, 'the copy page offers no way to copy ' . self::TEMPLATE . '.template.php');
+		$this->assertNotNull($link, 'the copy page offers no way to copy the Stats template');
 
 		$this->http->get($link);
 
-		$this->assertFileEquals($this->defaultTemplate(), $this->theme_dir . '/' . self::TEMPLATE . '.template.php');
+		$source = Config::$boarddir . '/Themes/default/' . TemplateEngine::DIRECTORY . '/Stats';
+		$target = $this->theme_dir . '/' . TemplateEngine::DIRECTORY . '/Stats';
+
+		$this->assertFileEquals($source . '/main.php', $target . '/main.php');
+		$this->assertFileExists($target . '/index.php');
+		$this->assertFileExists(\dirname($target) . '/index.php', 'the new templates directory is left listable');
+
+		$after = $this->fetch('?action=admin;area=theme;th=' . $this->theme_id . ';sa=copy');
+
+		$this->assertStringContainsString(
+			TemplateEngine::DIRECTORY . '/Stats/ (already exists)',
+			$after->text(),
+			'the copy page does not see the template it just copied',
+		);
 
 		$this->assertNoErrorsLogged('copying a template logged something.' . "\n");
 	}
 
 	/**
-	 * The default theme is where the templates are copied from, so copying
-	 * into it would empty the template before reading it. The page offers no
-	 * link to do it, but the request can still be made.
+	 * The default theme's templates cannot be copied onto themselves.
+	 *
+	 * Expected: the default theme's copy page offers no link for Stats, and
+	 *           ?action=admin;area=theme;th=1;sa=copy;template=Stats with the
+	 *           session leaves the template as it was.
+	 * Guards:   the default theme is where the templates are copied from.
+	 *           Copying them onto themselves opens each file for writing, which
+	 *           empties it, before it is read.
+	 *
+	 * @link https://github.com/SimpleMachines/SMF/pull/9717
 	 */
-	public function testTheDefaultThemeIsNeverCopiedOntoItself(): void
+	public function testTheDefaultThemeCannotBeCopiedOntoItself(): void
 	{
 		$this->signInAsAdminPastThePrompt();
 
 		$page = $this->fetch('?action=admin;area=theme;th=1;sa=copy');
 
-		$this->http->get('?action=admin;area=theme;th=1;sa=copy;template=' . self::TEMPLATE . ';' . $this->sessionQuery($page));
+		$this->assertNull($this->copyLink($page, 'Stats'), 'the default theme is offered a copy of its own template');
+
+		$file = Config::$boarddir . '/Themes/default/' . TemplateEngine::DIRECTORY . '/Stats/main.php';
+		$before = file_get_contents($file);
+
+		$this->http->get('?action=admin;area=theme;th=1;sa=copy;template=Stats;' . $this->sessionQuery($page));
 
 		clearstatcache();
 
-		$this->assertSame($this->original, file_get_contents($this->defaultTemplate()), 'copying the default theme onto itself emptied the template');
+		$this->assertSame($before, file_get_contents($file), 'copying the default theme onto itself changed the template');
 	}
 
 	/**
-	 * The link carries the session. Without the check, any page an admin
-	 * visited could make the request for them.
+	 * Copying a template needs the session.
+	 *
+	 * Expected: ?action=admin;area=theme;th=N;sa=copy;template=Stats without the
+	 *           session copies nothing.
+	 * Guards:   the link carries the session, and a request without it could be
+	 *           forged by any page an administrator visits.
+	 *
+	 * @link https://github.com/SimpleMachines/SMF/pull/9717
 	 */
 	public function testCopyingNeedsTheSession(): void
 	{
 		$this->makeTheme();
 		$this->signInAsAdminPastThePrompt();
 
-		$this->http->get('?action=admin;area=theme;th=' . $this->theme_id . ';sa=copy;template=' . self::TEMPLATE);
+		$this->http->get('?action=admin;area=theme;th=' . $this->theme_id . ';sa=copy;template=Stats');
 
-		$this->assertFileDoesNotExist($this->theme_dir . '/' . self::TEMPLATE . '.template.php');
+		$this->assertDirectoryDoesNotExist($this->theme_dir . '/' . TemplateEngine::DIRECTORY . '/Stats');
 	}
 
 	/******************
 	 * Internal methods
 	 ******************/
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->original = file_get_contents($this->defaultTemplate());
-	}
-
 	protected function tearDown(): void
 	{
-		if ($this->original !== null && file_get_contents($this->defaultTemplate()) !== $this->original) {
-			file_put_contents($this->defaultTemplate(), $this->original);
-		}
-
 		if ($this->theme_id !== 0) {
 			Db::$db->query(
 				'DELETE FROM {db_prefix}themes
@@ -133,10 +146,13 @@ protected function tearDown(): void
 		}
 
 		if ($this->theme_dir !== '' && is_dir($this->theme_dir)) {
-			foreach (new \DirectoryIterator($this->theme_dir) as $file) {
-				if ($file->isFile()) {
-					unlink($file->getPathname());
-				}
+			$files = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($this->theme_dir, \FilesystemIterator::SKIP_DOTS),
+				\RecursiveIteratorIterator::CHILD_FIRST,
+			);
+
+			foreach ($files as $file) {
+				$file->isDir() ? rmdir($file->getPathname()) : unlink($file->getPathname());
 			}
 
 			rmdir($this->theme_dir);
@@ -145,28 +161,18 @@ protected function tearDown(): void
 		parent::tearDown();
 	}
 
-	/**
-	 * The default theme's copy of the template.
-	 *
-	 * @return string Its path.
-	 */
-	private function defaultTemplate(): string
-	{
-		return Config::$boarddir . '/Themes/default/' . self::TEMPLATE . '.template.php';
-	}
-
 	/**
 	 * Makes an empty theme for the test to copy into.
 	 */
 	private function makeTheme(): void
 	{
-		$name = 'copy_test_' . bin2hex(random_bytes(4));
+		$name = 'plates_copy_test_' . bin2hex(random_bytes(4));
 
 		$this->theme_dir = Config::$boarddir . '/Themes/' . $name;
 
 		mkdir($this->theme_dir);
 
-		// The web server may run as another user than this test does.
+		// The web server runs as another user than this test may.
 		chmod($this->theme_dir, 0o777);
 
 		$row = $this->queryRow('SELECT COALESCE(MAX(id_theme), 0) + 1 AS id FROM {db_prefix}themes');
@@ -209,17 +215,18 @@ private function signInAsAdminPastThePrompt(): void
 	}
 
 	/**
-	 * Finds the link that copies the template.
+	 * Finds the link that copies a template.
 	 *
 	 * @param HttpResponse $page The copy page.
+	 * @param string $template The template's name.
 	 * @return ?string The link, or null if the page offers none.
 	 */
-	private function copyLink(HttpResponse $page): ?string
+	private function copyLink(HttpResponse $page, string $template): ?string
 	{
 		foreach ($page->xpath('//a[contains(@href, "sa=copy;template=")]') as $link) {
 			$href = html_entity_decode($link->getAttribute('href'));
 
-			if (str_ends_with($href, 'template=' . self::TEMPLATE)) {
+			if (str_ends_with($href, 'template=' . $template)) {
 				return $href;
 			}
 		}
diff --git a/tests/Support/DomSnapshot.php b/tests/Support/DomSnapshot.php
new file mode 100644
index 00000000000..74f82ded48b
--- /dev/null
+++ b/tests/Support/DomSnapshot.php
@@ -0,0 +1,581 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Support;
+
+/**
+ * Turns a rendered page into a stable text description of what the templates
+ * produced, for comparing against a copy taken earlier.
+ *
+ * The aim is to notice any change in what the templates emit while ignoring
+ * everything that changes between two renders of the same templates. Each of the
+ * rules below exists because one of those things would otherwise show up as a
+ * difference:
+ *
+ *  - Whitespace, comments, attribute order and class order are not recorded.
+ *    Rewriting a template in another engine reflows all of them, and none of
+ *    them change what the page is.
+ *  - The board URL, the session, security tokens and hashes are replaced by
+ *    placeholders, since they differ per forum and per visit.
+ *  - Dates and times are replaced by {date}, lengths of time by {duration},
+ *    and every other run of digits by #. Counts, ids and timestamps are the
+ *    forum's data, not the template's.
+ *  - The word after a count is written the same whether it is singular or
+ *    plural - "# reply(s)" - since the count decides which one appears.
+ *  - The text of a link to a profile, a board or a topic is replaced by
+ *    {member}, {board} or {subject}, and so is that same text wherever else it
+ *    appears on the page. Names and subjects are data too.
+ *  - A sibling, or a group of siblings, that repeats the one right before it
+ *    is left out. After the masking above, ten rows of a list look the same,
+ *    so a list reads the same whether it holds two rows or two hundred.
+ *
+ * What is left is the structure of the page, the attributes on it and the text
+ * the templates and language files put there, which is what a template
+ * conversion has to keep.
+ *
+ * The price of the last rule is that an element emitted twice in a row where it
+ * used to be emitted once is not noticed. Everything else about a list - a column
+ * lost, a class misspelt, a string gone missing - still is.
+ */
+final class DomSnapshot
+{
+	/*****************
+	 * Class constants
+	 *****************/
+
+	/**
+	 * Elements whose text is code rather than prose, and is recorded verbatim
+	 * apart from the masking.
+	 */
+	private const RAW_TEXT = ['script', 'style'];
+
+	/**
+	 * The longest group of siblings recognised as repeating. See
+	 * withoutRepeats().
+	 */
+	private const MAX_PERIOD = 4;
+
+	/**
+	 * Attributes that hold URLs. Names are never substituted into these, since a
+	 * member called "admin" would otherwise turn every ?action=admin link into
+	 * ?action={member}.
+	 */
+	private const URL_ATTRIBUTES = ['href', 'src', 'action', 'srcset', 'formaction', 'data-src', 'content'];
+
+	/**
+	 * Month names and abbreviations, for recognising a formatted date.
+	 */
+	private const MONTHS = 'January|February|March|April|May|June|July|August|September|October|November|December'
+		. '|Jan|Feb|Mar|Apr|Jun|Jul|Aug|Sep|Sept|Oct|Nov|Dec';
+
+	/*********************
+	 * Internal properties
+	 *********************/
+
+	/**
+	 * @var array Literal strings to replace, longest first, string => placeholder.
+	 */
+	private array $literals = [];
+
+	/**
+	 * @var array Names and subjects found on the page, longest first,
+	 *     string => placeholder.
+	 */
+	private array $vocabulary = [];
+
+	/**
+	 * @var \SplObjectStorage Elements whose children are compared sorted.
+	 *
+	 * Not a WeakMap. PHP makes a new object for a DOM node whenever nothing is
+	 * holding the last one, so a map that does not hold them itself finds none
+	 * of them again by the time the tree is walked.
+	 */
+	private \SplObjectStorage $unordered;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * @param array $literals Strings known in advance to vary, such as the
+	 *     board URL, as string => placeholder.
+	 */
+	public function __construct(array $literals = [])
+	{
+		foreach ($literals as $literal => $placeholder) {
+			if ((string) $literal !== '') {
+				$this->literals[(string) $literal] = $placeholder;
+			}
+		}
+	}
+
+	/**
+	 * Describes the parts of a page picked out by the given selectors.
+	 *
+	 * @param string $html The page.
+	 * @param array $roots CSS selectors for what to describe. Every match of
+	 *     every selector is described, in document order within a selector.
+	 * @param array $ignore CSS selectors for what to leave out. Each match is
+	 *     replaced with a marker, so that it is visible in the snapshot that
+	 *     something was there.
+	 * @param array $masks CSS selectors for elements whose text is the forum's
+	 *     data rather than anything a template wrote, such as a member's post
+	 *     group. The element is kept and its text becomes {text}.
+	 * @param array $only For lists that show everything on the forum, such as
+	 *     a picker of every board: CSS selector => text. An element matching
+	 *     the selector is left out unless its text, or its label, contains the
+	 *     given text, or always when the text is null. Nothing marks where it
+	 *     was, since how many there were, or whether there was one at all, is
+	 *     the forum's business.
+	 * @param array $unordered CSS selectors for elements whose children come in
+	 *     whatever order the database returned them, which is not the same on
+	 *     MySQL as on PostgreSQL. Their children are compared sorted.
+	 * @return string The description, one node per line.
+	 */
+	public function describe(string $html, array $roots, array $ignore = [], array $masks = [], array $only = [], array $unordered = []): string
+	{
+		// A date from today or yesterday is written "<strong>Today</strong> at
+		// 10:00", and any other as "Jan 15, 2020, 10:00". Which one a page gets
+		// depends on when it is looked at, so the markup is taken out of the
+		// first for the date rule to treat both alike.
+		$html = (string) preg_replace('~<strong>(Today|Yesterday)</strong>~', '$1', $html);
+
+		$document = \Dom\HTMLDocument::createFromString($html, LIBXML_NOERROR);
+
+		$this->collectLiterals($document);
+		$this->collectVocabulary($document);
+
+		foreach ($ignore as $selector) {
+			foreach ($document->querySelectorAll($selector) as $node) {
+				$marker = $document->createElement('snapshot-ignored');
+				$marker->setAttribute('selector', $selector);
+				$node->replaceWith($marker);
+			}
+		}
+
+		foreach ($masks as $selector) {
+			foreach ($document->querySelectorAll($selector) as $node) {
+				$node->textContent = '{text}';
+			}
+		}
+
+		foreach ($only as $selector => $needle) {
+			foreach ($document->querySelectorAll($selector) as $node) {
+				if ($needle === null || !str_contains($node->textContent . ' ' . $node->getAttribute('label'), $needle)) {
+					$node->remove();
+				}
+			}
+		}
+
+		$this->unordered = new \SplObjectStorage();
+
+		foreach ($unordered as $selector) {
+			foreach ($document->querySelectorAll($selector) as $node) {
+				$this->unordered->attach($node);
+			}
+		}
+
+		$out = [];
+
+		foreach ($roots as $selector) {
+			$found = $document->querySelectorAll($selector);
+
+			if ($found->length === 0) {
+				$out[] = '(nothing matches ' . $selector . ')';
+
+				continue;
+			}
+
+			foreach ($found as $node) {
+				// Masked like anything else, since a selector may name a fixture
+				// by its id, and the ids differ from forum to forum.
+				$out[] = '@ ' . $this->mask($selector, true);
+				array_push($out, ...$this->node($node, 0));
+			}
+		}
+
+		return implode("\n", $out) . "\n";
+	}
+
+	/**
+	 * Applies the masking rules to a string on its own.
+	 *
+	 * @param string $value The text or attribute value.
+	 * @param bool $is_url Whether it is a URL, where names are left alone.
+	 * @return string The masked value.
+	 */
+	public function mask(string $value, bool $is_url = false): string
+	{
+		$value = strtr($value, $this->literals);
+
+		// An address is always somebody's data: a member's, or the one the
+		// forum was installed with.
+		$value = (string) preg_replace('~[\w.+-]+@[\w-]+(?:\.[\w-]+)+~u', '{email}', $value);
+
+		// A search is carried from page to page encoded in one parameter, which
+		// holds the ids of the boards it was narrowed to.
+		$value = (string) preg_replace('~(?<=[?;&])params=[^;&#"\s]+~', 'params={params}', $value);
+
+		if (!$is_url && $this->vocabulary !== []) {
+			foreach ($this->vocabulary as $word => $placeholder) {
+				$value = (string) preg_replace('~(?<![\w{])' . preg_quote((string) $word, '~') . '(?![\w}])~u', $placeholder, $value);
+			}
+		}
+
+		// Formatted dates, in the forms the default time formats produce, and
+		// the relative forms used for recent ones.
+		$value = (string) preg_replace(self::datePatterns(), '{date}', $value);
+
+		// Hashes: session ids, security tokens, minified file names, cache
+		// busters. Anything long and hexadecimal is not something a template
+		// chose.
+		// Bounded by what is not hexadecimal rather than by \b, since the name of
+		// a minified file puts an underscore in front of it, and an underscore
+		// is a word character.
+		$value = (string) preg_replace('~(?<![a-f0-9])[a-f0-9]{32,}(?![a-f0-9])~i', '{hash}', $value);
+
+		// Added to a link to the latest post when its board has not been seen,
+		// which is the viewer's business.
+		$value = str_replace(';boardseen', '', $value);
+
+		// A token in a query string: a random name paired with a hash.
+		$value = (string) preg_replace('~\b[a-z0-9]{5,16}=\{hash\}~i', '{token}', $value);
+
+		// Everything else numeric. An average reads 3 on one forum and 2.5 on
+		// another, and a total 999 on one and 1,000 on another, so the
+		// separators go with the digits.
+		$value = (string) preg_replace('~\d+(?:[.,]\d+)*~', '#', $value);
+
+		// Lengths of time, which grow a unit as they grow: "5 minutes", then
+		// "1 hour and 5 minutes".
+		$value = (string) preg_replace(
+			'~#\s(?:second|minute|hour|day|week|month|year)s?(?:(?:,\s|,?\sand\s)#\s(?:second|minute|hour|day|week|month|year)s?)*~u',
+			'{duration}',
+			$value,
+		);
+
+		// A count decides between "1 reply" and "2 replies", and the count is
+		// data, so the word that follows it is recorded in a form that reads
+		// the same either way.
+		return (string) preg_replace_callback(
+			'~(#\s)([A-Za-z]{2,}?)(ies|y|es|s)?\b~',
+			static function (array $match): string {
+				[, $count, $stem] = $match;
+
+				$singular = match ($match[3] ?? '') {
+					'ies', 'y' => $stem . 'y',
+					'es' => preg_match('~(?:s|x|z|ch|sh)$~', $stem) ? $stem : $stem . 'e',
+					default => $stem,
+				};
+
+				return $count . $singular . '(s)';
+			},
+			$value,
+		);
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	/**
+	 * Describes one node and everything under it.
+	 *
+	 * @param \Dom\Node $node The node.
+	 * @param int $depth How far to indent.
+	 * @return array The lines.
+	 */
+	private function node(\Dom\Node $node, int $depth): array
+	{
+		if ($node instanceof \Dom\Text) {
+			$text = trim((string) preg_replace('~\s+~u', ' ', (string) $node->data));
+
+			return $text === '' ? [] : [str_repeat('  ', $depth) . json_encode($this->mask($text), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)];
+		}
+
+		if (!$node instanceof \Dom\Element) {
+			return [];
+		}
+
+		$lines = [str_repeat('  ', $depth) . $this->label($node)];
+
+		if (\in_array($node->localName, self::RAW_TEXT, true)) {
+			$code = trim((string) preg_replace('~\s+~u', ' ', (string) $node->textContent));
+
+			if ($code !== '') {
+				$lines[] = str_repeat('  ', $depth + 1) . '| ' . $this->mask($code, true);
+			}
+
+			return $lines;
+		}
+
+		// Text split across several nodes - by a comment, say - reads the same
+		// as text that is not, so adjacent text is joined before it is written.
+		$children = [];
+		$pending = '';
+
+		foreach ($node->childNodes as $child) {
+			if ($child instanceof \Dom\Comment) {
+				continue;
+			}
+
+			if ($child instanceof \Dom\Text) {
+				$pending .= $child->data;
+
+				continue;
+			}
+
+			if ($pending !== '') {
+				$children[] = ['text', $this->textLines($pending, $depth + 1)];
+				$pending = '';
+			}
+
+			$children[] = ['element', $this->node($child, $depth + 1)];
+		}
+
+		if ($pending !== '') {
+			$children[] = ['text', $this->textLines($pending, $depth + 1)];
+		}
+
+		$keys = [];
+
+		foreach ($children as [, $child_lines]) {
+			if ($child_lines !== []) {
+				$keys[] = implode("\n", $child_lines);
+			}
+		}
+
+		if ($this->unordered->contains($node)) {
+			sort($keys);
+		}
+
+		// Repeated siblings are recorded once. See the class description.
+		foreach (self::withoutRepeats($keys) as $key) {
+			$lines[] = $key;
+		}
+
+		return $lines;
+	}
+
+	/**
+	 * Describes a run of text.
+	 *
+	 * @param string $text The text.
+	 * @param int $depth How far to indent.
+	 * @return array Nothing, or one line.
+	 */
+	private function textLines(string $text, int $depth): array
+	{
+		$text = trim((string) preg_replace('~\s+~u', ' ', $text));
+
+		return $text === '' ? [] : [str_repeat('  ', $depth) . json_encode($this->mask($text), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)];
+	}
+
+	/**
+	 * The one line that stands for an element: tag, id, classes and attributes.
+	 *
+	 * @param \Dom\Element $element The element.
+	 * @return string The line, without indentation.
+	 */
+	private function label(\Dom\Element $element): string
+	{
+		$label = $element->localName;
+
+		$id = $element->getAttribute('id');
+
+		if ($id !== null && $id !== '') {
+			$label .= '#' . $this->mask($id, true);
+		}
+
+		$classes = preg_split('~\s+~', trim((string) $element->getAttribute('class')), -1, PREG_SPLIT_NO_EMPTY) ?: [];
+		sort($classes);
+
+		foreach ($classes as $class) {
+			$label .= '.' . $class;
+		}
+
+		$attributes = [];
+
+		foreach ($element->attributes as $attribute) {
+			$name = $attribute->name;
+
+			if ($name === 'id' || $name === 'class') {
+				continue;
+			}
+
+			$attributes[$name] = $attribute->value === ''
+				? $name
+				: $name . '=' . json_encode($this->mask($attribute->value, \in_array($name, self::URL_ATTRIBUTES, true)), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+		}
+
+		ksort($attributes);
+
+		return $attributes === [] ? $label : $label . ' [' . implode(' ', $attributes) . ']';
+	}
+
+	/**
+	 * Finds the session, which is on every page, so that it can be replaced as
+	 * a literal wherever it appears - in a URL, a hidden field or a script.
+	 *
+	 * @param \Dom\HTMLDocument $document The page.
+	 */
+	private function collectLiterals(\Dom\HTMLDocument $document): void
+	{
+		foreach ($document->querySelectorAll('script') as $script) {
+			if (preg_match('~smf_session_var\s*=\s*["\']([^"\']+)~', (string) $script->textContent, $var)) {
+				$this->literals[$var[1]] = '{session_var}';
+			}
+
+			if (preg_match('~smf_session_id\s*=\s*["\']([^"\']+)~', (string) $script->textContent, $id)) {
+				$this->literals[$id[1]] = '{session_id}';
+			}
+		}
+
+		// A hidden field whose value is a hash has a random name as well: the
+		// session check, or a security token.
+		foreach ($document->querySelectorAll('input[type="hidden"]') as $input) {
+			$value = (string) $input->getAttribute('value');
+			$name = (string) $input->getAttribute('name');
+
+			if ($name !== '' && preg_match('~^[a-f0-9]{32,}$~i', $value) && preg_match('~^[a-z0-9]{5,16}$~i', $name)) {
+				$this->literals[$name] ??= '{token_var}';
+			}
+		}
+
+		uksort($this->literals, static fn($a, $b) => \strlen((string) $b) <=> \strlen((string) $a));
+	}
+
+	/**
+	 * Collects the names of members, boards and topics that the page links to.
+	 *
+	 * @param \Dom\HTMLDocument $document The page.
+	 */
+	private function collectVocabulary(\Dom\HTMLDocument $document): void
+	{
+		$patterns = [
+			'{member}' => '~[?;&]action=profile(?:;area=summary)?;u=\d+$~',
+			'{board}' => '~[?;&]board=\d+\.\d+$~',
+			'{subject}' => '~[?;&](?:topic=\d+\.(?:\d+|msg\d+|new)(?:;boardseen)?(?:#\w+)?|msg=\d+)$~',
+		];
+
+		foreach ($document->querySelectorAll('a[href]') as $link) {
+			$href = (string) $link->getAttribute('href');
+
+			foreach ($patterns as $placeholder => $pattern) {
+				// A board or topic link is one with nothing else in its query
+				// string. The print button ends in ;topic=1.0 as well, and its
+				// text is "Print", not a subject.
+				if ($placeholder !== '{member}' && str_contains($href, 'action=')) {
+					continue;
+				}
+
+				if (!preg_match($pattern, $href)) {
+					continue;
+				}
+
+				// Long subjects are shortened in the link text and given in full
+				// in the title, so both are data. Other links' titles are
+				// sentences such as "New Posts", which are not.
+				$candidates = [(string) $link->textContent];
+
+				if ($placeholder === '{subject}' && str_contains($href, 'topic=')) {
+					$candidates[] = (string) $link->getAttribute('title');
+				}
+
+				foreach ($candidates as $text) {
+					$text = trim((string) preg_replace('~\s+~u', ' ', $text));
+
+					// A post's own link is often its time, which the date rule
+					// deals with, and which must not become a {subject}.
+					if (mb_strlen($text) < 2 || preg_replace(self::datePatterns(), '', $text) !== $text) {
+						continue;
+					}
+
+					$this->vocabulary[$text] ??= $placeholder;
+
+					// "Re: Subject" and "Subject" are the same data.
+					if ($placeholder === '{subject}' && str_starts_with($text, 'Re: ')) {
+						$this->vocabulary[substr($text, 4)] ??= $placeholder;
+					}
+				}
+
+				break;
+			}
+		}
+
+		uksort($this->vocabulary, static fn($a, $b) => mb_strlen((string) $b) <=> mb_strlen((string) $a));
+	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * Drops a sibling, or a group of siblings, that repeats the one before it.
+	 *
+	 * Rows of a table repeat one at a time; a definition list repeats as dt and
+	 * dd; a list of links repeats as the link and the ", " after it. Looking for
+	 * groups of up to MAX_PERIOD siblings covers all of those, while two dd
+	 * elements that happen to read the same but belong to different dt elements
+	 * are not a repeat and are both kept.
+	 *
+	 * @param array $keys The siblings, each described as a string.
+	 * @return array The same, with repeats removed.
+	 */
+	private static function withoutRepeats(array $keys): array
+	{
+		$kept = [];
+		$count = \count($keys);
+		$i = 0;
+
+		while ($i < $count) {
+			for ($period = 1; $period <= self::MAX_PERIOD; $period++) {
+				if (
+					$i >= $period
+					&& $i + $period <= $count
+					&& \array_slice($keys, $i, $period) === \array_slice($keys, $i - $period, $period)
+				) {
+					$i += $period;
+
+					continue 2;
+				}
+			}
+
+			$kept[] = $keys[$i++];
+		}
+
+		return $kept;
+	}
+
+	/**
+	 * Formatted dates, in the forms the default time formats produce, and the
+	 * relative forms used for recent ones.
+	 *
+	 * @return array Regular expressions.
+	 */
+	private static function datePatterns(): array
+	{
+		$time = '\d{1,2}:\d{2}(?::\d{2})?(?: ?[AaPp][Mm])?';
+
+		return [
+			'~\b(?:' . self::MONTHS . ')\.? \d{1,2}(?:st|nd|rd|th)?,? \d{4}(?:,? (?:at )?' . $time . ')?~u',
+			'~\b\d{1,2} (?:' . self::MONTHS . ')\.? \d{4}(?:,? ' . $time . ')?~u',
+			'~\b(?:' . self::MONTHS . ') \d{4}\b~u',
+			'~\b(?:Today|Yesterday)(?: at)? ' . $time . '~u',
+			'~\b\d{4}-\d{2}-\d{2}(?:[T ]\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:?\d{2})?)?~',
+			'~\b\d{1,2}:\d{2}(?::\d{2})? ?[AaPp][Mm]\b~',
+		];
+	}
+}
diff --git a/tests/Unit/Support/DomSnapshotTest.php b/tests/Unit/Support/DomSnapshotTest.php
new file mode 100644
index 00000000000..ce07a6a18b1
--- /dev/null
+++ b/tests/Unit/Support/DomSnapshotTest.php
@@ -0,0 +1,378 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Unit\Support;
+
+use PHPUnit\Framework\Attributes\CoversNothing;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use SMF\Tests\Support\DomSnapshot;
+
+/**
+ * The rules the template snapshots are compared by.
+ *
+ * Each pair below is two renders that must read the same, or must not. The
+ * second half matters as much as the first: a snapshot that masks too much
+ * passes whatever the templates do, and would say nothing about a conversion.
+ */
+#[CoversNothing]
+class DomSnapshotTest extends TestCase
+{
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * Renders that differ only in ways a conversion may change read the same.
+	 *
+	 * Expected: describe() gives the same description for both renders of each
+	 *           case in sameRender().
+	 */
+	#[DataProvider('sameRender')]
+	public function testTheseRendersReadTheSame(string $before, string $after): void
+	{
+		$this->assertSame($this->describe($before), $this->describe($after));
+	}
+
+	/**
+	 * Renders that differ in a way a conversion must not introduce read differently.
+	 *
+	 * Expected: describe() gives different descriptions for the two renders of
+	 *           each case in differentRender().
+	 */
+	#[DataProvider('differentRender')]
+	public function testTheseRendersDoNot(string $before, string $after): void
+	{
+		$this->assertNotSame($this->describe($before), $this->describe($after));
+	}
+
+	/**
+	 * An ignored element is named in the description, without its content.
+	 *
+	 * Expected: describing <main> with #volatile ignored contains
+	 *           'snapshot-ignored [selector="#volatile"]' and "Kept", and not
+	 *           "Now".
+	 */
+	public function testItSaysWhatItLeftOut(): void
+	{
+		$description = (new DomSnapshot())->describe('<main><p id="volatile">Now</p><p>Kept</p></main>', ['main'], ['#volatile']);
+
+		$this->assertStringContainsString('snapshot-ignored [selector="#volatile"]', $description);
+		$this->assertStringNotContainsString('Now', $description);
+		$this->assertStringContainsString('"Kept"', $description);
+	}
+
+	/**
+	 * A root selected by an ID that holds a number reads the same whatever the number.
+	 *
+	 * Expected: describing #category_2 and #category_3 around the same content
+	 *           gives the same description.
+	 */
+	public function testARootNamingAnIdReadsTheSameOnAnyForum(): void
+	{
+		$describe = static fn(int $id): string => (new DomSnapshot())->describe(
+			'<main><div id="category_' . $id . '">Boards</div></main>',
+			['#category_' . $id],
+		);
+
+		$this->assertSame($describe(2), $describe(3));
+	}
+
+	/**
+	 * A root that matches nothing is reported, not silently skipped.
+	 *
+	 * Expected: describing #gone on a page without it contains
+	 *           "(nothing matches #gone)".
+	 */
+	public function testItSaysWhenARootIsMissing(): void
+	{
+		$this->assertStringContainsString(
+			'(nothing matches #gone)',
+			(new DomSnapshot())->describe('<main></main>', ['#gone']),
+		);
+	}
+
+	/**
+	 * Masking an element's text keeps the element itself in the description.
+	 *
+	 * Expected: describing li.postgroup with its text masked contains
+	 *           li.postgroup and "{text}", and not "Hero".
+	 */
+	public function testMaskedTextKeepsItsElement(): void
+	{
+		$description = (new DomSnapshot())->describe('<main><li class="postgroup">Hero Member</li></main>', ['main'], [], ['.postgroup']);
+
+		$this->assertStringContainsString('li.postgroup', $description);
+		$this->assertStringContainsString('"{text}"', $description);
+		$this->assertStringNotContainsString('Hero', $description);
+	}
+
+	/**
+	 * A list can be narrowed to the entries that mention the fixtures.
+	 *
+	 * Expected: a board picker narrowed to optgroups mentioning "Snapshot"
+	 *           reads the same whatever other boards the forum has, keeps
+	 *           "Snapshot fixtures" and drops "General".
+	 */
+	public function testAListCanBeNarrowedToWhatMentionsTheFixtures(): void
+	{
+		$picker = static fn(string $others): string => '<main><select name="toboard">'
+			. '<optgroup label="Snapshot fixtures"><option>Snapshot board</option></optgroup>'
+			. $others
+			. '</select></main>';
+
+		$describe = static fn(string $html): string => (new DomSnapshot())->describe($html, ['main'], [], [], ['optgroup' => 'Snapshot']);
+
+		$one = $describe($picker('<optgroup label="General Category"><option>General Discussion</option></optgroup>'));
+		$many = $describe($picker('<optgroup label="Other"><option>A</option></optgroup><optgroup label="More"><option>B</option></optgroup>'));
+
+		$this->assertSame($one, $many);
+		$this->assertStringContainsString('Snapshot fixtures', $one);
+		$this->assertStringNotContainsString('General', $one);
+	}
+
+	/**
+	 * An element that is only there sometimes can be left out without a trace.
+	 *
+	 * Expected: with .amt left out, a link with an unread count and one without
+	 *           give the same description.
+	 */
+	public function testSomethingOnlyThereSometimesCanBeLeftOutWithoutATrace(): void
+	{
+		$describe = static fn(string $html): string => (new DomSnapshot())->describe($html, ['main'], [], [], ['.amt' => null]);
+
+		$this->assertSame(
+			$describe('<main><a>Messages</a></main>'),
+			$describe('<main><a>Messages <span class="amt">3</span></a></main>'),
+		);
+	}
+
+	/**
+	 * Rows that come in database order can be compared sorted.
+	 *
+	 * Expected: with tbody marked unordered, the same two rows in either order
+	 *           give the same description.
+	 */
+	public function testRowsInDatabaseOrderCanBeComparedSorted(): void
+	{
+		$describe = static fn(string $rows): string => (new DomSnapshot())->describe(
+			'<main><table><tbody>' . $rows . '</tbody></table></main>',
+			['main'],
+			[],
+			[],
+			[],
+			['tbody'],
+		);
+
+		$this->assertSame(
+			$describe('<tr><td>Post new topics</td></tr><tr><td>Delete own posts</td></tr>'),
+			$describe('<tr><td>Delete own posts</td></tr><tr><td>Post new topics</td></tr>'),
+		);
+	}
+
+	/**
+	 * The board URL is not mistaken for a member's name.
+	 *
+	 * A member called "admin" is common, and ?action=admin is on every page an
+	 * administrator sees.
+	 *
+	 * Expected: with a member named "admin", the description keeps
+	 *           {boardurl}/index.php?action=admin and the "Admin" link text,
+	 *           and masks only the name in the profile link as {member}.
+	 */
+	public function testTheBoardUrlIsNotMistakenForAName(): void
+	{
+		$description = (new DomSnapshot(['http://forum.test' => '{boardurl}']))->describe(
+			'<main><a href="http://forum.test/index.php?action=profile;u=1">admin</a> '
+			. '<a href="http://forum.test/index.php?action=admin">Admin</a></main>',
+			['main'],
+		);
+
+		$this->assertStringContainsString('{boardurl}/index.php?action=admin"', $description);
+		$this->assertStringContainsString('"Admin"', $description);
+		$this->assertStringContainsString('"{member}"', $description);
+	}
+
+	/***********************
+	 * Public static methods
+	 ***********************/
+
+	/**
+	 * Pairs that differ only in ways a template conversion is allowed to
+	 * change, or that the forum changes on its own.
+	 *
+	 * @return array The cases.
+	 */
+	public static function sameRender(): array
+	{
+		return [
+			'whitespace and indentation' => [
+				'<main><div class="a"><p>Hello world</p></div></main>',
+				"<main>\n\t<div class=\"a\">\n\t\t<p>\n\t\t\tHello   world\n\t\t</p>\n\t</div>\n</main>",
+			],
+			'comments' => [
+				'<main><p>Hello</p><!-- .end --></main>',
+				'<main><p>Hel<!-- split -->lo</p></main>',
+			],
+			'attribute and class order' => [
+				'<main><a href="#x" title="t" class="one two">x</a></main>',
+				'<main><a class="two one" title="t" href="#x">x</a></main>',
+			],
+			'entities' => [
+				'<main><p>&quot;quoted&quot; &amp; &#58;)</p></main>',
+				'<main><p>"quoted" &amp; :)</p></main>',
+			],
+			'the session' => [
+				'<main><script>var smf_session_id = "0123456789abcdef0123456789abcdef"; var smf_session_var = "abcdef12";</script>'
+					. '<a href="/index.php?action=logout;abcdef12=0123456789abcdef0123456789abcdef">x</a>'
+					. '<input type="hidden" name="abcdef12" value="0123456789abcdef0123456789abcdef"></main>',
+				'<main><script>var smf_session_id = "fedcba9876543210fedcba9876543210"; var smf_session_var = "c0ffee99";</script>'
+					. '<a href="/index.php?action=logout;c0ffee99=fedcba9876543210fedcba9876543210">x</a>'
+					. '<input type="hidden" name="c0ffee99" value="fedcba9876543210fedcba9876543210"></main>',
+			],
+			'a security token' => [
+				'<main><input type="hidden" name="aa11bb22cc" value="0123456789abcdef0123456789abcdef"></main>',
+				'<main><input type="hidden" name="dd33ee44" value="fedcba9876543210fedcba9876543210"></main>',
+			],
+			'ids and counts' => [
+				'<main><a id="msg12" href="/index.php?topic=3.0">Posts: 7</a></main>',
+				'<main><a id="msg5012" href="/index.php?topic=31.15">Posts: 1234</a></main>',
+			],
+			'a minified file' => [
+				'<main><link rel="stylesheet" href="/Themes/default/css/minified_4f4174a0308454b7fa39683936f468b4.css?smf30_1"></main>',
+				'<main><link rel="stylesheet" href="/Themes/default/css/minified_ab62f1f68a1d7a284da72fd8555dbf49.css?smf30_2"></main>',
+			],
+			'an email address' => [
+				'<main><a href="mailto:someone@example.com">someone@example.com</a><input value="noreply@myserver.com"></main>',
+				'<main><a href="mailto:other.person+tag@example.org">other.person+tag@example.org</a><input value="admin@example.com"></main>',
+			],
+			'a search carried to the next page' => [
+				'<main><a href="/index.php?action=search;params=eJxLTClLzEtOTalRrzGoUapJKgKxjICs">Search</a></main>',
+				'<main><a href="/index.php?action=search;params=eJxLTClLzEtOTalRrzGoUapJKgKxzICs">Search</a></main>',
+			],
+			'an average and a total' => [
+				'<main><dd>3</dd><dd>999</dd></main>',
+				'<main><dd>2.5</dd><dd>1,000</dd></main>',
+			],
+			'a date and a relative date' => [
+				'<main><p>Last post: Jan 15, 2020, 10:00 AM</p></main>',
+				'<main><p>Last post: <strong>Today</strong> at 04:43 PM</p></main>',
+			],
+			'a length of time' => [
+				'<main><dd>5 minutes</dd></main>',
+				'<main><dd>2 hours and 1 minute</dd></main>',
+			],
+			'singular and plural' => [
+				'<main><p>1 reply, 1 view, 1 member</p></main>',
+				'<main><p>2 replies, 30 views, 0 members</p></main>',
+			],
+			'names in links, and wherever else they appear' => [
+				'<main><a href="/index.php?action=profile;u=1" title="View the profile of Alice">Alice</a> said hello</main>',
+				'<main><a href="/index.php?action=profile;u=9" title="View the profile of Bob">Bob</a> said hello</main>',
+			],
+			'a shortened subject and its title' => [
+				'<main><a href="/index.php?topic=1.msg1#new" title="A very long subject indeed">A very long sub...</a></main>',
+				'<main><a href="/index.php?topic=2.msg9#new" title="Short">Short</a></main>',
+			],
+			'the latest post on the board index' => [
+				'<main><a href="/index.php?topic=1.msg1#new" title="Welcome to SMF!">Welcome to SMF!</a></main>',
+				'<main><a href="/index.php?topic=9.msg90;boardseen#new" title="Another subject entirely">Another subject e...</a></main>',
+			],
+			'rows of a list' => [
+				'<main><ul><li><a href="/index.php?board=1.0">One</a></li></ul></main>',
+				'<main><ul><li><a href="/index.php?board=1.0">One</a></li><li><a href="/index.php?board=2.0">Two</a></li>'
+					. '<li><a href="/index.php?board=3.0">Three</a></li></ul></main>',
+			],
+			'pairs of a definition list' => [
+				'<main><dl><dt><a href="/index.php?action=profile;u=1">Alice</a></dt><dd>5</dd></dl></main>',
+				'<main><dl><dt><a href="/index.php?action=profile;u=1">Alice</a></dt><dd>5</dd>'
+					. '<dt><a href="/index.php?action=profile;u=2">Bob</a></dt><dd>3</dd></dl></main>',
+			],
+			'items separated by commas' => [
+				'<main><p><a href="/index.php?board=1.0">One</a>, <a href="/index.php?board=2.0">Two</a></p></main>',
+				'<main><p><a href="/index.php?board=1.0">One</a>, <a href="/index.php?board=2.0">Two</a>, '
+					. '<a href="/index.php?board=3.0">Three</a></p></main>',
+			],
+		];
+	}
+
+	/**
+	 * Pairs that differ in a way a template conversion must not introduce.
+	 *
+	 * @return array The cases.
+	 */
+	public static function differentRender(): array
+	{
+		return [
+			'a class dropped' => [
+				'<main><div class="windowbg sticky">x</div></main>',
+				'<main><div class="windowbg">x</div></main>',
+			],
+			'an attribute dropped' => [
+				'<main><input type="checkbox" name="x" checked></main>',
+				'<main><input type="checkbox" name="x"></main>',
+			],
+			'an element changed' => [
+				'<main><h3 class="catbg">Title</h3></main>',
+				'<main><h4 class="catbg">Title</h4></main>',
+			],
+			'a language string changed' => [
+				'<main><p>Started by</p></main>',
+				'<main><p>Started by:</p></main>',
+			],
+			'a language string missing' => [
+				'<main><button>Save</button></main>',
+				'<main><button></button></main>',
+			],
+			'escaping lost' => [
+				'<main><p>&lt;b&gt;not bold&lt;/b&gt;</p></main>',
+				'<main><p><b>not bold</b></p></main>',
+			],
+			'an element moved' => [
+				'<main><div class="a"></div><div class="b"></div></main>',
+				'<main><div class="b"></div><div class="a"></div></main>',
+			],
+			'a column lost from every row' => [
+				'<main><table><tr><td class="x">1</td><td class="y">2</td></tr><tr><td class="x">3</td><td class="y">4</td></tr></table></main>',
+				'<main><table><tr><td class="x">1</td></tr><tr><td class="x">3</td></tr></table></main>',
+			],
+			'a value lost from a definition list' => [
+				// Both values read "{date}", but they belong to different terms,
+				// so the second is not a repeat of the first.
+				'<main><dl><dt>Registered</dt><dd>Jan 1, 2020</dd><dt>Last active</dt><dd>Jan 2, 2020</dd></dl></main>',
+				'<main><dl><dt>Registered</dt><dd>Jan 1, 2020</dd><dt>Last active</dt></dl></main>',
+			],
+			'a repeated word in prose' => [
+				'<main><p><u>a</u> and <s>b</s> and <i>c</i></p></main>',
+				'<main><p><u>a</u> and <s>b</s> <i>c</i></p></main>',
+			],
+		];
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	/**
+	 * Describes a fragment the way the snapshot tests describe a page.
+	 *
+	 * @param string $html The fragment.
+	 * @return string The description.
+	 */
+	private function describe(string $html): string
+	{
+		return (new DomSnapshot())->describe('<!DOCTYPE html><html><body>' . $html . '</body></html>', ['main']);
+	}
+}
diff --git a/tests/Unit/Support/index.php b/tests/Unit/Support/index.php
new file mode 100644
index 00000000000..2844a3b9e7b
--- /dev/null
+++ b/tests/Unit/Support/index.php
@@ -0,0 +1,8 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
+} else {
+	exit;
+}
diff --git a/tests/Unit/TemplateEngineTest.php b/tests/Unit/TemplateEngineTest.php
new file mode 100644
index 00000000000..2830b404f96
--- /dev/null
+++ b/tests/Unit/TemplateEngineTest.php
@@ -0,0 +1,540 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2026 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 5-dev
+ */
+
+declare(strict_types=1);
+
+namespace SMF\Tests\Unit;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SMF\TemplateEngine;
+use SMF\Theme;
+
+/**
+ * Covers how SMF\TemplateEngine finds the Plates template for a sub-template.
+ *
+ * Each test builds a default theme and a child theme in a temporary directory,
+ * so nothing depends on which templates the real default theme has converted.
+ */
+#[CoversClass(TemplateEngine::class)]
+class TemplateEngineTest extends TestCase
+{
+	/*********************
+	 * Internal properties
+	 *********************/
+
+	/**
+	 * @var string The temporary directory holding the themes.
+	 */
+	private string $root;
+
+	/**
+	 * @var string The template directory of the default theme.
+	 */
+	private string $default;
+
+	/**
+	 * @var string The template directory of a theme based on the default.
+	 */
+	private string $child;
+
+	/****************
+	 * Public methods
+	 ****************/
+
+	/**
+	 * A loaded Plates template provides its sub-templates.
+	 *
+	 * Expected: with Stats loaded, find('main') returns 'Stats/main' and
+	 *           rendering it outputs the file.
+	 */
+	public function testALoadedPlatesTemplateRendersItsSubTemplates(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->assertSame('Stats/main', $engine->find('main'));
+		$this->assertSame('stats page', $engine->render('Stats/main'));
+	}
+
+	/**
+	 * A Plates template that was not loaded is not searched.
+	 *
+	 * Expected: with Stats on disk but not loaded, find('main') returns null.
+	 */
+	public function testATemplateThatWasNotLoadedIsNotSearched(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->default]);
+
+		$this->assertNull($engine->find('main'));
+	}
+
+	/**
+	 * A sub-template the Plates template lacks is left to the template_*() functions.
+	 *
+	 * Expected: with Stats loaded and no stats.php in it, find('stats') returns
+	 *           null.
+	 */
+	public function testASubTemplateThePlatesTemplateLacksIsLeftToTheFunctions(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->assertNull($engine->find('stats'));
+	}
+
+	/**
+	 * A template directory's index.php is never a sub-template.
+	 *
+	 * Every directory in a theme has an index.php that sends a visitor
+	 * elsewhere, and it must never be rendered as though it were a page.
+	 *
+	 * Expected: with Stats loaded and an index.php in it, find('index') returns
+	 *           null.
+	 */
+	public function testTheIndexFileIsNeverASubTemplate(): void
+	{
+		$this->write($this->default, 'Stats/index.php', 'go away');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->assertNull($engine->find('index'));
+	}
+
+	/**
+	 * A template is a Plates template in a theme that has its directory.
+	 *
+	 * Expected: isPlatesTemplate() is true for Stats in the theme holding
+	 *           Stats/, and false for a theme without it and for a template
+	 *           with no directory.
+	 */
+	public function testATemplateDirectoryIsWhatMakesATemplatePlates(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->child, $this->default]);
+
+		$this->assertTrue($engine->isPlatesTemplate($this->default, 'Stats'));
+		$this->assertFalse($engine->isPlatesTemplate($this->child, 'Stats'));
+		$this->assertFalse($engine->isPlatesTemplate($this->default, 'Display'));
+	}
+
+	/**
+	 * A theme overrides one sub-template and inherits the rest.
+	 *
+	 * A theme only has to hold the sub-templates it changes. The rest come
+	 * from the theme it is based on.
+	 *
+	 * Expected: with the child theme first, main renders the child's file,
+	 *           other renders the default theme's, and path('Stats/other') is
+	 *           the default theme's file.
+	 */
+	public function testAThemeOverridesOneSubTemplateAndInheritsTheRest(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'default main');
+		$this->write($this->default, 'Stats/other.php', 'default other');
+		$this->write($this->child, 'Stats/main.php', 'child main');
+
+		$engine = new TemplateEngine([$this->child, $this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->assertSame('child main', $engine->render($engine->find('main')));
+		$this->assertSame('default other', $engine->render($engine->find('other')));
+		$this->assertSame(
+			realpath($this->default . '/templates/Stats/other.php'),
+			realpath($engine->path('Stats/other')),
+		);
+	}
+
+	/**
+	 * A template that does not exist has no path.
+	 *
+	 * Expected: path('Stats/main') returns null and exists('Stats/main')
+	 *           returns false.
+	 */
+	public function testThePathOfAMissingTemplateIsNull(): void
+	{
+		$engine = new TemplateEngine([$this->default]);
+
+		$this->assertNull($engine->path('Stats/main'));
+		$this->assertFalse($engine->exists('Stats/main'));
+	}
+
+	/**
+	 * The data a template is rendered with becomes the template's variables.
+	 *
+	 * Theme::loadSubTemplate() passes the parameters it was given as the
+	 * template's variables.
+	 *
+	 * Expected: render('Stats/main', ['greeting' => 'Hello', 'name' =>
+	 *           'world']) outputs 'Hello, world'.
+	 */
+	public function testDataIsPassedToTheTemplateAsVariables(): void
+	{
+		$this->write($this->default, 'Stats/main.php', '<?= $greeting ?>, <?= $name ?>');
+
+		$engine = new TemplateEngine([$this->default]);
+
+		$this->assertSame('Hello, world', $engine->render('Stats/main', ['greeting' => 'Hello', 'name' => 'world']));
+	}
+
+	/**
+	 * Between a Plates template and a function, the one loaded last provides the sub-template.
+	 *
+	 * Before Plates, sub-template names were global: whichever template file
+	 * defined the function ran it. With both kinds loaded, the template loaded
+	 * last decides, as the function it defined would have.
+	 *
+	 * Expected: find('plates_or_function') returns null after a legacy template
+	 *           defining it is loaded, and 'Stats/plates_or_function' once
+	 *           Stats is loaded again.
+	 */
+	public function testAFunctionFromATemplateLoadedLaterWins(): void
+	{
+		$this->write($this->default, 'Stats/plates_or_function.php', 'plates');
+		$legacy = $this->write($this->default, '../Legacy.template.php', '<?php function template_plates_or_function(): void {}');
+
+		require_once $legacy;
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+		$engine->addLoaded('Legacy', $legacy);
+
+		$this->assertNull($engine->find('plates_or_function'));
+
+		// And the other way around.
+		$engine->addLoaded('Stats');
+
+		$this->assertSame('Stats/plates_or_function', $engine->find('plates_or_function'));
+	}
+
+	/**
+	 * A legacy template loaded later does not hide a Plates sub-template it does not define.
+	 *
+	 * A legacy template that does not define the function has no say in it.
+	 *
+	 * Expected: find('main') still returns 'Stats/main' after an unrelated
+	 *           legacy template is loaded.
+	 */
+	public function testAFunctionFromAnotherFileDoesNotHideThePlatesTemplate(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'plates');
+		$legacy = $this->write($this->default, '../Other.template.php', '<?php');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+		$engine->addLoaded('Other', $legacy);
+
+		$this->assertSame('Stats/main', $engine->find('main'));
+	}
+
+	/**
+	 * A directory named twice is looked in once.
+	 *
+	 * Theme::loadTemplate() can add the default theme to the list a second
+	 * time when it goes looking for a misconfigured default theme directory.
+	 * Plates refuses a hierarchy that names the same theme twice.
+	 *
+	 * Expected: a TemplateEngine given the default theme twice keeps it once in
+	 *           $dirs and still renders its templates.
+	 */
+	public function testTheSameDirectoryTwiceIsLookedInOnce(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->default, $this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->assertSame([$this->default], $engine->dirs);
+		$this->assertSame('stats page', $engine->render('Stats/main'));
+	}
+
+	/**
+	 * With no template directories, nothing is found.
+	 *
+	 * Theme::loadSubTemplate() asks the engine first, and an error page can
+	 * ask before a theme has said where its templates are.
+	 *
+	 * Expected: find('main') and path('Stats/main') return null on an engine
+	 *           with no directories.
+	 */
+	public function testWithNoDirectoriesNothingIsFound(): void
+	{
+		$engine = new TemplateEngine([]);
+		$engine->addLoaded('Stats');
+
+		$this->assertNull($engine->find('main'));
+		$this->assertNull($engine->path('Stats/main'));
+	}
+
+	/**
+	 * Changing the template directories keeps the templates already loaded.
+	 *
+	 * Expected: after setDirs() adds the child theme, find('main') renders the
+	 *           child's file for the Stats loaded before.
+	 */
+	public function testChangingTheDirectoriesKeepsWhatWasLoaded(): void
+	{
+		$this->write($this->child, 'Stats/main.php', 'child main');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+		$engine->setDirs([$this->child, $this->default]);
+
+		$this->assertSame('child main', $engine->render($engine->find('main')));
+	}
+
+	/**
+	 * A template calls sub-templates of either kind the same way.
+	 *
+	 * A template calls another sub-template the same way whether that one has
+	 * been converted to Plates yet or is still a template_*() function.
+	 *
+	 * Expected: a Plates template calling subTemplate() for a Plates sub-
+	 *           template and for a template_*() function outputs 'hello Plates,
+	 *           hi function'.
+	 */
+	public function testATemplateCallsSubTemplatesOfEitherKind(): void
+	{
+		$this->write($this->default, 'Stats/main.php', '<?php $this->subTemplate(\'greeting\', [\'name\' => \'Plates\']) ?>, <?php $this->subTemplate(\'engine_test_greeting\', [\'name\' => \'function\']) ?>');
+		$this->write($this->default, 'Stats/greeting.php', 'hello <?= $name ?>');
+		$legacy = $this->write($this->default, '../Greeting.template.php', '<?php function template_engine_test_greeting(string $name): void { echo "hi ", $name; }');
+
+		require_once $legacy;
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Greeting', $legacy);
+		$engine->addLoaded('Stats');
+
+		$this->assertSame('hello Plates, hi function', $engine->render('Stats/main'));
+	}
+
+	/**
+	 * hasSubTemplate() finds sub-templates of either kind.
+	 *
+	 * Expected: hasSubTemplate() is true for a Plates sub-template and for a
+	 *           template_*() function, false for neither, and gives the same
+	 *           answer inside a template.
+	 */
+	public function testHasSubTemplateSeesEitherKind(): void
+	{
+		$this->write($this->default, 'Stats/main.php', '<?= $this->hasSubTemplate(\'main\') ? \'yes\' : \'no\' ?>');
+		$legacy = $this->write($this->default, '../Has.template.php', '<?php function template_engine_test_has(): void {}');
+
+		require_once $legacy;
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Has', $legacy);
+		$engine->addLoaded('Stats');
+
+		$this->assertTrue($engine->hasSubTemplate('main'));
+		$this->assertTrue($engine->hasSubTemplate('engine_test_has'));
+		$this->assertFalse($engine->hasSubTemplate('no_such_sub_template'));
+		$this->assertSame('yes', $engine->render('Stats/main'));
+	}
+
+	/**
+	 * Calling a sub-template that does not exist is an error.
+	 *
+	 * Calling a function that does not exist is an error, and so is calling a
+	 * sub-template that does not exist.
+	 *
+	 * Expected: rendering a template that calls
+	 *           subTemplate('no_such_sub_template') throws an Error naming it.
+	 */
+	public function testCallingAMissingSubTemplateIsAnError(): void
+	{
+		$this->write($this->default, 'Stats/main.php', '<?php $this->subTemplate(\'no_such_sub_template\') ?>');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+
+		$this->expectException(\Error::class);
+		$this->expectExceptionMessage('no_such_sub_template');
+
+		$engine->render('Stats/main');
+	}
+
+	/**
+	 * Fetching a sub-template returns its output as a string, whatever its kind.
+	 *
+	 * Some template_*() functions return their HTML for the caller to use,
+	 * and a Plates template can only output it. Fetching gets the same string
+	 * from either.
+	 *
+	 * Expected: fetchSubTemplate() returns 'plates 1' for a Plates template and
+	 *           'echoed returned 2' for a function that echoes and returns, and
+	 *           outputs nothing itself.
+	 */
+	public function testFetchingGetsTheOutputOfEitherKindAsAString(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'plates <?= $n ?>');
+		$legacy = $this->write($this->default, '../Fetch.template.php', '<?php function template_engine_test_returns(int $n): string { echo "echoed "; return "returned " . $n; }');
+
+		require_once $legacy;
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Fetch', $legacy);
+		$engine->addLoaded('Stats');
+
+		ob_start();
+		$plates = $engine->fetchSubTemplate('main', ['n' => 1]);
+		$function = $engine->fetchSubTemplate('engine_test_returns', ['n' => 2]);
+		$leaked = ob_get_clean();
+
+		$this->assertSame('plates 1', $plates);
+		$this->assertSame('echoed returned 2', $function);
+		$this->assertSame('', $leaked, 'fetching output something');
+	}
+
+	/**
+	 * A template_*() function with its own parameter names gets the data in order.
+	 *
+	 * A call through a name built at runtime names its parameters after the
+	 * default theme's sub-templates, and a mod's function may call its own
+	 * something else.
+	 *
+	 * Expected: fetchSubTemplate() passes ['board' => ...] to a function whose
+	 *           parameter is $b, and passes ['b' => ..., 'extra' => '?'] by
+	 *           name.
+	 */
+	public function testAFunctionWithOtherParameterNamesGetsThemInOrder(): void
+	{
+		$legacy = $this->write($this->default, '../Names.template.php', '<?php function template_engine_test_names($b, $extra = "!"): void { echo $b["name"], $extra; }');
+
+		require_once $legacy;
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Names', $legacy);
+
+		$this->assertSame('general!', $engine->fetchSubTemplate('engine_test_names', ['board' => ['name' => 'general']]));
+		$this->assertSame('general?', $engine->fetchSubTemplate('engine_test_names', ['b' => ['name' => 'general'], 'extra' => '?']));
+	}
+
+	/**
+	 * Loading the Plates index template defines the functions mods call.
+	 *
+	 * Mods and themes call template_button_strip() and friends from templates
+	 * of their own. Loading the Plates template that holds them defines them.
+	 *
+	 * Expected: template_button_strip() and template_quickbuttons() render the
+	 *           Plates sub-templates, and quickbuttons returns its output when
+	 *           asked to with 'return'.
+	 */
+	public function testLoadingThePlatesIndexTemplateDefinesTheFunctionsModsCall(): void
+	{
+		$this->write($this->default, 'index/button_strip.php', 'strip <?= implode(\',\', array_keys($button_strip)) ?> <?= $direction ?>|');
+		$this->write($this->default, 'index/quickbuttons.php', 'buttons <?= $list_class ?>|');
+
+		$current = Theme::$current;
+		Theme::$current = (object) ['settings' => ['template_dirs' => [$this->default]]];
+
+		try {
+			TemplateEngine::get()->addLoaded('index');
+
+			ob_start();
+			template_button_strip(['home' => [], 'search' => []], 'right');
+			$echoed = template_quickbuttons([], 'post');
+			$returned = template_quickbuttons([], 'post', 'return');
+			$output = ob_get_clean();
+		} finally {
+			Theme::$current = $current;
+		}
+
+		$this->assertSame('strip home,search right|buttons post|', $output);
+		$this->assertNull($echoed);
+		$this->assertSame('buttons post|', $returned);
+	}
+
+	/**
+	 * renderSubTemplate() outputs a sub-template it finds and reports one it does not.
+	 *
+	 * Expected: renderSubTemplate('main') outputs the file and returns true,
+	 *           and returns false for a sub-template that does not exist.
+	 */
+	public function testRenderSubTemplateOutputsWhatItFinds(): void
+	{
+		$this->write($this->default, 'Stats/main.php', 'stats page');
+
+		$engine = new TemplateEngine([$this->default]);
+		$engine->addLoaded('Stats');
+
+		ob_start();
+		$found = $engine->renderSubTemplate('main');
+		$missing = $engine->renderSubTemplate('no_such_sub_template');
+		$output = ob_get_clean();
+
+		$this->assertTrue($found);
+		$this->assertFalse($missing);
+		$this->assertSame('stats page', $output);
+	}
+
+	/******************
+	 * Internal methods
+	 ******************/
+
+	protected function setUp(): void
+	{
+		$this->root = sys_get_temp_dir() . \DIRECTORY_SEPARATOR . 'smf-template-engine-' . bin2hex(random_bytes(4));
+		$this->default = $this->root . \DIRECTORY_SEPARATOR . 'default';
+		$this->child = $this->root . \DIRECTORY_SEPARATOR . 'child';
+
+		mkdir($this->default, 0o777, true);
+		mkdir($this->child, 0o777, true);
+	}
+
+	protected function tearDown(): void
+	{
+		$files = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($this->root, \FilesystemIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::CHILD_FIRST,
+		);
+
+		foreach ($files as $file) {
+			$file->isDir() ? rmdir($file->getPathname()) : unlink($file->getPathname());
+		}
+
+		rmdir($this->root);
+	}
+
+	/**
+	 * Writes a file into a theme's templates directory, or, for a path that
+	 * starts with ../, into the theme's template directory itself.
+	 *
+	 * @param string $theme_dir The theme's template directory.
+	 * @param string $file The file, relative to its templates directory.
+	 * @param string $contents What to put in it.
+	 * @return string The path of the file.
+	 */
+	private function write(string $theme_dir, string $file, string $contents): string
+	{
+		$path = str_starts_with($file, '../')
+			? $theme_dir . '/' . substr($file, 3)
+			: $theme_dir . '/' . TemplateEngine::DIRECTORY . '/' . $file;
+
+		if (!is_dir(\dirname($path))) {
+			mkdir(\dirname($path), 0o777, true);
+		}
+
+		file_put_contents($path, $contents);
+
+		return $path;
+	}
+}