diff --git a/package-lock.json b/package-lock.json
index 2fa7d931f..378c25d66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "14.2.42",
+  "version": "15.0.0-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "nodebb-theme-persona",
-      "version": "14.2.42",
+      "version": "15.0.0-beta.2",
       "license": "BSD-2-Clause",
       "dependencies": {
         "pulling": "^2.0.0"
diff --git a/package.json b/package.json
index eeb7afdc2..a1630901b 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "14.2.42",
+  "version": "15.0.0-beta.2",
   "nbbpm": {
-    "compatibility": "^4.13.0"
+    "compatibility": "^4.14.0"
   },
   "description": "Persona theme for NodeBB",
   "main": "library.js",
diff --git a/scss/account.scss b/scss/account.scss
index 76acab06c..c404880c0 100644
--- a/scss/account.scss
+++ b/scss/account.scss
@@ -15,136 +15,6 @@
 		margin-right: auto;
 	}
 
-	.cover {
-		background-size: cover;
-		background-repeat: no-repeat;
-		height: 200px;
-		position: relative;
-		margin-bottom: 1em;
-		background-origin: content-box;
-		width: 100%;
-		top: var(--panel-offset);
-		position: absolute;
-		left: auto;
-		right: 0px;
-
-		.avatar-wrapper {
-			position: absolute;
-			left: 50%;
-			margin-left: -64px;
-			top: 128px;
-			border: 4px solid var(--bs-body-bg);
-			background-color: var(--bs-body-bg);
-			border-radius: 50%;
-
-			.persona-fab.btn-morph {
-				top: 93px;
-				right: 4px;
-				position: absolute;
-			}
-
-			.status {
-				position: absolute;
-				font-size: 23px;
-				top: 17px;
-				right: -3px;
-				padding: 10px;
-			}
-
-			.chat, .follow {
-				position: absolute;
-				width: 30px;
-				height: 30px;
-			}
-
-			.chat {
-				left: -1px;
-				bottom: 1px;
-			}
-
-			.follow {
-				right: 1px;
-				bottom: 1px;
-			}
-		}
-
-		&:hover .controls, .controls:focus-within {
-			opacity: 0.8;
-		}
-
-		.controls {
-			text-align: center;
-			height: 200px;
-			line-height: 200px;
-			opacity: 0;
-			@include transition(opacity .15s linear);
-			cursor: pointer;
-			pointer-events: none;
-
-			> * {
-				pointer-events: all;
-			}
-
-			.fa {
-				color: white;
-				background-color: #333;
-				opacity: 1;
-				margin: 15px;
-				padding: 5px;
-			}
-		}
-
-		&.active {
-			&:hover {
-				cursor: move;
-			}
-
-			.controls {
-				> * {
-					display: none;
-				}
-			}
-
-			.save {
-				display: inline-block;
-			}
-		}
-
-		&.saving {
-			.save {
-				display: none;
-			}
-
-			.indicator {
-				display: inline-block;
-			}
-		}
-
-		.save, .indicator {
-			display: inline-block;
-			position: absolute;
-			top: 1em;
-			right: 2em;
-			opacity: 1;
-			background-color: $primary;
-			color: $gray-200;
-			padding: 0.5em;
-			font-weight: bold;
-
-			&:hover {
-				cursor: pointer;
-			}
-		}
-
-		.save {
-			display: none;
-		}
-
-		.indicator {
-			display: none;
-		}
-	}
-
 	margin-top: 200px;
 
 	.container {
@@ -272,12 +142,3 @@
 	}
 }
 
-.user-picture-label {
-	font-size:20px;
-}
-
-
-.account-username{
-  font-size:20px;
-  font-weight:bold;
-}
diff --git a/scss/groups.scss b/scss/groups.scss
deleted file mode 100644
index c44087b0c..000000000
--- a/scss/groups.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-.groups.details {
-	margin-top: 200px;
-
-	[component="groups/cover"] {
-		background-size: cover;
-		background-repeat: no-repeat;
-		background-origin: content-box;
-
-		min-height: 200px;
-		width: 100%;
-		margin-bottom: 1em;
-		padding-left: 0;
-		padding-right: 0;
-
-		position: absolute;
-		top: var(--panel-offset);
-		right: 0;
-		left: auto;
-
-		&:hover {
-			.controls {
-				opacity: 0.8;
-			}
-		}
-
-		.controls {
-			text-align: center;
-			min-height: 200px;
-			line-height: 200px;
-			opacity: 0;
-			@include transition(opacity .15s linear);
-			cursor: pointer;
-			pointer-events: none;
-
-			> * {
-				pointer-events: all;
-			}
-
-			.fa {
-				color: white;
-				background-color: #333;
-				opacity: 1;
-				margin: 15px;
-				padding: 5px;
-			}
-		}
-
-		&.active {
-			&:hover {
-				cursor: move;
-			}
-
-			.controls {
-				> * {
-					display: none;
-				}
-			}
-
-			.save {
-				display: inline-block;
-			}
-		}
-
-		&.saving {
-			.save {
-				display: none;
-			}
-
-			.indicator {
-				display: inline-block;
-			}
-		}
-
-		.save, .indicator {
-			display: inline-block;
-			position: absolute;
-			top: 1em;
-			right: 2em;
-			opacity: 1;
-			background-color: $primary;
-			color: $gray-200;
-			padding: 0.5em;
-			font-weight: bold;
-
-			&:hover {
-				cursor: pointer;
-			}
-		}
-
-		.save {
-			display: none;
-		}
-
-		.indicator {
-			display: none;
-		}
-	}
-
-	@include media-breakpoint-up(md) {
-		margin-top: 300px;
-
-		[component="groups/cover"] {
-			min-height: 300px;
-
-			.controls {
-				min-height: 300px;
-				line-height: 300px;
-			}
-		}
-	}
-}
diff --git a/scss/persona.scss b/scss/persona.scss
index de6abd8d9..786c2f4d5 100644
--- a/scss/persona.scss
+++ b/scss/persona.scss
@@ -9,7 +9,6 @@
 @import "header";
 @import "status";
 @import "account";
-@import "groups";
 @import "chats";
 @import "search";
 @import "topics_list";
diff --git a/templates/account/blocks.tpl b/templates/account/blocks.tpl
index a5e99c469..cdd5ae798 100644
--- a/templates/account/blocks.tpl
+++ b/templates/account/blocks.tpl
@@ -16,7 +16,7 @@
 				<li component="blocks/search/match">
 					<div class="dropdown-item rounded-1 d-flex flex-nowrap gap-2 justify-content-between align-items-center" role="menuitem">
 						<div class="text-truncate">
-							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "24px", true)} {../username}</a>
+							<a href="{config.relative_path}/uid/{../uid}">{{buildAvatar(edit, "24px", true)}} {../username}</a>
 						</div>
 
 						<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">[[user:block-user]]</button>
diff --git a/templates/account/categories.tpl b/templates/account/categories.tpl
index 769df8315..8b31fa2cb 100644
--- a/templates/account/categories.tpl
+++ b/templates/account/categories.tpl
@@ -2,7 +2,7 @@
 
 <div>
 	<div class="d-flex justify-content-between align-items-center mb-3">
-		<h1 class="fs-4">{title}</h1>
+		<h1 class="fs-4">{tx(title)}</h1>
 		<div class="mb-2">
 			<div class="dropdown bottom-sheet" component="category/watch/all">
 				<button class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index aebd4057c..f883fde99 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -15,7 +15,7 @@
 		<div class="mb-4 pb-3 border-bottom">
 			<h6>[[user:info.invited-by]]</h6>
 			<div class="d-flex align-items-center gap-2">
-				<a href="">{buildAvatar(invitedBy, "24px", true)}</a>
+				<a href="">{{buildAvatar(invitedBy, "24px", true)}}</a>
 				<a href="">{invitedBy.username}</a>
 			</div>
 		</div>
@@ -43,7 +43,7 @@
 						<div>
 							{{{ if ./byUid }}}
 							<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
-							{buildAvatar(./byUser, "18px", true)}</a>
+							{{buildAvatar(./byUser, "18px", true)}}</a>
 							{{{ end }}}
 							<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
 						</div>
@@ -63,7 +63,7 @@
 						<div>
 							{{{ if ./byUid }}}
 							<a class="lh-1" href="{{{ if ./byUser.userslug }}}{config.relative_path}/user/{./byUser.userslug}{{{ else }}}#{{{ end }}}">
-							{buildAvatar(./byUser, "18px", true)}</a>
+							{{buildAvatar(./byUser, "18px", true)}}</a>
 							{{{ end }}}
 							<span class="timeago text-sm text-secondary lh-1 align-middle" title="{./timestampISO}"></span>
 						</div>
@@ -107,7 +107,7 @@
 							<span class="text-sm">[[user:info.reported-by]]</span>
 							<div class="d-flex text-nowrap">
 								{{{ each ./reports }}}
-								<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{buildAvatar(./reporter, "24px", true)}</a>
+								<a style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{{buildAvatar(./reporter, "24px", true)}}</a>
 								{{{ end }}}
 							</div>
 						</div>
@@ -138,7 +138,7 @@
 					<li class="mb-4 border-bottom">
 						<div class="mb-1 d-flex align-items-center justify-content-between">
 							<div>
-								<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+								<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 								<strong>
 									<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
 								</strong>
@@ -151,7 +151,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
@@ -192,7 +192,7 @@
 					<li class="mb-4 border-bottom">
 						<div class="mb-1 d-flex align-items-center justify-content-between">
 							<div>
-								<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+								<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 								<strong>
 									<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
 								</strong>
@@ -205,7 +205,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
@@ -240,7 +240,7 @@
 
 					<div data-id="{./id}">
 						<div class="d-flex align-items-baseline gap-1 mb-1">
-							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{buildAvatar(./user, "24px", true)}</a>
+							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{{buildAvatar(./user, "24px", true)}}</a>
 
 							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="fw-bold" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
 
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index 47b11d9a0..ec2051a34 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -21,7 +21,7 @@
 </div>
 
 <!-- IF !posts.length -->
-	<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+	<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 <!-- ENDIF !posts.length -->
 
 <div class="col-12">
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 1f9098dd5..99396fb76 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -36,7 +36,7 @@
 	{{{ end }}}
 
 	<!-- IF aboutme -->
-	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{aboutmeParsed}</div>
+	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{txEscape(aboutmeParsed)}}</div>
 	<!-- ENDIF aboutme -->
 
 	<div class="account-stats fs-1 text-center mb-3">
@@ -156,28 +156,74 @@
 <!-- ENDIF ips.length -->
 
 <div class="row">
-	{{{ if bestPosts.length }}}
-	<div class="col-lg-12 col-12">
-		<h1 class="fs-3">[[pages:account/best, {username}]]</h1>
-
-		<div class="col-12">
-			<ul component="posts" class="posts-list list-unstyled">
-			{{{each bestPosts}}}
-			<!-- IMPORT partials/posts_list_item.tpl -->
-			{{{end}}}
-			</ul>
-		</div>
-	</div>
-	{{{ end }}}
-	{{{ if latestPosts.length}}}
-	<div class="col-lg-12 col-12">
-		<h1 class="fs-3">[[pages:account/latest-posts, {username}]]</h1>
-		<div class="col-12">
-			<ul component="posts" class="posts-list list-unstyled">
-			{{{each latestPosts}}}
-			<!-- IMPORT partials/posts_list_item.tpl -->
-			{{{end}}}
-			</ul>
+	{{{ if (bestPosts.length || latestPosts.length) }}}
+	<div class="col-12">
+		<ul class="nav nav-tabs mb-3" role="tablist">
+			{{{ if bestPosts.length }}}
+			<li class="nav-item" role="presentation">
+				<button
+					class="nav-link active"
+					id="best-posts-tab"
+					data-bs-toggle="tab"
+					data-bs-target="#best-posts-pane"
+					type="button"
+					role="tab"
+					aria-controls="best-posts-pane"
+					aria-selected="true"
+				>
+					[[pages:account/best, {username}]]
+				</button>
+			</li>
+			{{{ end }}}
+			{{{ if latestPosts.length }}}
+			<li class="nav-item" role="presentation">
+				<button
+					class="nav-link {{{ if !bestPosts.length }}}active{{{ end }}}"
+					id="latest-posts-tab"
+					data-bs-toggle="tab"
+					data-bs-target="#latest-posts-pane"
+					type="button"
+					role="tab"
+					aria-controls="latest-posts-pane"
+					aria-selected="{{{ if !bestPosts.length }}}true{{{ else }}}false{{{ end }}}"
+				>
+					[[pages:account/latest-posts, {username}]]
+				</button>
+			</li>
+			{{{ end }}}
+		</ul>
+
+		<div class="tab-content">
+			{{{ if bestPosts.length }}}
+			<div
+				class="tab-pane fade show active"
+				id="best-posts-pane"
+				role="tabpanel"
+				aria-labelledby="best-posts-tab"
+				tabindex="0"
+			>
+				<ul component="posts" class="posts-list list-unstyled">
+				{{{each bestPosts}}}
+				<!-- IMPORT partials/posts_list_item.tpl -->
+				{{{end}}}
+				</ul>
+			</div>
+			{{{ end }}}
+			{{{ if latestPosts.length }}}
+			<div
+				class="tab-pane fade {{{ if !bestPosts.length }}}show active{{{ end }}}"
+				id="latest-posts-pane"
+				role="tabpanel"
+				aria-labelledby="latest-posts-tab"
+				tabindex="0"
+			>
+				<ul component="posts" class="posts-list list-unstyled">
+				{{{each latestPosts}}}
+				<!-- IMPORT partials/posts_list_item.tpl -->
+				{{{end}}}
+				</ul>
+			</div>
+			{{{ end }}}
 		</div>
 	</div>
 	{{{ end }}}
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index bb776d45f..e314be486 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -8,7 +8,7 @@
 			<div class="card card-body mb-3">
 				<select class="form-select" id="bootswatchSkin" data-property="bootswatchSkin">
 					{{{each bootswatchSkinOptions}}}
-					<option value="{bootswatchSkinOptions.value}" <!-- IF bootswatchSkinOptions.selected -->selected<!-- ENDIF bootswatchSkinOptions.selected -->>{bootswatchSkinOptions.name}</option>
+					<option value="{bootswatchSkinOptions.value}" {{{ if bootswatchSkinOptions.selected }}}selected{{{ end }}}>{tx(bootswatchSkinOptions.name)}</option>
 					{{{end}}}
 				</select>
 			</div>
@@ -61,7 +61,7 @@
 					<div component="chat/allow/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatAllowListUsers }}}
 						<div component="chat/allow/list/user" data-uid="{./uid}" class="d-flex px-2 py-1 rounded-1 text-bg-light gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="chat/allow/delete" data-uid="{./uid}" class="btn btn-light btn-sm py-0"><i class="fa fa-times fa-xs text-danger"></i></button>
 						</div>
 						{{{ end }}}
@@ -76,7 +76,7 @@
 					<div component="chat/deny/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatDenyListUsers }}}
 						<div component="chat/deny/list/user" data-uid="{./uid}" class="d-flex px-2 py-1 rounded-1 text-bg-light gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="chat/deny/delete" data-uid="{./uid}" class="btn btn-light btn-sm py-0"><i class="fa fa-times fa-xs text-danger"></i></button>
 						</div>
 						{{{ end }}}
@@ -165,7 +165,7 @@
 					<label class="form-label" for="dailyDigestFreq">[[user:digest-label]]</label>
 					<select class="form-select" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
 						{{{each dailyDigestFreqOptions}}}
-						<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected="1"<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
+						<option value="{./value}" {{{ if ./selected }}}selected="1"{{{ end }}}>{tx(./name)}</option>
 						{{{end}}}
 					</select>
 					<p class="form-text">[[user:digest-description]]</p>
@@ -176,7 +176,7 @@
 			{{{each customSettings}}}
 			<h4>{customSettings.title}</h4>
 			<div class="card card-body mb-3">
-				{customSettings.content}
+				{{customSettings.content}}
 			</div>
 			{{{end}}}
 
@@ -255,7 +255,7 @@
 						<tr component="notification/setting" class="align-middle">
 							<td style="width:100%;">
 								<div class="align-items-center">
-									<label class="text-sm tracking-tight" for="{./name}">{./label}</label>
+									<label class="text-sm tracking-tight" for="{./name}">{tx(./label)}</label>
 									<input type="hidden" data-property="{./name}" value="{./value}">
 								</div>
 							</td>
diff --git a/templates/account/tags.tpl b/templates/account/tags.tpl
index a5dd08bf9..998d53b36 100644
--- a/templates/account/tags.tpl
+++ b/templates/account/tags.tpl
@@ -1,6 +1,6 @@
 <!-- IMPORT partials/account/header.tpl -->
 
-<h1 class="fs-4">{title}</h1>
+<h1 class="fs-4">{tx(title)}</h1>
 <input component="tags/watch" type="text" class="form-control">
 
 <!-- IMPORT partials/account/footer.tpl -->
\ No newline at end of file
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index 1b5633855..078c77468 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -32,7 +32,7 @@
 
 
 {{{ if !topics.length }}}
-<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 {{{ end }}}
 
 <div class="category">
diff --git a/templates/account/uploads.tpl b/templates/account/uploads.tpl
index d77db8c68..1cd91674b 100644
--- a/templates/account/uploads.tpl
+++ b/templates/account/uploads.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/account/header.tpl -->
-<h1 class="fs-4">{title}</h1>
+<h1 class="fs-4">{tx(title)}</h1>
 <!-- IF privateUploads -->
 <div class="alert alert-info text-center">[[uploads:private-uploads-info]]</div>
 <!-- ELSE -->
diff --git a/templates/category.tpl b/templates/category.tpl
index 01e77eac4..a00cd8b58 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -19,13 +19,13 @@
 					{{{ end }}}
 				{{{ end }}}
 
-				<a href="{escape(url)}" class="d-inline-block">
+				<a href="{url}" class="d-inline-block">
 					<div class="alert alert-warning h-100 m-0 px-2 py-1 d-flex gap-1 align-items-center hide" id="new-topics-alert"><i class="fa fa-fw fa-rotate-right"></i>[[recent:load-new-posts]]</div>
 				</a>
 			</div>
 			<div component="category/controls" class="d-flex gap-1">
 				{{{ if !isNumber(cid) }}}
-				<a href="{escape(./url)}" class="btn btn-sm d-flex gap-2 align-items-center" data-ajaxify="false">
+				<a href="{./url}" class="btn btn-sm d-flex gap-2 align-items-center" data-ajaxify="false">
 					<i class="fa fa-external-link text-primary"></i>
 					<span class="fw-semibold">View Original</span>
 				</a>
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
deleted file mode 100644
index 76f4901d8..000000000
--- a/templates/groups/details.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-<div component="groups/container" class="groups details">
-
-	<div component="groups/cover" style="background-image: url({escape(group.cover:url)}?{config.cache-buster}); background-position: {group.cover:position};">
-		{{{ if group.isOwner }}}
-		<div class="controls">
-			<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
-			<span class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></span>
-			<span class="remove"><i class="fa fa-fw fa-4x fa-times"></i></span>
-		</div>
-		<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
-		<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-		{{{ end }}}
-	</div>
-
-	<div>
-		<!-- IMPORT partials/breadcrumbs.tpl -->
-	</div>
-
-	<div class="d-flex flex-column flex-md-row justify-content-md-between pb-2 mb-4 mt-2 border-bottom gap-3">
-		<div class="d-flex flex-column gap-2">
-			<div class="d-flex flex-column flex-md-row align-items-md-center gap-2">
-				<h3 class="mb-0 text-capitalize">{generateGroupDisplayName(group)}</h3>
-				<div>
-					{{{ if group.private }}}<span class="badge text-bg-light border border-1">[[groups:details.private]]</span>{{{ end }}}
-					{{{ if group.hidden }}}<span class="badge text-bg-light border border-1">[[groups:details.hidden]]</span>{{{ end }}}
-				</div>
-			</div>
-			<div>
-				{group.descriptionParsed}
-			</div>
-		</div>
-		<div class="d-flex gap-2 align-items-start">
-			{{{ if loggedIn }}}
-			{membershipBtn(group)}
-			{{{ end }}}
-			{{{ if isAdmin }}}
-			<a href="{config.relative_path}/admin/manage/groups/{group.slug}" target="_blank" class="btn btn-light text-nowrap"><i class="fa fa-gear"></i> [[user:edit]]</a>
-			{{{ end }}}
-		</div>
-	</div>
-
-	<div class="text-sm mb-3 nav d-flex flex-row flex-wrap gap-1 justify-content-end">
-		<button data-bs-toggle="tab" data-bs-target="#groups-posts" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold {{{ if template.groups/details }}}active{{{ end }}}">
-			<div class="flex-grow-1">[[global:posts]]</div>
-		</button>
-		<button data-bs-toggle="tab" data-bs-target="#groups-members" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:members]]</div>
-			<span component="group/member/count" class="flex-shrink-0 text-xs" title="{group.memberCount}">{humanReadableNumber(group.memberCount)}</span>
-		</button>
-
-		{{{ if group.isOwner }}}
-		<button data-bs-toggle="tab" data-bs-target="#groups-pending" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:details.pending]]</div>
-			<span component="group/pending/count" class="flex-shrink-0 text-xs" title="{group.pending.length}">{humanReadableNumber(group.pending.length)}</span>
-		</button>
-
-		<button data-bs-toggle="tab" data-bs-target="#groups-invited" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold gap-2">
-			<div class="flex-grow-1">[[groups:details.invited]]</div>
-			<span component="group/invited/count" class="flex-shrink-0 text-xs" title="{group.invited.length}">{humanReadableNumber(group.invited.length)}</span>
-		</button>
-
-		<button data-bs-toggle="tab" data-bs-target="#groups-admin" class="btn btn-ghost btn-sm text-start d-flex align-items-center ff-secondary fw-semibold">
-			<div class="flex-grow-1">[[global:header.admin]]</div>
-		</button>
-		{{{ end }}}
-	</div>
-
-	<div class="d-flex flex-column flex-md-row">
-		<div data-widget-area="left">
-			{{{each widgets.left}}}
-			{{widgets.left.html}}
-			{{{end}}}
-		</div>
-
-		<div class="flex-grow-1" style="min-width:0;">
-			<div class="tab-content">
-				<div class="tab-pane fade show active" id="groups-posts" role="tabpanel">
-					<h3 class="fw-semibold fs-5">[[global:posts]]</h3>
-					{{{ if !posts.length }}}
-					<div class="alert alert-info my-2">[[groups:details.has-no-posts]]</div>
-					{{{ end }}}
-					<!-- IMPORT partials/posts_list.tpl -->
-				</div>
-				<div class="tab-pane fade" id="groups-members" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.members]]</h3>
-
-					<!-- IMPORT partials/groups/memberlist.tpl -->
-				</div>
-				{{{ if group.isOwner }}}
-				<div class="tab-pane fade" id="groups-pending" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.pending]]</h3>
-					<!-- IMPORT partials/groups/pending.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-invited" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.invited]]</h3>
-					<!-- IMPORT partials/groups/invited.tpl -->
-				</div>
-
-				<div class="tab-pane fade" id="groups-admin" role="tabpanel">
-					<h3 class="fw-semibold fs-5 mb-3">[[groups:details.owner-options]]</h3>
-					<!-- IMPORT partials/groups/admin.tpl -->
-				</div>
-				{{{ end }}}
-			</div>
-		</div>
-
-		<div data-widget-area="right">
-			{{{each widgets.right}}}
-			{{widgets.right.html}}
-			{{{end}}}
-		</div>
-	</div>
-</div>
diff --git a/templates/groups/list.tpl b/templates/groups/list.tpl
deleted file mode 100644
index 53e8283c0..000000000
--- a/templates/groups/list.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-<div data-widget-area="header">
-	{{{each widgets.header}}}
-	{{widgets.header.html}}
-	{{{end}}}
-</div>
-<div class="groups list">
-	<div class="d-flex justify-content-between align-items-center gap-3 flex-wrap">
-		<div>
-			{{{ if allowGroupCreation }}}
-			<button class="btn btn-sm btn-primary" data-action="new"><i class="fa fa-plus"></i> [[groups:new-group]]</button>
-			{{{ end }}}
-		</div>
-
-		<div class="d-flex gap-3 align-items-center">
-			<select class="form-select form-select-sm" id="search-sort">
-				<option value="alpha">[[groups:details.group-name]]</option>
-				<option value="count">[[groups:details.member-count]]</option>
-				<option value="date">[[groups:details.creation-date]]</option>
-			</select>
-
-			<div class="input-group">
-				<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" name="query" value="" id="search-text">
-				<button id="search-button" class="btn btn-sm btn-primary">
-					<i class="fa fa-search"></i>
-				</button>
-			</div>
-		</div>
-	</div>
-
-	<hr />
-
-	<div component="groups/container" class="row" id="groups-list">
-		{{{ if groups.length }}}
-		<!-- IMPORT partials/groups/list.tpl -->
-		{{{ else }}}
-		<div class="col-12">
-			<div class="alert alert-warning">
-			[[groups:no-groups-found]]
-			</div>
-		</div>
-		{{{ end }}}
-	</div>
-
-	<!-- IMPORT partials/paginator.tpl -->
-</div>
diff --git a/templates/groups/members.tpl b/templates/groups/members.tpl
deleted file mode 100644
index 811decd47..000000000
--- a/templates/groups/members.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- IMPORT partials/breadcrumbs.tpl -->
-<div class="users">
-	<!-- IMPORT partials/users_list.tpl -->
-
-	<!-- IMPORT partials/paginator.tpl -->
-</div>
\ No newline at end of file
diff --git a/templates/header.tpl b/templates/header.tpl
index 1b73f1165..76854f2f2 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -2,9 +2,9 @@
 <html lang="{localeToHTML(userLang, defaultLang)}" {{{if languageDirection}}}data-dir="{languageDirection}" style="direction: {languageDirection};"{{{end}}}>
 <head>
 	<title>{browserTitle}</title>
-	{{{each metaTags}}}{buildMetaTag(@value)}{{{end}}}
+	{{{each metaTags}}}{{buildMetaTag(@value)}}{{{end}}}
 	<link rel="stylesheet" type="text/css" href="{relative_path}/assets/client{{{if bootswatchSkin}}}-{bootswatchSkin}{{{end}}}{{{ if (languageDirection=="rtl") }}}-rtl{{{ end }}}.css?{config.cache-buster}" />
-	{{{each linkTags}}}{buildLinkTag(@value)}{{{end}}}
+	{{{each linkTags}}}{{buildLinkTag(@value)}}{{{end}}}
 
 	<script>
 		var config = JSON.parse('{{configJSON}}');
diff --git a/templates/modules/usercard.tpl b/templates/modules/usercard.tpl
index 9c5af0ca9..f4e9caffc 100644
--- a/templates/modules/usercard.tpl
+++ b/templates/modules/usercard.tpl
@@ -1,6 +1,6 @@
 <div class="persona-usercard d-flex text-bg-dark">
 	<a href="{config.relative_path}/user/{userslug}">
-		{buildAvatar(@value, "150px", false, "shadow-none")}
+		{{buildAvatar(@value, "150px", false, "shadow-none")}}
 	</a>
 	<div class="usercard-body w-100 d-flex flex-column justify-content-between gap-2 py-2 px-3 overflow-hidden position-relative">
 
diff --git a/templates/notifications.tpl b/templates/notifications.tpl
index e35db66ed..f0726ee53 100644
--- a/templates/notifications.tpl
+++ b/templates/notifications.tpl
@@ -14,7 +14,7 @@
 				{{{ else }}}
 				<li role="presentation" class="category">
 					<a class="dropdown-item rounded-1 d-flex gap-3 align-items-center justify-content-between" role="menuitem" href="{config.relative_path}/notifications?filter={filters.filter}">
-						<span><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {filters.name}</span>
+						<span><i class="fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i> {tx(filters.name)}</span>
 						<span class="">{./count}</span>
 					</a>
 				</li>
@@ -40,7 +40,7 @@
 		<li data-nid="{notifications.nid}" class="{notifications.readClass} {{{ if !./read}}}unread{{{ end }}} d-flex pointer border p-3 mb-2 d-flex gap-2" component="notifications/item">
 			<div>
 				{{{ if notifications.from }}}
-				{buildAvatar(notifications.user, "24px", true)}
+				{{buildAvatar(notifications.user, "24px", true)}}
 				{{{ else }}}
 				{{{ if notifications.image }}}
 				<img width="24" height="24" src="{notifications.image}" />
diff --git a/templates/partials/account/category-item.tpl b/templates/partials/account/category-item.tpl
index 49307260d..b1fd6d642 100644
--- a/templates/partials/account/category-item.tpl
+++ b/templates/partials/account/category-item.tpl
@@ -3,14 +3,14 @@
 	<div class="content depth-{./depth} d-flex gap-2">
 		<div class="flex-grow-1 align-items-start d-flex gap-2">
 			<div>
-				{buildCategoryIcon(@value, "24px", "rounded-circle")}
+				{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
 			</div>
 			<div class="d-grid gap-0">
 				<div class="title fw-semibold">
 					<!-- IMPORT partials/categories/link.tpl -->
 				</div>
 				{{{ if ./descriptionParsed }}}
-				<div class="description text-muted text-xs w-100 line-clamp-5">{./descriptionParsed}</div>
+				<div class="description text-muted text-xs w-100 line-clamp-5">{{./descriptionParsed}}</div>
 				{{{ end }}}
 			</div>
 		</div>
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl
index 756a94bf9..110f06692 100644
--- a/templates/partials/account/header.tpl
+++ b/templates/partials/account/header.tpl
@@ -7,13 +7,13 @@
 		{{{end}}}
 	</div>
 
-	<div class="cover" component="account/cover" style="background-image: url({escape(cover:url)}); background-position: {cover:position};">
-		<div class="avatar-wrapper" data-uid="{uid}">
-			{buildAvatar(@value, "128px", true)}
-			<span component="user/status" class="position-absolute border border-white border-2 rounded-circle status {status}"><span class="visually-hidden">[[global:{status}]]</span></span>
+	<div class="cover position-absolute start-0 top-0" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
+		<div class="avatar-wrapper bg-body rounded-circle  position-absolute start-50 top-100 translate-middle" data-uid="{uid}" style="padding: 4px;">
+			{{buildAvatar(@value, "128px", true)}}
+			<span component="user/status" class="fs-3 position-absolute border border-white border-2 rounded-circle status {status}" style="top: 17px; right: 3px; padding: 10px;"><span class="visually-hidden">[[global:{status}]]</span></span>
 
 			{{{ if !isSelf }}}
-			<button class="btn-morph persona-fab {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}[[global:unfollow]]{{{ else }}}[[global:follow]]{{{ end }}}">
+			<button style="top: 93px; right:4px;" class="btn-morph persona-fab position-absolute {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}[[global:unfollow]]{{{ else }}}[[global:follow]]{{{ end }}}">
 				<span>
 					<span class="s1"></span>
 					<span class="s2"></span>
@@ -25,13 +25,13 @@
 
 		<div class="container">
 			{{{ if (allowCoverPicture && canEdit) }}}
-			<div class="controls">
-				<a href="#" class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></a>
-				<a href="#" class="resize"><i class="fa fa-fw fa-4x fa-arrows"></i></a>
-				<a href="#" class="remove"><i class="fa fa-fw fa-4x fa-times"></i></a>
+			<div class="controls text-center">
+				<span class="upload p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-upload"></i></span>
+				<span class="resize p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-arrows"></i></span>
+				<span class="remove p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-times"></i></span>
 			</div>
-			<a href="#" class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
-			<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
+			<a href="#" class="save btn btn-primary">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>
+			<div class="indicator text-bg-primary">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
 			{{{ end }}}
 
 			<!-- IMPORT partials/account/menu.tpl -->
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index 16edd5ee0..32a9d1196 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -90,11 +90,11 @@
 		<li><a class="dropdown-item d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/uploads" role="menuitem">[[global:uploads]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.uploaded}">{formattedNumber(counts.uploaded)}</span></a></li>
 		<!-- ENDIF canEdit -->
 
-		{{{each profile_links}}}
+		{{{ each profile_links }}}
 		<!-- IF @first -->
 		<li role="separator" class="dropdown-divider"></li>
 		<!-- ENDIF @first -->
-		<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/{profile_links.route}"><!-- IF ../icon --><i class="fa fa-fw {profile_links.icon}"></i> <!-- END -->{profile_links.name}</a></li>
-		{{{end}}}
+		<li id="{./id}" class="plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}}"><a class="dropdown-item" href="{config.relative_path}/user/{userslug}/{profile_links.route}">{{{ if icon }}}<i class="fa fa-fw {./icon}"></i> {{{ end }}}{tx(./name)}</a></li>
+		{{{ end }}}
 	</ul>
 </div>
diff --git a/templates/partials/account/session-list.tpl b/templates/partials/account/session-list.tpl
index 13cc79c61..7c6e1d241 100644
--- a/templates/partials/account/session-list.tpl
+++ b/templates/partials/account/session-list.tpl
@@ -6,7 +6,7 @@
 		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">[[user:revoke-session]]</button>
 		{{{ end }}}
 		{{{ end }}}
-		{userAgentIcons(@value)}
+		{{userAgentIcons(@value)}}
 		<i class="fa fa-circle text-{{{ if ./current }}}success{{{ else }}}muted{{{ end }}}"></i>
 	</div>
 	[[user:browser-version-on-platform, {./browser}, {./version}, {./platform}]]<br />
diff --git a/templates/partials/breadcrumbs.tpl b/templates/partials/breadcrumbs.tpl
index 3c36fadee..81fa16831 100644
--- a/templates/partials/breadcrumbs.tpl
+++ b/templates/partials/breadcrumbs.tpl
@@ -5,7 +5,7 @@
 		<meta itemprop="position" content="{@index}" />
 		{{{ if ./url }}}<a href="{breadcrumbs.url}" itemprop="item">{{{ end }}}
 			<span itemprop="name">
-				{breadcrumbs.text}
+				{tx(./text)}
 				<!-- IF @last -->
 				<!-- IF !feeds:disableRSS -->
 				<!-- IF rssFeedUrl --><a class="ms-2 link-secondary" target="_blank" href="{rssFeedUrl}" itemprop="item"><i class="fa fa-rss-square"></i></a><!-- ENDIF rssFeedUrl --><!-- ENDIF !feeds:disableRSS -->
diff --git a/templates/partials/buttons/newTopic.tpl b/templates/partials/buttons/newTopic.tpl
index 36fe60cbe..528e01945 100644
--- a/templates/partials/buttons/newTopic.tpl
+++ b/templates/partials/buttons/newTopic.tpl
@@ -10,7 +10,7 @@
 			<a role="menu-item" href="{config.relative_path}/compose?cid={categories.cid}">{categories.level}
 				<span component="category-markup">
 					<div class="category-item d-inline-block">
-						{buildCategoryIcon(@value, "24px", "rounded-circle")}
+						{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
 						{categories.name}
 					</div>
 				</span>
diff --git a/templates/partials/categories/item.tpl b/templates/partials/categories/item.tpl
index 2ae4f71ed..4a40924dc 100644
--- a/templates/partials/categories/item.tpl
+++ b/templates/partials/categories/item.tpl
@@ -3,7 +3,7 @@
 
 	<div class="d-flex col-md-7 gap-2 gap-lg-3">
 		<div class="flex-shrink-0">
-		{buildCategoryIcon(@value, "48px", "rounded-circle")}
+		{{buildCategoryIcon(@value, "48px", "rounded-circle")}}
 		</div>
 		<div class="flex-grow-1 d-flex flex-wrap gap-1">
 			<h2 class="title text-break fs-4 fw-semibold m-0 tracking-tight w-100">
@@ -11,7 +11,7 @@
 			</h2>
 			{{{ if ./descriptionParsed }}}
 			<div class="description text-muted text-sm w-100 line-clamp-sm-5">
-				{./descriptionParsed}
+				{{./descriptionParsed}}
 			</div>
 			{{{ end }}}
 			{{{ if ./teaser.timestampISO }}}
@@ -26,8 +26,8 @@
 				{{{ each ./children }}}
 				{{{ if !./isSection }}}
 				<li class="category-children-item small d-flex gap-1 align-items-center">
-					{buildCategoryIcon(@value, "24px", "rounded-circle")}
-					<a href="{{{ if ./link }}}{txEscape(./link)}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" class="text-reset">{./name}</a>
+					{{buildCategoryIcon(@value, "24px", "rounded-circle")}}
+					<a href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" class="text-reset">{./name}</a>
 				</li>
 				{{{ end }}}
 				{{{ end }}}
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index c7965cb5a..4a180ca2e 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -3,12 +3,12 @@
 	{{{ if @first }}}
 	<div component="category/posts" class="ps-2 text-xs d-flex flex-column h-100 gap-1">
 		<div class="text-nowrap text-truncate">
-			<a class="text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(posts.user, "18px", true)}</a>
+			<a class="text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(posts.user, "18px", true)}}</a>
 			<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./timestampISO}" aria-label="[[global:lastpost]]"></a>
 		</div>
 		<div class="post-content text-xs text-break line-clamp-sm-2 lh-sm position-relative flex-fill">
 			<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" aria-label="[[global:lastpost]]"></a>
-			{./content}
+			{{txEscape(./content)}}
 		</div>
 	</div>
 	{{{ end }}}
diff --git a/templates/partials/categories/link.tpl b/templates/partials/categories/link.tpl
index dd9c7f9bf..7f237ffae 100644
--- a/templates/partials/categories/link.tpl
+++ b/templates/partials/categories/link.tpl
@@ -1,11 +1,5 @@
-<!-- IF ../isSection -->
-{../name}
-<!-- ELSE -->
-<!-- IF ../link -->
-<a href="{txEscape(../link)}" itemprop="url">
-<!-- ELSE -->
-<a href="{config.relative_path}/category/{../slug}" itemprop="url">
-<!-- ENDIF ../link -->
-{../name}
-</a>
-<!-- ENDIF ../isSection -->
\ No newline at end of file
+{{{ if ./isSection }}}
+{tx(./name)}
+{{{ else }}}
+<a class="text-reset" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{tx(./name)}</a>
+{{{ end }}}
diff --git a/templates/partials/category/tags.tpl b/templates/partials/category/tags.tpl
index 8bb8a55f2..d3a7511de 100644
--- a/templates/partials/category/tags.tpl
+++ b/templates/partials/category/tags.tpl
@@ -1,3 +1,3 @@
 {{{ each tags }}}
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="tag tag-item fw-bold tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="tag tag-item fw-bold tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 {{{ end }}}
diff --git a/templates/partials/chats-menu.tpl b/templates/partials/chats-menu.tpl
index 71f01a862..d09e6a362 100644
--- a/templates/partials/chats-menu.tpl
+++ b/templates/partials/chats-menu.tpl
@@ -10,7 +10,7 @@
 	{{{ end }}}
 	<li class="nav-item">
 		<a class="nav-link active text-decoration-none" href="#" data-bs-target="#profile" data-bs-toggle="tab">
-			{buildAvatar(user, "24px", true, "user-icon")}
+			{{buildAvatar(user, "24px", true, "user-icon")}}
 		</a>
 	</li>
 </ul>
diff --git a/templates/partials/cookie-consent.tpl b/templates/partials/cookie-consent.tpl
index 00ffb7b2a..7e3459cf7 100644
--- a/templates/partials/cookie-consent.tpl
+++ b/templates/partials/cookie-consent.tpl
@@ -1,4 +1,4 @@
 <div class="cookie-consent">
-    <button class="float-end btn btn-primary">{dismiss}</button>
-    {message} <a target="_blank" rel="noopener" href="{link_url}">{link}</a>
+    <button class="float-end btn btn-primary">{tx(dismiss)}</button>
+    {tx(message)} <a target="_blank" rel="noopener" href="{link_url}">{tx(link)}</a>
 </div>
diff --git a/templates/partials/groups/admin.tpl b/templates/partials/groups/admin.tpl
deleted file mode 100644
index c45cb8a18..000000000
--- a/templates/partials/groups/admin.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-<form component="groups/settings" role="form">
-	<div class="mb-3">
-		<label class="form-label" for="name">[[groups:details.group-name]]</label>
-		<input <!-- IF group.system -->readonly<!-- ENDIF group.system --> class="form-control" name="name" id="name" type="text" value="{group.displayName}" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label" for="description">[[groups:details.description]]</label>
-		<textarea class="form-control" name="description" id="description" type="text" maxlength="255">{txEscape(group.description)}</textarea>
-	</div>
-
-	<hr />
-	<div class="mb-3">
-		<label class="form-label" for="memberPostCids">[[groups:details.member-post-cids]]</label>
-		<div class="row">
-			<div class="col-md-6">
-				<input id="memberPostCids" type="text" class="form-control" value="{group.memberPostCids}">
-			</div>
-			<div class="col-md-6 member-post-cids-selector">
-				<!-- IMPORT partials/category/selector-dropdown-left.tpl -->
-			</div>
-		</div>
-	</div>
-
-	<hr />
-
-	<div class="mb-3 user-title-option">
-		<label class="form-label" for="userTitle">[[groups:details.badge-text]]</label>
-		<div class="d-flex gap-2">
-			<input component="groups/userTitleOption" class="form-control" name="userTitle" id="userTitle" type="text" maxlength="40" value="{group.userTitleEscaped}"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled --> />
-			<button component="groups/userTitleOption" type="button" class="btn btn-outline-secondary btn-sm text-nowrap" data-action="icon-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change-icon]]</button>
-		</div>
-	</div>
-
-	<div class="mb-3 user-title-option">
-		<div class="d-flex align-items-center gap-3">
-			<label class="form-label mb-0">[[groups:details.badge-preview]]</label>
-			<span class="badge rounded-1 text-uppercase text-truncate rounded-1 d-flex align-items-center gap-1 {{{ if !group.userTitleEnabled }}} hide{{{ end }}}" style="max-width:150px; color: {group.textColor}; background-color: {group.labelColor}"><i class="fa {{{ if (group.icon && (group.icon != "fa-nbb-none")) }}}{group.icon}{{{ else }}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if group.userTitle }}}{group.userTitle}{{{ end }}}</span></span>
-		</div>
-		<hr/>
-		<div class="d-flex flex-column gap-2">
-			<div class="d-flex align-items-center gap-2">
-				<label class="form-label mb-0" for="labelColor" class="badge-color-label">[[groups:details.change-label-colour]]</label>
-				<input component="groups/userTitleOption" type="color" name="labelColor" id="labelColor"  value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
-			</div>
-			<div class="d-flex align-items-center gap-2">
-				<label class="form-label mb-0" for="textColor" class="badge-color-label">[[groups:details.change-text-colour]]</label>
-				<input component="groups/userTitleOption" type="color" name="textColor" id="textColor" value="<!-- IF group.textColor -->{group.textColor}<!-- ENDIF group.textColor -->" />
-			</div>
-			<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
-		</div>
-		<div id="icons" class="hidden">
-			<div class="icon-container">
-				<div class="row nbb-fa-icons">
-					<!-- IMPORT partials/fontawesome.tpl -->
-				</div>
-			</div>
-		</div>
-	</div>
-	<hr />
-	<div class="form-check">
-		<label class="form-check-label" for="userTitleEnabled">[[groups:details.userTitleEnabled]]</label>
-		<input class="form-check-input" name="userTitleEnabled" id="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="private">[[groups:details.private]]</label>
-		<input class="form-check-input" name="private" id="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->>
-		<!-- IF !allowPrivateGroups -->
-		<p class="form-text">
-			[[groups:details.private-system-help]]
-		</p>
-		<!-- ENDIF !allowPrivateGroups -->
-		<p class="form-text">
-			[[groups:details.private-help]]
-		</p>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="disableJoinRequests">[[groups:details.disableJoinRequests]]</label>
-		<input class="form-check-input" name="disableJoinRequests" id="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="disableLeave">[[groups:details.disableLeave]]</label>
-		<input class="form-check-input" name="disableLeave" id="disableLeave" type="checkbox"{{{if group.disableLeave}}} checked{{{end}}}>
-	</div>
-	<div class="form-check">
-		<label class="form-check-label" for="hidden">[[groups:details.hidden]]</label>
-		<input class="form-check-input" name="hidden" id="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->>
-		<p class="form-text">
-			[[groups:details.hidden-help]]
-		</p>
-	</div>
-
-	<div class="d-flex justify-content-end gap-2">
-		<button class="btn btn-link text-danger" type="button" data-action="delete">[[groups:details.delete-group]]</button>
-		<button class="btn btn-primary" type="button" data-action="update">[[global:save-changes]]</button>
-	</div>
-</form>
\ No newline at end of file
diff --git a/templates/partials/groups/badge.tpl b/templates/partials/groups/badge.tpl
deleted file mode 100644
index 3bd2f49b0..000000000
--- a/templates/partials/groups/badge.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<a href="{config.relative_path}/groups/{./slug}" class="badge rounded-1 text-uppercase text-truncate text-decoration-none d-flex align-items-center gap-1" style="line-height: normal; 150px;color:{./textColor};background-color: {./labelColor};"><i class="fa {{{ if (./icon && (./icon != "fa-nbb-none")) }}}{./icon}{{{else}}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if ./userTitle }}}{./userTitle}{{{ end }}}</span></a>
\ No newline at end of file
diff --git a/templates/partials/groups/invited.tpl b/templates/partials/groups/invited.tpl
deleted file mode 100644
index 5ff2bc763..000000000
--- a/templates/partials/groups/invited.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<label class="text-xs text-muted">[[groups:invited.search]]</label>
-<div class="input-group mb-2">
-	<input class="form-control" type="text" component="groups/members/invite"/>
-	<span class="input-group-text search-button"><i class="fa fa-search"></i></span>
-</div>
-
-<div class="mb-2">
-	<label class="text-xs text-muted">[[groups:bulk-invite-instructions]]</label>
-	<textarea class="form-control" component="groups/members/bulk-invite"></textarea>
-</div>
-
-<div class="mb-2 clearfix">
-	<button type="button" class="btn btn-primary btn-sm float-end" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>
-</div>
-
-<div style="max-height: 500px; overflow: auto;">
-	<div component="groups/invited/alert" class="alert alert-info {{{ if group.invited.length }}}hidden{{{ end }}}">[[groups:invited.none]]</div>
-	<table component="groups/invited" class="table table-hover">
-		<tbody>
-			{{{ each group.invited }}}
-			<tr data-uid="{group.invited.uid}" class="align-middle">
-				<td class="member-name p-2 d-flex align-items-center justify-content-between">
-					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.invited.userslug}">{buildAvatar(group.invited, "24px", true)}</a>
-						<a href="{config.relative_path}/user/{group.invited.userslug}">{group.invited.username}</a>
-					</div>
-					<button class="btn btn-outline-secondary btn-sm text-nowrap" data-action="rescindInvite">[[groups:invited.uninvite]]</button>
-				</td>
-			</tr>
-			{{{ end }}}
-		</tbody>
-	</table>
-</div>
\ No newline at end of file
diff --git a/templates/partials/groups/list.tpl b/templates/partials/groups/list.tpl
deleted file mode 100644
index 19796e61b..000000000
--- a/templates/partials/groups/list.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{{each groups}}}
-<div class="col-lg-4 col-md-6 col-sm-12 mb-3" component="groups/summary" data-slug="{groups.slug}">
-	<div class="card h-100">
-		<a href="{config.relative_path}/groups/{groups.slug}" class="card-header list-cover" style="{{{ if groups.cover:thumb:url }}}background-image: url({./cover:thumb:url});background-size: cover;	min-height: 125px; background-position: {./cover:position}{{{ end }}}">
-			<h5 class="card-title d-inline-block mw-100 px-2 py-1 text-truncate text-capitalize fw-bold rounded-1" style="color: white;background-color: rgba(0,0,0,0.5);">{generateGroupDisplayName(@value)} <small>{formattedNumber(groups.memberCount)}</small></h5>
-		</a>
-		<div class="card-body">
-			<p class="text-muted">
-				{txEscape(./description)}
-			</p>
-			<ul class="members list-unstyled d-flex align-items-center gap-2 flex-wrap">
-				{{{each groups.members}}}
-				<li>
-					<a href="{config.relative_path}/user/{groups.members.userslug}">{buildAvatar(groups.members, "24px", true)}</a>
-				</li>
-				{{{end}}}
-			</ul>
-		</div>
-	</div>
-</div>
-{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/groups/memberlist.tpl b/templates/partials/groups/memberlist.tpl
deleted file mode 100644
index 91347f9b9..000000000
--- a/templates/partials/groups/memberlist.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="d-flex mb-3">
-	<!-- IF group.isOwner -->
-	<div class="flex-shrink-0">
-		<button component="groups/members/add" type="button" class="btn btn-primary me-3" title="[[groups:details.add-member]]"><i class="fa fa-user-plus"></i></button>
-	</div>
-	<!-- ENDIF group.isOwner -->
-	<div class="flex-grow-1">
-		<div class="input-group">
-			<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/>
-			<span class="input-group-text search-button"><i class="fa fa-search"></i></span>
-		</div>
-	</div>
-</div>
-
-<div component="groups/members" data-nextstart="{group.membersNextStart}" style="max-height: 500px; overflow: auto;">
-	<table class="table table-hover">
-		<tbody>
-		{{{each group.members}}}
-		<tr class="w-100" data-uid="{group.members.uid}" data-isowner="{{{ if group.members.isOwner }}}1{{{ else }}}0{{{ end }}}">
-			<td class="member-name p-2 w-100 ">
-				<div class="d-flex align-items-center justify-content-between">
-					<div class="d-flex align-items-center gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.members.userslug}">{buildAvatar(group.members, "24px", true)}</a>
-						<a class="align-text-top" href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a>
-						<i component="groups/owner/icon" title="[[groups:owner]]" class="user-owner-icon fa fa-star align-text-top text-warning {{{ if !group.members.isOwner }}}invisible{{{ end }}}"></i>
-					</div>
-
-					{{{ if group.isOwner }}}
-					<div class="owner-controls d-flex gap-1">
-						<a class="btn btn-light btn-sm" href="#" data-action="toggleOwnership" title="[[groups:details.grant]]">
-							<i class="fa fa-star text-warning"></i>
-						</a>
-
-						<a class="btn btn-light btn-sm" href="#" data-action="kick" title="[[groups:details.kick]]">
-							<i class="fa fa-ban text-danger"></i>
-						</a>
-					</div>
-					{{{ end }}}
-				</div>
-			</td>
-		</tr>
-		{{{end}}}
-		</tbody>
-	</table>
-</div>
\ No newline at end of file
diff --git a/templates/partials/groups/pending.tpl b/templates/partials/groups/pending.tpl
deleted file mode 100644
index b4ad50fd8..000000000
--- a/templates/partials/groups/pending.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{{ if group.pending.length }}}
-<div class="d-flex justify-content-end gap-2 mb-3">
-	<button class="btn btn-danger btn-sm" data-action="rejectAll">[[groups:pending.reject-all]]</button>
-	<button class="btn btn-success btn-sm" data-action="acceptAll">[[groups:pending.accept-all]]</button>
-</div>
-{{{ end }}}
-
-<div style="max-height: 500px;overflow: auto;">
-	<div component="groups/pending/alert" class="alert alert-info {{{ if group.pending.length }}}hidden{{{ end }}}">[[groups:pending.none]]</div>
-	<table component="groups/pending" class="table table-hover">
-		<tbody>
-			{{{ each group.pending }}}
-			<tr data-uid="{group.pending.uid}" class="align-middle">
-				<td class="member-name p-2 d-flex align-items-center justify-content-between">
-					<div class="d-flex gap-2">
-						<a class="text-decoration-none" href="{config.relative_path}/user/{group.pending.userslug}">{buildAvatar(group.pending, "24px", true)}</a>
-						<a href="{config.relative_path}/user/{group.pending.userslug}">{group.pending.username}</a>
-					</div>
-					<div class="d-flex gap-2">
-						<button class="btn btn-danger btn-sm" data-action="reject">[[groups:pending.reject]]</a></li>
-						<button class="btn btn-success btn-sm" data-action="accept">[[groups:pending.accept]]</a></li>
-					</div>
-				</td>
-			</tr>
-			{{{ end }}}
-		</tbody>
-	</table>
-</div>
diff --git a/templates/partials/header/user-menu.tpl b/templates/partials/header/user-menu.tpl
index 1d0a67cd4..b9198a746 100644
--- a/templates/partials/header/user-menu.tpl
+++ b/templates/partials/header/user-menu.tpl
@@ -1,6 +1,6 @@
 <li id="user_label" class="nav-item dropdown px-3" title="[[global:header.profile]]">
 	<a href="#" for="user-control-list-check" data-bs-toggle="dropdown" id="user_dropdown" role="button" component="header/avatar" aria-haspopup="true" aria-expanded="false">
-		{buildAvatar(user, "32px", true)}
+		{{buildAvatar(user, "32px", true)}}
 		<span id="user-header-name" class="d-block d-sm-none">{user.username}</span>
 	</a>
 	<input type="checkbox" class="hidden" id="user-control-list-check" aria-hidden="true">
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index e23c2d259..6fc0d3743 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -35,7 +35,7 @@
 			<button type="button" class="navbar-toggler border-0" id="mobile-chats">
 				<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></span>
 				<span component="chat/icon" class="notification-icon fa fa-fw fa-comments unread-count" data-content="{unreadCount.chat}"></span>
-				{buildAvatar(user, "32px", true)}
+				{{buildAvatar(user, "32px", true)}}
 			</button>
 			{{{ end }}}
 
@@ -47,14 +47,14 @@
 				<ul id="main-nav" class="navbar-nav me-auto mb-2 mb-lg-0">
 					{{{each navigation}}}
 					{{{ if displayMenuItem(@root, @index) }}}
-					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{navigation.title}">
+					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{tx(./title)}">
 						<a class="nav-link navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
 						{{{ if navigation.dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.targetBlank }}} target="_blank"{{{ end }}}>
 							{{{ if navigation.iconClass }}}
-							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
+							<i class="fa fa-fw {navigation.iconClass}" data-content="{./content}"></i>
 							{{{ end }}}
-							{{{ if navigation.text }}}
-							<span class="{navigation.textClass}">{navigation.text}</span>
+							{{{ if ./text }}}
+							<span class="{./textClass}">{tx(./text)}</span>
 							{{{ end }}}
 							{{{ if navigation.dropdown}}}
 							<i class="fa fa-caret-down"></i>
@@ -62,7 +62,7 @@
 						</a>
 						{{{ if navigation.dropdown }}}
 						<ul class="dropdown-menu p-1" role="menu">
-							{navigation.dropdownContent}
+							{{navigation.dropdownContent}}
 						</ul>
 						{{{ end }}}
 					</li>
diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
index e779ca758..cce18aaea 100644
--- a/templates/partials/notifications_list.tpl
+++ b/templates/partials/notifications_list.tpl
@@ -11,7 +11,7 @@
 		<div class="btn btn-ghost btn-sm d-flex gap-2 flex-grow-1 align-items-start text-start">
 			<a class="flex-grow-0 flex-shrink-0" href="{{{ if ./user.userslug}}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
 				{{{ if ./user }}}
-				{buildAvatar(./user, "32px", true)}
+				{{buildAvatar(./user, "32px", true)}}
 				{{{ else }}}
 					{{{ if ./icon }}}
 					<div class="avatar avatar-rounded" style="--avatar-size: 32px;"><i class="text-secondary fa {./icon}"></i></div>
@@ -25,11 +25,11 @@
 
 			<div class="d-flex flex-grow-1 flex-column gap-1 align-items-start position-relative">
 				<a href="{./path}" class="text-decoration-none d-inline-block text-reset text-break text-sm ff-sans stretched-link" component="notifications/item/link">
-					{./bodyShort}
+					{{./bodyShort}}
 				</a>
 				{{{ if ./bodyLong}}}
 				<div class="text-secondary text-sm line-clamp-2 text-contain hidden-blockquote hidden-pre hidden-first-child-br">
-					{./bodyLong}
+					{{./bodyLong}}
 				</div>
 				{{{ end }}}
 				<div class="text-xs text-muted">{{{ if ./timeagoLong }}}{./timeagoLong}{{{ else }}}<span class="timeago" title="{./datetimeISO}"></span>{{{ end }}}</div>
diff --git a/templates/partials/posts_list_item.tpl b/templates/partials/posts_list_item.tpl
index 9721ede6f..d5b9991ea 100644
--- a/templates/partials/posts_list_item.tpl
+++ b/templates/partials/posts_list_item.tpl
@@ -5,7 +5,7 @@
         </a>
 
         <div component="post/content" class="content mb-3">
-            {../content}
+            {{txEscape(../content)}}
         </div>
 
         <div class="mb-3">
@@ -15,7 +15,7 @@
             {{{ if ../topic.tags.length }}}
             <span class="tag-list">
                 {{{ each ../topic.tags }}}
-                <a href="{config.relative_path}/tags/{topic.tags.valueEncoded}"><span class="tag tag-item tag-class-{topic.tags.class}">{topic.tags.valueEscaped}</span></a>
+                <a href="{config.relative_path}/tags/{topic.tags.valueEncoded}"><span class="tag tag-item tag-class-{topic.tags.class}">{topic.tags.value}</span></a>
                 {{{ end }}}
             </span>
             {{{ end }}}
@@ -23,7 +23,7 @@
         </div>
 
         <div class="post-info">
-            <a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "28px", true, "user-img not-responsive")}</a>
+            <a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "28px", true, "user-img not-responsive")}}</a>
 
             <div class="post-author text-secondary text-uppercase">
                 <a class="text-reset" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a><br />
diff --git a/templates/partials/quick-category-search-results.tpl b/templates/partials/quick-category-search-results.tpl
index e7fd08292..92d81074c 100644
--- a/templates/partials/quick-category-search-results.tpl
+++ b/templates/partials/quick-category-search-results.tpl
@@ -11,7 +11,7 @@
 	{{{ each categories }}}
 	<li data-cid="{./cid}" class="d-flex flex-column gap-1">
 		<div class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center rounded-1 text-start text-reset d-block text-truncate px-2 py-1 position-relative">
-			<div class="flex-shrink-0">{buildCategoryIcon(@value, "40px", "rounded-circle")}</div>
+			<div class="flex-shrink-0">{{buildCategoryIcon(@value, "40px", "rounded-circle")}}</div>
 			<div class="flex-grow-1" style="min-width:0;">
 				<a class="stretched-link" href="{config.relative_path}/category/{./slug}"></a>
 				<span class="quick-search-title fw-semibold text-sm">
@@ -22,7 +22,7 @@
 				</span>
 				<br/>
 				<div class="snippet text-xs text-break text-wrap mb-0 text-sm text-secondary line-clamp-1">
-					{./descriptionParsed}
+					{{./descriptionParsed}}
 				</div>
 			</div>
 		</div>
diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index c79544f3f..3a9868041 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -3,7 +3,7 @@
 <li data-tid="{posts.topic.tid}" data-pid="{posts.pid}">
 	<a href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}"
 		class="text-decoration-none text-reset clearfix d-block text-truncate px-3 py-1">
-		{buildAvatar(posts.user, "24px", true)}
+		{{buildAvatar(posts.user, "24px", true)}}
 		<span class="quick-search-title fw-bold">{posts.topic.title}</span>
 		<br/>
 		<p class="snippet text-break text-wrap">
@@ -11,7 +11,7 @@
 		</p>
 		<small class="post-info float-end">
 			<div class="category-item d-inline-block">
-				{buildCategoryIcon(./category, "24px", "rounded-circle")} {posts.category.name}
+				{{buildCategoryIcon(./category, "24px", "rounded-circle")}} {posts.category.name}
 				&bull; <span class="timeago" title="{posts.timestampISO}"></span>
 			</div>
 		</small>
diff --git a/templates/partials/search-filters.tpl b/templates/partials/search-filters.tpl
index 7f23b4904..630c82247 100644
--- a/templates/partials/search-filters.tpl
+++ b/templates/partials/search-filters.tpl
@@ -3,7 +3,7 @@
 	<div class="post-search-item">
 		<div component="category/filter" class="dropdown" data-filter-name="category">
 			<a component="category/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.categories.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.categories.active }}}{filters.categories.label}{{{ else }}}[[search:categories]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.categories.active }}}{tx(filters.categories.label)}{{{ else }}}[[search:categories]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -29,7 +29,7 @@
 	<div class="post-search-item">
 		<div component="tag/filter" class="dropdown" data-filter-name="tag">
 			<a component="tag/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.tags.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.tags.active }}}{filters.tags.label}{{{ else }}}[[search:tags]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.tags.active }}}{tx(filters.tags.label)}{{{ else }}}[[search:tags]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -39,15 +39,15 @@
 					<div component="tag/filter/selected" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterSelected }}}
 						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
-							<div>{./valueEscaped}</div>
-							<button component="tag/filter/delete" data-tag="{./valueEscaped}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
+							<div>{./value}</div>
+							<button component="tag/filter/delete" data-tag="{./value}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
 						</div>
 						{{{ end }}}
 					</div>
 					<hr class="my-2"/>
 					<div component="tag/filter/results" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterResults }}}
-						<button class="btn btn-light btn-sm border" data-tag="{./valueEscaped}">{./valueEscaped}</button>
+						<button class="btn btn-light btn-sm border" data-tag="{./value}">{./value}</button>
 						{{{ end }}}
 					</div>
 				</li>
@@ -59,7 +59,7 @@
 	<div class="post-search-item">
 		<div component="user/filter" class="dropdown" data-filter-name="user">
 			<a component="user/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.users.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.users.active }}}{filters.users.label}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.users.active }}}{tx(filters.users.label)}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -69,7 +69,7 @@
 					<div component="user/filter/selected" class="d-flex flex-wrap gap-2">
 						{{{ each userFilterSelected }}}
 						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
-							{buildAvatar(@value, "16px", true)} {./username}
+							{{buildAvatar(@value, "16px", true)}} {./username}
 							<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
 						</div>
 						{{{ end }}}
@@ -77,7 +77,7 @@
 					<hr class="my-2"/>
 					<div component="user/filter/results" class="d-flex flex-wrap gap-2">
 						{{{ each userFilterResults }}}
-						<button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>
+						<button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{{buildAvatar(@value, "16px", true)}} {./username}</button>
 						{{{ end }}}
 					</div>
 				</li>
@@ -90,7 +90,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="replies">
 			<a id="reply-count-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.replies.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.replies.active }}}{filters.replies.label}{{{ else }}}[[search:replies]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.replies.active }}}{tx(filters.replies.label)}{{{ else }}}[[search:replies]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -110,7 +110,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="time">
 			<a id="post-time-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.time.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.time.active }}}{filters.time.label}{{{ else }}}[[search:time]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.time.active }}}{tx(filters.time.label)}{{{ else }}}[[search:time]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -139,7 +139,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="sort">
 			<a id="sort-by-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.sort.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.sort.active }}}{filters.sort.label}{{{ else }}}[[search:sort]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.sort.active }}}{tx(filters.sort.label)}{{{ else }}}[[search:sort]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
diff --git a/templates/partials/search-results.tpl b/templates/partials/search-results.tpl
index 87d0cd6ac..e12c12032 100644
--- a/templates/partials/search-results.tpl
+++ b/templates/partials/search-results.tpl
@@ -1,6 +1,6 @@
 <div id="results" class="search-results col-md-12" data-search-query="{search_query}">
 	{{{ if matchCount }}}
-	<div class="alert alert-info">[[search:results-matching, {matchCount}, {txEscape(search_query)}, {time}]] </div>
+	<div class="alert alert-info">{{tx("search:results-matching", matchCount, txEscape(search_query), time)}}</div>
 	{{{ else }}}
 	{{{ if search_query }}}
 	<div class="alert alert-warning">[[search:no-matches]]</div>
@@ -11,21 +11,21 @@
 	<div class="topic-row card clearfix mb-3">
 		<div class="card-body">
 			<div class="mb-2">
-				<a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "24px", true)}</a>
+				<a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "24px", true)}}</a>
 				<a class="topic-title fw-semibold fs-5" href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}">{./topic.title}</a>
 			</div>
 
 			{{{ if showAsPosts }}}
 			<div component="post/content" class="content">
-				{./content}
+				{{./content}}
 			</div>
 			{{{ end }}}
 
 			<small class="post-info">
 				<a href="{config.relative_path}/category/{./category.slug}">
 					<div class="category-item d-inline-block">
-						{buildCategoryIcon(./category, "24px", "rounded-circle")}
-						{./category.name}
+						{{buildCategoryIcon(./category, "24px", "rounded-circle")}}
+						{tx(./category.name)}
 					</div>
 				</a> &bull;
 				<span class="timeago" title="{./timestampISO}"></span>
diff --git a/templates/partials/tags_list.tpl b/templates/partials/tags_list.tpl
index cd5664a0a..0b5dbde2d 100644
--- a/templates/partials/tags_list.tpl
+++ b/templates/partials/tags_list.tpl
@@ -1,5 +1,8 @@
 {{{each tags}}}
 <h5 class="float-start tag-container me-5 mb-5 fw-bold">
-	<a href="{config.relative_path}/tags/{tags.valueEncoded}" data-tag="{tags.valueEscaped}"><span class="tag-item text-muted text-uppercase text-nowrap tag-class-{tags.class} me-2" data-tag="{tags.valueEscaped}">{tags.valueEscaped}</span><span class="tag-topic-count text-primary text-nowrap" title="{tags.score}">{formattedNumber(tags.score)}</span></a>
+	<a href="{config.relative_path}/tags/{./valueEncoded}" data-tag="{./value}">
+		<span class="tag-item text-muted text-uppercase text-nowrap tag-class-{tags.class} me-2" data-tag="{tags.value}">{./value}</span>
+		<span class="tag-topic-count text-primary text-nowrap" title="{./score}">{tx("global:x-topics", formattedNumber(./score))}</span>
+	</a>
 </h5>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/partials/toast.tpl b/templates/partials/toast.tpl
deleted file mode 100644
index 6d228bd36..000000000
--- a/templates/partials/toast.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="{alert_id}" role="alert" class="alert alert-dismissible alert-{type} fade show" component="toaster/toast">
-	<div class="alert-progress position-absolute top-0 start-0 bottom-0 h-100 z-0" style=" opacity:0.1;"></div>
-	<div class="d-flex flex-wrap gap-2 position-relative">
-		{{{ if image }}}
-		<img src="{image}" height="80" style="width: auto;" />
-		{{{ end }}}
-		<div class="d-flex flex-column gap-2">
-			{{{ if title }}}
-			<strong>{title}</strong>
-			{{{ end }}}
-
-			{{{ if message }}}
-			<p class="m-0">{message}</p>
-			{{{ end }}}
-		</div>
-	</div>
-
-	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="close"></button>
-</div>
diff --git a/templates/partials/topic/event.tpl b/templates/partials/topic/event.tpl
index a46004b75..594915fa2 100644
--- a/templates/partials/topic/event.tpl
+++ b/templates/partials/topic/event.tpl
@@ -3,7 +3,7 @@
 		<i class="fa {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}}"></i>
 	</div>
 	<span class="timeline-text">
-		{./text}
+		{{./text}}
 	</span>
 	{{{ if (privileges.isAdminOrMod && ./id) }}}
 		&nbsp;<span component="topic/event/delete" data-topic-event-id="{./id}" data-topic-event-type="{./type}" class="timeline-text pointer" title="[[topic:delete-event]]"><i class="fa fa-trash"></i></span>
diff --git a/templates/partials/topic/navigation-post.tpl b/templates/partials/topic/navigation-post.tpl
index 26d8f29fc..12104d4ac 100644
--- a/templates/partials/topic/navigation-post.tpl
+++ b/templates/partials/topic/navigation-post.tpl
@@ -1,7 +1,7 @@
 <div class="clearfix">
 	<div class="icon float-start">
 		<a href="<!-- IF post.user.userslug -->{config.relative_path}/user/{post.user.userslug}<!-- ELSE -->#<!-- ENDIF post.user.userslug -->">
-			{buildAvatar(post.user, "24px", true, "", "user/picture")} {post.user.username}
+			{{buildAvatar(post.user, "24px", true, "", "user/picture")}} {post.user.username}
 		</a>
 	</div>
 	<small class="float-end">
@@ -9,4 +9,4 @@
 	</small>
 </div>
 
-<div>{post.content}</div>
\ No newline at end of file
+<div>{{post.content}}</div>
\ No newline at end of file
diff --git a/templates/partials/topic/necro-post.tpl b/templates/partials/topic/necro-post.tpl
index 92f38c9b0..9deaaedbb 100644
--- a/templates/partials/topic/necro-post.tpl
+++ b/templates/partials/topic/necro-post.tpl
@@ -1,3 +1,3 @@
 <li component="topic/necro-post" class="necro-post text-muted timeline-event">
-	<span class="timeline-text">{text}</span>
+	<span class="timeline-text">{tx(text)}</span>
 </li>
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 1e84b08c8..13019c822 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -9,7 +9,7 @@
 <div class="clearfix post-header">
 	<div class="icon float-start">
 		<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->">
-			{buildAvatar(posts.user, "48px", true, "", "user/picture")}
+			{{buildAvatar(posts.user, "48px", true, "", "user/picture")}}
 			{{{ if ./user.isLocal }}}
 			<span component="user/status" class="position-absolute top-100 start-100 border border-white border-2 rounded-circle status {posts.user.status}"><span class="visually-hidden">[[global:{posts.user.status}]]</span></span>
 			{{{ else }}}
@@ -48,7 +48,7 @@
 					<!-- IF posts.user.custom_profile_info.length -->
 					&#124;
 					{{{each posts.user.custom_profile_info}}}
-					{posts.user.custom_profile_info.content}
+					{{posts.user.custom_profile_info.content}}
 					{{{end}}}
 					<!-- ENDIF posts.user.custom_profile_info.length -->
 				</span>
@@ -72,12 +72,12 @@
 <br />
 
 <div class="content" component="post/content" itemprop="text">
-	{posts.content}
+	{{posts.content}}
 </div>
 
 <div class="post-footer">
 	{{{ if posts.user.signature }}}
-	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
+	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{txEscape(posts.user.signature)}}</div>
 	{{{ end }}}
 
 	<div class="clearfix">
@@ -85,14 +85,14 @@
 	<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="threaded-replies user-select-none float-start text-muted {{{ if (!./replies || shouldHideReplyContainer(@value)) }}}hidden{{{ end }}}">
 		<span component="post/reply-count/avatars" class="avatars d-inline-flex gap-1 align-items-top hidden-xs {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
 			{{{each posts.replies.users}}}
-			<span>{buildAvatar(posts.replies.users, "16px", true, "")}</span>
+			<span>{{buildAvatar(posts.replies.users, "16px", true, "")}}</span>
 			{{{end}}}
 			{{{ if posts.replies.hasMore}}}
 			<span><i class="fa fa-ellipsis"></i></span>
 			{{{ end }}}
 		</span>
 
-		<span class="replies-count small" component="post/reply-count/text" data-replies="{posts.replies.count}">{posts.replies.text}</span>
+		<span class="replies-count small" component="post/reply-count/text" data-replies="{posts.replies.count}">{tx(posts.replies.text)}</span>
 		<span class="replies-last hidden-xs small">[[topic:last-reply-time]] <span class="timeago" title="{posts.replies.timestampISO}"></span></span>
 
 		<i class="fa fa-fw fa-chevron-down" component="post/replies/open"></i>
diff --git a/templates/partials/topic/quickreply.tpl b/templates/partials/topic/quickreply.tpl
index b8b669644..73a1c89bc 100644
--- a/templates/partials/topic/quickreply.tpl
+++ b/templates/partials/topic/quickreply.tpl
@@ -2,7 +2,7 @@
 <div component="topic/quickreply/container" class="quick-reply d-flex gap-3 mb-4">
 	<div class="icon hidden-xs">
 		<a class="d-inline-block position-relative" href="{{{ if loggedInUser.userslug }}}{config.relative_path}/user/{loggedInUser.userslug}{{{ else }}}#{{{ end }}}">
-			{buildAvatar(loggedInUser, "48px", true, "", "user/picture")}
+			{{buildAvatar(loggedInUser, "48px", true, "", "user/picture")}}
 		</a>
 	</div>
 	<form class="flex-grow-1 d-flex flex-column gap-2" method="post" action="{config.relative_path}/compose">
diff --git a/templates/partials/topic/tag.tpl b/templates/partials/topic/tag.tpl
index 61ac069e5..940829914 100644
--- a/templates/partials/topic/tag.tpl
+++ b/templates/partials/topic/tag.tpl
@@ -1 +1 @@
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
\ No newline at end of file
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 8a2733c99..d78d960e2 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -3,7 +3,7 @@
 	{{{ each topics }}}
 	<li component="category/topic" class="category-item hover-parent py-2 mb-2 d-flex flex-column flex-lg-row align-items-start {generateTopicClass(@value)}" <!-- IMPORT partials/data/category.tpl -->>
 		<link itemprop="url" content="{config.relative_path}/topic/{./slug}" />
-		<meta itemprop="name" content="{stripTags(./title)}" />
+		<meta itemprop="name" content="{./title}" />
 		<meta itemprop="itemListOrder" content="descending" />
 		<meta itemprop="position" content="{increment(./index, "1")}" />
 		<a id="{./index}" data-index="{./index}" component="topic/anchor"></a>
@@ -11,7 +11,7 @@
 		<div class="d-flex p-0 col-12 col-lg-7 gap-2 gap-lg-3 pe-1 align-items-start {{{ if config.theme.mobileTopicTeasers }}}mb-2 mb-lg-0{{{ end }}}">
 			<div class="flex-shrink-0 position-relative">
 				<a class="d-inline-block text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
-					{buildAvatar(./user, "40px", true)}
+					{{buildAvatar(./user, "40px", true)}}
 				</a>
 				{{{ if showSelect }}}
 				<div class="checkbox position-absolute top-100 start-50 translate-middle-x m-0 d-none d-lg-flex" style="max-width:max-content">
@@ -51,12 +51,12 @@
 					{{{each ./icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 
 					{{{ if (!template.category || (cid != ./cid)) }}}
-					{buildCategoryLabel(./category, "a", "border")}
+					{{buildCategoryLabel(./category, "a", "border")}}
 					{{{ end }}}
 
 					<span data-tid="{./tid}" component="topic/tags" class="lh-1 tag-list d-flex flex-wrap gap-1 {{{ if !./tags.length }}}hidden{{{ end }}}">
 						{{{ each ./tags }}}
-						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 						{{{ end }}}
 					</span>
 
@@ -114,12 +114,12 @@
 					{{{ else }}}
 					{{{ if ./teaser.pid }}}
 					<div class="ps-2">
-						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{./teaser.user.displayname}">{buildAvatar(./teaser.user, "18px", true)}</a>
+						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{./teaser.user.displayname}">{{buildAvatar(./teaser.user, "18px", true)}}</a>
 						<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" title="{./teaser.timestampISO}" aria-label="[[global:lastpost]]"></a>
 					</div>
 					<div class="post-content text-xs ps-2 line-clamp-sm-2 lh-sm text-break position-relative flex-fill">
 						<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" aria-label="[[global:lastpost]]"></a>
-						{./teaser.content}
+						{{txEscape(./teaser.content)}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}
diff --git a/templates/partials/users/item.tpl b/templates/partials/users/item.tpl
index 9c5f043e5..8c325b15f 100644
--- a/templates/partials/users/item.tpl
+++ b/templates/partials/users/item.tpl
@@ -1,5 +1,5 @@
 <li class="users-box registered-user text-center pb-3" data-uid="{users.uid}" style="width: 102px;">
-	<a href="{config.relative_path}/user/{users.userslug}">{buildAvatar(users, "64px", true)}</a>
+	<a href="{config.relative_path}/user/{users.userslug}">{{buildAvatar(users, "64px", true)}}</a>
 
 	<div class="user-info">
 		<div class="text-nowrap text-truncate">
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 136e7906a..e425537e0 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -5,15 +5,7 @@
 </div>
 <div class="row mb-5">
 	<div class="topic {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}" itemid="{url}" itemscope itemtype="https://schema.org/DiscussionForumPosting">
-		<meta itemprop="headline" content="{escape(titleRaw)}">
-		<meta itemprop="text" content="{escape(titleRaw)}">
-		<meta itemprop="url" content="{url}">
-		<meta itemprop="datePublished" content="{timestampISO}">
-		<meta itemprop="dateModified" content="{lastposttimeISO}">
-		<div itemprop="author" itemscope itemtype="https://schema.org/Person">
-			<meta itemprop="name" content="{author.username}">
-			{{{ if author.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{author.userslug}">{{{ end }}}
-		</div>
+		<!-- IMPORT partials/topic/meta-tags.tpl -->
 
 		<div class="topic-header sticky-top mb-3 bg-body">
 			<div class="d-flex flex-wrap gap-3 border-bottom p-2">
@@ -40,7 +32,7 @@
 							</a>
 							{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
 						</span>
-						{buildCategoryLabel(category, "a", "border")}
+						{{buildCategoryLabel(category, "a", "border")}}
 						<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>
 						<div class="d-flex gap-2" component="topic/stats"><!-- IMPORT partials/topic/stats.tpl --></div>
 						{{{ if !feeds:disableRSS }}}
diff --git a/templates/world.tpl b/templates/world.tpl
index 159fefc96..36009edd3 100644
--- a/templates/world.tpl
+++ b/templates/world.tpl
@@ -13,12 +13,12 @@
 
 <div class="category-header d-flex flex-column gap-2">
 	<div class="d-flex gap-2 align-items-center mb-1 {{{ if config.theme.centerHeaderElements }}}justify-content-center{{{ end }}}">
-		{buildCategoryIcon(@value, "40px", "rounded-1 flex-shrink-0")}
+		{{buildCategoryIcon(@value, "40px", "rounded-1 flex-shrink-0")}}
 		<h1 class="tracking-tight fs-2 fw-semibold mb-0 text-center">[[world:name]]</h1>
 	</div>
 	{{{ if ./descriptionParsed }}}
 	<p class="description text-secondary text-sm w-100 {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
-		{./descriptionParsed}
+		{{./descriptionParsed}}
 	</p>
 	{{{ end }}}
 </div>
@@ -39,14 +39,14 @@
 								{{{ each categories }}}
 								<li class="flex-grow-1 align-items-start d-flex gap-2 p-1 mb-2 position-relative">
 									<div>
-										{buildCategoryIcon(@value, "24px", "rounded-1")}
+										{{buildCategoryIcon(@value, "24px", "rounded-1")}}
 									</div>
 									<div class="d-grid gap-0">
 										<div class="title fw-semibold">
 											<a class="text-reset stretched-link" href="{{{ if ./link }}}{./link}{{{ else }}}{config.relative_path}/category/{./slug}{{{ end }}}" itemprop="url">{../name}</a>
 										</div>
 										{{{ if ./descriptionParsed }}}
-										<div class="description text-muted text-xs w-100 line-clamp-sm-5">{./descriptionParsed}</div>
+										<div class="description text-muted text-xs w-100 line-clamp-sm-5">{{./descriptionParsed}}</div>
 										{{{ end }}}
 									</div>
 								</li>