diff --git a/templates/account/blocks.tpl b/templates/account/blocks.tpl
index cdd5ae798..f53ac6b90 100644
--- a/templates/account/blocks.tpl
+++ b/templates/account/blocks.tpl
@@ -1,16 +1,16 @@
 <!-- IMPORT partials/account/header.tpl -->
-<h1 class="fs-4">[[pages:account/blocks, {username}]]</h1>
+<h1 class="fs-4">{{tx("pages:account/blocks", txEscape(username))}}</h1>
 <div class="row justify-content-end mb-2">
 	<div class="col-3">
 		<div class="dropdown">
-			<input class="form-control" type="text" id="user-search" placeholder="[[users:enter-username]]" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false"/>
+			<input class="form-control" type="text" id="user-search" placeholder="{{tx("users:enter-username")}}" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false"/>
 
 			<ul component="blocks/search/list" class="dropdown-menu p-1 block-edit list-unstyled" role="menu">
 				<li component="blocks/start-typing">
-					<a href="#" class="dropdown-item rounded-1" role="menuitem">[[admin/menu:search.start-typing]]</a>
+					<a href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("admin/menu:search.start-typing")}}</a>
 				</li>
 				<li component="blocks/no-users" class="hidden">
-					<a href="#" class="dropdown-item rounded-1" role="menuitem">[[users:no-users-found]]</a>
+					<a href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("users:no-users-found")}}</a>
 				</li>
 				{{{ each edit }}}
 				<li component="blocks/search/match">
@@ -19,8 +19,8 @@
 							<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>
-						<button class="btn btn-sm btn-outline-primary text-nowrap {{{ if !./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="unblock">[[user:unblock-user]]</button>
+						<button class="btn btn-sm btn-outline-danger text-nowrap {{{ if ./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="block">{{tx("user:block-user")}}</button>
+						<button class="btn btn-sm btn-outline-primary text-nowrap {{{ if !./isBlocked }}}hidden{{{ end }}}" data-uid="{./uid}" data-action="unblock">{{tx("user:unblock-user")}}</button>
 					</div>
 				</li>
 				{{{ end }}}
@@ -30,12 +30,12 @@
 </div>
 
 <div class="users row">
-	<div class="alert alert-warning text-center {{{ if users.length }}}hidden{{{ end }}}">[[user:has-no-blocks]]</div>
+	<div class="alert alert-warning text-center {{{ if users.length }}}hidden{{{ end }}}">{{tx("user:has-no-blocks")}}</div>
 	<div id="users-container" class="users-container list-unstyled d-flex flex-wrap gap-2">
 		{{{ each users }}}
 		<div class="d-flex flex-column gap-1">
 			<!-- IMPORT partials/users/item.tpl -->
-			<button class="btn btn-sm btn-outline-primary text-nowrap mx-auto" data-uid="{./uid}" data-action="unblock">[[user:unblock-user]]</button>
+			<button class="btn btn-sm btn-outline-primary text-nowrap mx-auto" data-uid="{./uid}" data-action="unblock">{{tx("user:unblock-user")}}</button>
 		</div>
 		{{{ end }}}
 
diff --git a/templates/account/categories.tpl b/templates/account/categories.tpl
index 65d5e9d94..03381a7af 100644
--- a/templates/account/categories.tpl
+++ b/templates/account/categories.tpl
@@ -6,14 +6,14 @@
 		<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">
-					<span>[[user:change-all]]</span>
+					<span>{{tx("user:change-all")}}</span>
 					<span class="caret"></span>
 				</button>
 				<ul class="dropdown-menu p-1" role="menu">
-					<li><a class="dropdown-item rounded-1" href="#" component="category/watching" data-state="watching" role="menuitem"><i class="fa fa-fw fa-bell-o"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
-					<li><a class="dropdown-item rounded-1" href="#" component="category/tracking" data-state="tracking" role="menuitem"><i class="fa fa-fw fa-inbox"></i> [[category:tracking]]<p class="help-text"><small>[[category:tracking.description]]</small></p></a></li>
-					<li><a class="dropdown-item rounded-1" href="#" component="category/notwatching" data-state="notwatching" role="menuitem"><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]<p class="help-text"><small>[[category:not-watching.description]]</small></p></a></li>
-					<li><a class="dropdown-item rounded-1" href="#" component="category/ignoring" data-state="ignoring" role="menuitem"><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
+					<li><a class="dropdown-item rounded-1" href="#" component="category/watching" data-state="watching" role="menuitem"><i class="fa fa-fw fa-bell-o"></i> {{tx("category:watching")}}<p class="help-text"><small>{{tx("category:watching.description")}}</small></p></a></li>
+					<li><a class="dropdown-item rounded-1" href="#" component="category/tracking" data-state="tracking" role="menuitem"><i class="fa fa-fw fa-inbox"></i> {{tx("category:tracking")}}<p class="help-text"><small>{{tx("category:tracking.description")}}</small></p></a></li>
+					<li><a class="dropdown-item rounded-1" href="#" component="category/notwatching" data-state="notwatching" role="menuitem"><i class="fa fa-fw fa-clock-o"></i> {{tx("category:not-watching")}}<p class="help-text"><small>{{tx("category:not-watching.description")}}</small></p></a></li>
+					<li><a class="dropdown-item rounded-1" href="#" component="category/ignoring" data-state="ignoring" role="menuitem"><i class="fa fa-fw fa-eye-slash"></i> {{tx("category:ignoring")}}<p class="help-text"><small>{{tx("category:ignoring.description")}}</small></p></a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/templates/account/consent.tpl b/templates/account/consent.tpl
index b67161965..91c31aa13 100644
--- a/templates/account/consent.tpl
+++ b/templates/account/consent.tpl
@@ -1,7 +1,7 @@
 <!-- IMPORT partials/account/header.tpl -->
-<h3>[[user:consent.title]]</h3>
-<p class="lead">[[user:consent.lead]]</p>
-<p>[[user:consent.intro]]</p>
+<h3>{{tx("user:consent.title")}}</h3>
+<p class="lead">{{tx("user:consent.lead")}}</p>
+<p>{{tx("user:consent.intro")}}</p>
 
 <hr />
 
@@ -9,31 +9,31 @@
 	<div class="col-sm-6">
 		<!-- IF gdpr_consent -->
 		<div class="alert alert-success d-flex gap-3">
-			[[user:consent.received]]
+			{{tx("user:consent.received")}}
 			<i class="fa fa-check fa-3x"></i>
 		</div>
 		<!-- ELSE -->
 		<div class="alert alert-warning">
-			[[user:consent.not-received]]
+			{{tx("user:consent.not-received")}}
 			<br /><br />
 			<div class="text-center">
-				<button class="btn btn-warning" data-action="consent">[[user:consent.give]]</button>
+				<button class="btn btn-warning" data-action="consent">{{tx("user:consent.give")}}</button>
 			</div>
 		</div>
 		<!-- END -->
 		<div class="card">
 			<div class="card-body">
-				<p>[[user:consent.email-intro]]</p>
+				<p>{{tx("user:consent.email-intro")}}</p>
 				<!-- IF digest.enabled -->
-				<p>[[user:consent.digest-frequency, {digest.frequency}]]</p>
+				<p>{{tx("user:consent.digest-frequency", digest.frequency)}}</p>
 				<!-- ELSE -->
-				[[user:consent.digest-off]]
+				{{tx("user:consent.digest-off")}}
 				<!-- END -->
 
 				<div class="text-center">
 					<a class="btn btn-outline-secondary" href="./settings">
 						<i class="fa fa-cog"></i>
-						[[pages:account/settings]]
+						{{tx("pages:account/settings")}}
 					</a>
 				</div>
 			</div>
@@ -42,25 +42,25 @@
 	<div class="col-sm-6">
 		<div class="card">
 			<div class="card-body">
-				<p><strong>[[user:consent.right-of-access]]</strong></p>
-				<p>[[user:consent.right-of-access-description]]</p>
-				<p><strong>[[user:consent.right-to-rectification]]</strong></p>
-				<p>[[user:consent.right-to-rectification-description]]</p>
-				<p><strong>[[user:consent.right-to-erasure]]</strong></p>
-				<p>[[user:consent.right-to-erasure-description]]</p>
-				<p><strong>[[user:consent.right-to-data-portability]]</strong></p>
-				<p>[[user:consent.right-to-data-portability-description]]</p>
+				<p><strong>{{tx("user:consent.right-of-access")}}</strong></p>
+				<p>{{tx("user:consent.right-of-access-description")}}</p>
+				<p><strong>{{tx("user:consent.right-to-rectification")}}</strong></p>
+				<p>{{tx("user:consent.right-to-rectification-description")}}</p>
+				<p><strong>{{tx("user:consent.right-to-erasure")}}</strong></p>
+				<p>{{tx("user:consent.right-to-erasure-description")}}</p>
+				<p><strong>{{tx("user:consent.right-to-data-portability")}}</strong></p>
+				<p>{{tx("user:consent.right-to-data-portability-description")}}</p>
 
 				{{{ if canExport }}}
 				<div class="btn-group-vertical d-grid">
 					<a data-action="export-profile" class="btn btn-outline-secondary">
-						<i class="fa fa-download"></i> [[user:consent.export-profile]]
+						<i class="fa fa-download"></i> {{tx("user:consent.export-profile")}}
 					</a>
 					<a data-action="export-posts" class="btn btn-outline-secondary">
-						<i class="fa fa-download"></i> [[user:consent.export-posts]]
+						<i class="fa fa-download"></i> {{tx("user:consent.export-posts")}}
 					</a>
 					<a data-action="export-uploads" class="btn btn-outline-secondary">
-						<i class="fa fa-download"></i> [[user:consent.export-uploads]]
+						<i class="fa fa-download"></i> {{tx("user:consent.export-uploads")}}
 					</a>
 				</div>
 				{{{ end }}}
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 8896296dd..faf7cdd9b 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -5,33 +5,33 @@
 			<div class="account-picture-block text-center">
 				<ul class="list-group mb-3">
 					{{{ if allowProfilePicture }}}
-					<li class="list-group-item"><a component="profile/change/picture" href="#" class="text-decoration-none text-reset">[[user:change-picture]]</a></li>
+					<li class="list-group-item"><a component="profile/change/picture" href="#" class="text-decoration-none text-reset">{{tx("user:change-picture")}}</a></li>
 					{{{ end }}}
 					{{{ if !username:disableEdit }}}
-					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/username" class="text-decoration-none text-reset">[[user:change-username]]</a></li>
+					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/username" class="text-decoration-none text-reset">{{tx("user:change-username")}}</a></li>
 					{{{ end }}}
 					{{{ if !email:disableEdit }}}
-					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/email" class="text-decoration-none text-reset">[[user:change-email]]</a></li>
+					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/email" class="text-decoration-none text-reset">{{tx("user:change-email")}}</a></li>
 					{{{ end }}}
 					{{{ if canChangePassword }}}
-					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/password" class="text-decoration-none text-reset">[[user:change-password]]</a></li>
+					<li class="list-group-item"><a href="{config.relative_path}/user/{userslug}/edit/password" class="text-decoration-none text-reset">{{tx("user:change-password")}}</a></li>
 					{{{ end }}}
 					{{{ each editButtons }}}
-					<li class="list-group-item"><a href="{config.relative_path}{./link}" class="text-decoration-none text-reset">{./text}</a></li>
+					<li class="list-group-item"><a href="{config.relative_path}{./link}" class="text-decoration-none text-reset">{{tx(./text)}}</a></li>
 					{{{ end }}}
 				</ul>
 
 				<!-- IF config.requireEmailConfirmation -->
 				<!-- IF email -->
 				<!-- IF isSelf -->
-				<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm-email]]</a><br/><br/>
+				<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">{{tx("user:confirm-email")}}</a><br/><br/>
 				<!-- ENDIF isSelf -->
 				<!-- ENDIF email -->
 				<!-- ENDIF config.requireEmailConfirmation -->
 
 				<!-- IF allowAccountDelete -->
 				<!-- IF isSelf -->
-				<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete-account]]</a><br/><br/>
+				<a id="deleteAccountBtn" href="#" class="btn btn-danger">{{tx("user:delete-account")}}</a><br/><br/>
 				<!-- ENDIF isSelf -->
 				<!-- ENDIF allowAccountDelete -->
 
@@ -41,12 +41,12 @@
 		<div class="<!-- IF !sso.length -->col-md-9 col-sm-8<!-- ELSE -->col-md-5 col-sm-4<!-- ENDIF !sso.length -->">
 			<form role="form" component="profile/edit/form">
 				<div class="mb-2">
-					<label class="form-label fw-bold" for="fullname">[[user:fullname]]</label>
-					<input class="form-control" type="text" id="fullname" name="fullname" placeholder="[[user:fullname]]" value="{fullname}">
+					<label class="form-label fw-bold" for="fullname">{{tx("user:fullname")}}</label>
+					<input class="form-control" type="text" id="fullname" name="fullname" placeholder="{{tx("user:fullname")}}" value="{fullname}">
 				</div>
 
 				<div class="mb-2">
-					<label class="form-label fw-bold" for="birthday">[[user:birthday]]</label>
+					<label class="form-label fw-bold" for="birthday">{{tx("user:birthday")}}</label>
 					<input class="form-control" type="date" id="birthday" name="birthday" value="{birthday}" placeholder="mm/dd/yyyy">
 				</div>
 
@@ -76,18 +76,18 @@
 				{{{ end }}}
 
 				<div class="mb-2">
-					<label class="form-label fw-bold" for="groupTitle">[[user:grouptitle]]</label>
+					<label class="form-label fw-bold" for="groupTitle">{{tx("user:grouptitle")}}</label>
 
 					<div class="d-flex flex-column gap-2" component="group/badge/list">
 						{{{ each groups }}}
 						<div component="group/badge/item" class="d-flex gap-2 justify-content-between align-items-center" data-value="{./displayName}" data-selected="{./selected}">
 							<!-- IMPORT partials/groups/badge.tpl -->
 							<div class="d-flex gap-1">
-								<button component="group/toggle/hide" type="button" class="btn btn-ghost btn-sm {{{ if !./selected }}}hidden{{{ end }}}" title="[[user:hide-group-title]]"><i class="fa fa-fw fa-eye"></i></button>
-								<button component="group/toggle/show" type="button" class="btn btn-ghost btn-sm {{{ if ./selected }}}hidden{{{ end }}}" title="[[user:show-group-title]]"><i class="fa fa-fw fa-eye-slash"></i></button>
+								<button component="group/toggle/hide" type="button" class="btn btn-ghost btn-sm {{{ if !./selected }}}hidden{{{ end }}}" title="{{tx("user:hide-group-title")}}"><i class="fa fa-fw fa-eye"></i></button>
+								<button component="group/toggle/show" type="button" class="btn btn-ghost btn-sm {{{ if ./selected }}}hidden{{{ end }}}" title="{{tx("user:show-group-title")}}"><i class="fa fa-fw fa-eye-slash"></i></button>
 								{{{ if allowMultipleBadges }}}
-								<button component="group/order/up" type="button" class="btn btn-ghost btn-sm" title="[[user:order-group-up]]"><i class="fa fa-fw fa-chevron-up"></i></button>
-								<button component="group/order/down" type="button" class="btn btn-ghost btn-sm" title="[[user:order-group-down]]"><i class="fa fa-fw fa-chevron-down"></i></button>
+								<button component="group/order/up" type="button" class="btn btn-ghost btn-sm" title="{{tx("user:order-group-up")}}"><i class="fa fa-fw fa-chevron-up"></i></button>
+								<button component="group/order/down" type="button" class="btn btn-ghost btn-sm" title="{{tx("user:order-group-down")}}"><i class="fa fa-fw fa-chevron-down"></i></button>
 								{{{ end }}}
 							</div>
 						</div>
@@ -97,7 +97,7 @@
 
 				<!-- IF allowAboutMe -->
 				<div class="mb-2">
-					<label class="form-label fw-bold" for="aboutme">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
+					<label class="form-label fw-bold" for="aboutme">{{tx("user:aboutme")}}</label> <small><label id="aboutMeCharCountLeft"></label></small>
 					<textarea class="form-control" id="aboutme" name="aboutme" rows="5">{aboutme}</textarea>
 				</div>
 				<!-- ENDIF allowAboutMe -->
@@ -105,13 +105,13 @@
 				<!-- IF allowSignature -->
 				<!-- IF !disableSignatures -->
 				<div class="mb-2">
-					<label class="form-label fw-bold" for="signature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
+					<label class="form-label fw-bold" for="signature">{{tx("user:signature")}}</label> <small><label id="signatureCharCountLeft"></label></small>
 					<textarea class="form-control" id="signature" name="signature" rows="5">{signature}</textarea>
 				</div>
 				<!-- ENDIF !disableSignatures -->
 				<!-- ENDIF allowSignature -->
 
-				<a id="submitBtn" href="#" class="btn btn-primary">[[global:save-changes]]</a>
+				<a id="submitBtn" href="#" class="btn btn-primary">{{tx("global:save-changes")}}</a>
 			</form>
 
 			<hr class="visible-xs visible-sm"/>
@@ -119,16 +119,16 @@
 
 		<!-- IF sso.length -->
 		<div class="col-md-4 col-sm-4">
-			<label>[[user:sso.title]]</label>
+			<label>{{tx("user:sso.title")}}</label>
 			<div class="list-group">
 				{{{each sso}}}
 				<div class="list-group-item">
 					<!-- IF ../deauthUrl -->
-					<a data-component="{../component}" class="btn btn-outline-secondary btn-sm float-end" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
+					<a data-component="{../component}" class="btn btn-outline-secondary btn-sm float-end" href="{../deauthUrl}">{{tx("user:sso.dissociate")}}</a>
 					<!-- END -->
 					<a data-component="{../component}" href="{{{ if ./url }}}{./url}{{{ else }}}#{{{ end }}}" target="<!-- IF ../associated -->_blank<!-- ELSE -->_top<!-- ENDIF ../associated -->">
 						<!-- IF ../icon --><i class="fa {../icon}"></i><!-- ENDIF ../icon -->
-						<!-- IF ../associated -->[[user:sso.associated]]<!-- ELSE -->[[user:sso.not-associated]]<!-- ENDIF ../associated -->
+						<!-- IF ../associated -->{{tx("user:sso.associated")}}<!-- ELSE -->{{tx("user:sso.not-associated")}}<!-- ENDIF ../associated -->
 						{../name}
 					</a>
 				</div>
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
index a31f3fa7a..e50cca46b 100644
--- a/templates/account/edit/password.tpl
+++ b/templates/account/edit/password.tpl
@@ -5,25 +5,25 @@
 
 	<!-- IF isSelf -->
 	<div class="mb-3">
-		<label class="form-label fw-bold" for="inputCurrentPassword">[[user:current-password]]</label>
-		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
+		<label class="form-label fw-bold" for="inputCurrentPassword">{{tx("user:current-password")}}</label>
+		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="{{tx("user:current-password")}}" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
 	</div>
 	<!-- ENDIF isSelf -->
 
 	<div class="mb-3">
-		<label class="form-label fw-bold" for="inputNewPassword">[[user:new-password]]</label>
-		<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
+		<label class="form-label fw-bold" for="inputNewPassword">{{tx("user:new-password")}}</label>
+		<input class="form-control" type="password" id="inputNewPassword" placeholder="{{tx("user:new-password")}}" value="">
 		<span class="form-text" id="password-notify"></span>
 	</div>
 
 	<div class="mb-3">
-		<label class="form-label fw-bold" for="inputNewPasswordAgain">[[user:confirm-password]]</label>
-		<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm-password]]" value="">
+		<label class="form-label fw-bold" for="inputNewPasswordAgain">{{tx("user:confirm-password")}}</label>
+		<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="{{tx("user:confirm-password")}}" value="">
 		<span class="form-text" id="password-confirm-notify"></span>
 	</div>
 
 	<div class="form-actions">
-		<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change-password]]</button>
+		<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> {{tx("user:change-password")}}</button>
 	</div>
 </form>
 
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
index 7411010cd..1eaa65e6d 100644
--- a/templates/account/edit/username.tpl
+++ b/templates/account/edit/username.tpl
@@ -2,23 +2,23 @@
 
 <form class="form-horizontal edit-form">
 	<div class="mb-3">
-		<label class="form-label fw-bold" for="inputNewUsername">[[user:username]]</label>
-		<input class="form-control" type="text" id="inputNewUsername" placeholder="[[user:username]]" value="{username}">
+		<label class="form-label fw-bold" for="inputNewUsername">{{tx("user:username")}}</label>
+		<input class="form-control" type="text" id="inputNewUsername" placeholder="{{tx("user:username")}}" value="{username}">
 	</div>
 
 	<!-- disables autocomplete on FF --><input type="password" style="display:none">
 
 	<!-- IF isSelf -->
 	<div class="mb-3">
-		<label class="form-label fw-bold" for="inputCurrentPassword">[[user:current-password]]</label>
-		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current-password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
+		<label class="form-label fw-bold" for="inputCurrentPassword">{{tx("user:current-password")}}</label>
+		<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="{{tx("user:current-password")}}" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
 	</div>
 	<!-- ENDIF isSelf -->
 
 	<input type="hidden" name="uid" id="inputUID" value="{uid}" />
 
 	<div class="form-actions">
-		<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change-username]]</button>
+		<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> {{tx("user:change-username")}}</button>
 	</div>
 </form>
 
diff --git a/templates/account/followers.tpl b/templates/account/followers.tpl
index aad273ded..35f25ad9c 100644
--- a/templates/account/followers.tpl
+++ b/templates/account/followers.tpl
@@ -1,12 +1,12 @@
 <!-- IMPORT partials/account/header.tpl -->
 
-<h1 class="fs-4">[[pages:{template.name}, {username}]]</h1>
+<h1 class="fs-4">{{tx("pages:account/followers", txEscape(username))}}</h1>
 <div class="users row">
 	<div class="col-12">
 		<!-- IMPORT partials/users_list.tpl -->
 
 		<!-- IF !users.length -->
-		<div class="alert alert-warning text-center">[[user:has-no-follower]]</div>
+		<div class="alert alert-warning text-center">{{tx("user:has-no-follower")}}</div>
 		<!-- ENDIF !users.length -->
 
 		<!-- IMPORT partials/paginator.tpl -->
diff --git a/templates/account/following.tpl b/templates/account/following.tpl
index c5529c77e..49745426b 100644
--- a/templates/account/following.tpl
+++ b/templates/account/following.tpl
@@ -1,12 +1,12 @@
 <!-- IMPORT partials/account/header.tpl -->
 
-<h1 class="fs-4">[[pages:{template.name}, {username}]]</h1>
+<h1 class="fs-4">{{tx("pages:account/following", txEscape(username))}}</h1>
 <div class="users row">
 	<div class="col-12">
 		<!-- IMPORT partials/users_list.tpl -->
 
 		<!-- IF !users.length -->
-		<div class="alert alert-warning text-center">[[user:follows-no-one]]</div>
+		<div class="alert alert-warning text-center">{{tx("user:follows-no-one")}}</div>
 		<!-- ENDIF !users.length -->
 
 		<!-- IMPORT partials/paginator.tpl -->
diff --git a/templates/account/groups.tpl b/templates/account/groups.tpl
index c929e1fd2..3c0c7056f 100644
--- a/templates/account/groups.tpl
+++ b/templates/account/groups.tpl
@@ -1,10 +1,10 @@
 <!-- IMPORT partials/account/header.tpl -->
-<h1 class="fs-4">[[pages:{template.name}, {username}]]</h1>
+<h1 class="fs-4">{{tx("pages:account/groups", txEscape(username))}}</h1>
 <div class="row">
 	<div class="col-12 groups list">
 		<div component="groups/container" id="groups-list" class="row">
 			<!-- IF !groups.length -->
-			<div class="alert alert-warning text-center">[[groups:no-groups-found]]</div>
+			<div class="alert alert-warning text-center">{{tx("groups:no-groups-found")}}</div>
 			<!-- ELSE -->
 			<!-- IMPORT partials/groups/list.tpl -->
 			<!-- ENDIF !groups.length -->
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index 17c79024d..74300e5e8 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -2,7 +2,7 @@
 
 {{{ if sessions.length }}}
 <div class="mb-3">
-	<h5>[[global:sessions]]</h5>
+	<h5>{{tx("global:sessions")}}</h5>
 	<ul class="list-group" component="user/sessions">
 		<!-- IMPORT partials/account/session-list.tpl -->
 	</ul>
@@ -13,7 +13,7 @@
 	<div class="col-sm-6 mb-3">
 		{{{ if invitedBy}}}
 		<div class="mb-4 pb-3 border-bottom">
-			<h6>[[user:info.invited-by]]</h6>
+			<h6>{{tx("user:info.invited-by")}}</h6>
 			<div class="d-flex align-items-center gap-2">
 				<a href="">{{buildAvatar(invitedBy, "24px", true)}}</a>
 				<a href="">{invitedBy.username}</a>
@@ -22,7 +22,7 @@
 		{{{ end }}}
 
 		<div class="mb-4 border-bottom">
-			<h6>[[global:recentips]]</h6>
+			<h6>{{tx("global:recentips")}}</h6>
 			<div class="">
 				<ul class="text-sm text-secondary">
 					{{{each ips}}}
@@ -33,7 +33,7 @@
 		</div>
 
 		<div class="mb-4 border-bottom">
-			<h6>[[user:info.username-history]]</h6>
+			<h6>{{tx("user:info.username-history")}}</h6>
 			<div class="">
 				<ul class="list-unstyled">
 					{{{ each usernames }}}
@@ -54,7 +54,7 @@
 		</div>
 
 		<div class="mb-4 border-bottom">
-			<h6>[[user:info.email-history]]</h6>
+			<h6>{{tx("user:info.email-history")}}</h6>
 			<div class="">
 				<ul class="list-unstyled">
 					{{{ each emails }}}
@@ -74,7 +74,7 @@
 		</div>
 
 			<div class="mb-3 border-bottom">
-			<h6>[[user:info.latest-flags]]</h6>
+			<h6>{{tx("user:info.latest-flags")}}</h6>
 			<div class="">
 				{{{ if history.flags.length }}}
 				<ul class="recent-flags list-unstyled">
@@ -83,20 +83,20 @@
 						<div class="mb-1 d-flex align-items-center justify-content-between">
 							<div>
 								{{{ if (./type == "user")}}}
-								<span class="badge text-bg-info">[[user:info.profile]]</span>
+								<span class="badge text-bg-info">{{tx("user:info.profile")}}</span>
 								{{{ else }}}
-								<span class="badge text-bg-info">[[user:info.post]]</span>
+								<span class="badge text-bg-info">{{tx("user:info.post")}}</span>
 								{{{ end }}}
 								<span class="timestamp timeago" title="{./timestampISO}"></span>
 							</div>
 
-							<a href="{config.relative_path}/flags/{./flagId}" class="badge badge border border-gray-300 text-body">[[user:info.view-flag]]</a>
+							<a href="{config.relative_path}/flags/{./flagId}" class="badge badge border border-gray-300 text-body">{{tx("user:info.view-flag")}}</a>
 						</div>
 
 						{{{ if (./type == "post") }}}
 						<p class="mb-1">
 							{{{ if history.flags.targetPurged }}}
-							<div>[[flags:target-purged]]</div>
+							<div>{{tx("flags:target-purged")}}</div>
 							{{{ else }}}
 							<a class="title" href="{config.relative_path}/post/{encodeURIComponent(./pid)}">{./title}</a>
 							{{{ end }}}
@@ -104,7 +104,7 @@
 						{{{ end }}}
 
 						<div class="d-flex gap-2 align-items-center mb-3">
-							<span class="text-sm">[[user:info.reported-by]]</span>
+							<span class="text-sm">{{tx("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>
@@ -115,20 +115,20 @@
 					{{{ end }}}
 				</ul>
 				{{{ else }}}
-				<div class="alert alert-light">[[user:info.no-flags]]</div>
+				<div class="alert alert-light">{{tx("user:info.no-flags")}}</div>
 				{{{ end }}}
 			</div>
 		</div>
 
 		<div class="mb-3 border-bottom">
 			<h6 class="d-flex align-items-center justify-content-between">
-				[[user:info.ban-history]]
+				{{tx("user:info.ban-history")}}
 
 				{{{ if (!banned && !isSelf) }}}
-				<button class="btn btn-sm btn-danger" component="account/ban">[[user:ban-account]]</button>
+				<button class="btn btn-sm btn-danger" component="account/ban">{{tx("user:ban-account")}}</button>
 				{{{ end }}}
 				{{{ if (banned && !isSelf) }}}
-				<button class="btn btn-sm btn-success" component="account/unban">[[user:unban-account]]</button>
+				<button class="btn btn-sm btn-success" component="account/unban">{{tx("user:unban-account")}}</button>
 				{{{ end }}}
 			</h6>
 			<div class="">
@@ -145,20 +145,20 @@
 								<span class="timestamp timeago" title="{./timestampISO}"></span>
 							</div>
 							{{{ if (./type != "unban") }}}
-							<span class="badge text-bg-danger">[[user:banned]]</span>
+							<span class="badge text-bg-danger">{{tx("user:banned")}}</span>
 							{{{ else }}}
-							<span class="badge text-bg-success">[[user:unbanned]]</span>
+							<span class="badge text-bg-success">{{tx("user:unbanned")}}</span>
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{{tx(./reason)}}</strong></span>
+							<span class="reason">{{tx("user:info.banned-reason-label")}}: <strong>{{tx(./reason)}}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
-							<span class="expiry">[[user:info.banned-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]]</span>
+							<span class="expiry">{{tx("user:info.banned-until", isoTimeToLocaleString(./untilISO, config.userLang))}}</span>
 							{{{ else }}}
 							{{{ if (./type != "unban") }}}
-							<span class="expiry">[[user:info.banned-permanently]]</span>
+							<span class="expiry">{{tx("user:info.banned-permanently")}}</span>
 							{{{ end }}}
 							{{{ end }}}
 						</p>
@@ -166,22 +166,22 @@
 					{{{ end }}}
 				</ul>
 				{{{ else }}}
-				<div class="alert alert-light">[[user:info.no-ban-history]]</div>
+				<div class="alert alert-light">{{tx("user:info.no-ban-history")}}</div>
 				{{{ end }}}
 			</div>
 		</div>
 
 		<div class="mb-3">
 			<h6 class="d-flex align-items-center justify-content-between">
-				[[user:info.mute-history]]
+				{{tx("user:info.mute-history")}}
 
 				{{{ if !muted }}}
 				{{{ if !isSelf }}}
-				<button class="btn btn-sm btn-danger" component="account/mute">[[user:mute-account]]</button>
+				<button class="btn btn-sm btn-danger" component="account/mute">{{tx("user:mute-account")}}</button>
 				{{{ end }}}
 				{{{ else }}}
 				{{{ if !isSelf }}}
-				<button class="btn btn-sm btn-success" component="account/unmute">[[user:unmute-account]]</button>
+				<button class="btn btn-sm btn-success" component="account/unmute">{{tx("user:unmute-account")}}</button>
 				{{{ end }}}
 				{{{ end }}}
 			</h6>
@@ -199,24 +199,24 @@
 								<span class="timestamp timeago" title="{./timestampISO}"></span>
 							</div>
 							{{{ if (./type != "unmute") }}}
-							<span class="badge text-bg-danger">[[user:muted]]</span>
+							<span class="badge text-bg-danger">{{tx("user:muted")}}</span>
 							{{{ else }}}
-							<span class="badge text-bg-success">[[user:unmuted]]</span>
+							<span class="badge text-bg-success">{{tx("user:unmuted")}}</span>
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{{tx(./reason)}}</strong></span>
+							<span class="reason">{{tx("user:info.banned-reason-label")}}: <strong>{{tx(./reason)}}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
-							<span class="expiry">[[user:info.muted-until, {isoTimeToLocaleString(./untilISO, config.userLang)}]]</span>
+							<span class="expiry">{{tx("user:info.muted-until", isoTimeToLocaleString(./untilISO, config.userLang))}}</span>
 							{{{ end }}}
 						</p>
 					</li>
 					{{{ end }}}
 				</ul>
 				{{{ else }}}
-				<div class="alert alert-light">[[user:info.no-mute-history]]</div>
+				<div class="alert alert-light">{{tx("user:info.no-mute-history")}}</div>
 				{{{ end }}}
 			</div>
 		</div>
@@ -227,12 +227,12 @@
 		{{{ if isAdminOrGlobalModerator }}}
 		<div class="card">
 			<h5 class="card-header">
-				[[user:info.moderation-note]]
+				{{tx("user:info.moderation-note")}}
 			</h5>
 			<div class="card-body">
-				<textarea component="account/moderation-note" class="form-control mb-3" aria-label="[[user:info.moderation-note]]"></textarea>
+				<textarea component="account/moderation-note" class="form-control mb-3" aria-label="{{tx("user:info.moderation-note")}}"></textarea>
 
-				<button class="btn btn-sm float-end btn-success" component="account/save-moderation-note">[[user:info.moderation-note.add]]</button>
+				<button class="btn btn-sm float-end btn-success" component="account/save-moderation-note">{{tx("user:info.moderation-note.add")}}</button>
 				<br/>
 				<div component="account/moderation-note/list">
 					{{{ each moderationNotes }}}
@@ -252,14 +252,14 @@
 							<div class="content text-secondary">
 								{./note}
 							</div>
-							<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">[[topic:edit]]</button>
+							<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">{{tx("topic:edit")}}</button>
 						</div>
 
 						<div component="account/moderation-note/edit-area" class="d-flex flex-column gap-2 hidden">
 							<textarea class="form-control form-control-sm w-100 overflow-hidden">{./rawNote}</textarea>
 							<div class="align-self-end">
-								<button component="account/moderation-note/cancel-edit" class="btn btn-sm btn-link text-danger align-self-end">[[global:cancel]]</button>
-								<button component="account/moderation-note/save-edit" class="btn btn-sm btn-primary align-self-end">[[global:save]]</button>
+								<button component="account/moderation-note/cancel-edit" class="btn btn-sm btn-link text-danger align-self-end">{{tx("global:cancel")}}</button>
+								<button component="account/moderation-note/save-edit" class="btn btn-sm btn-primary align-self-end">{{tx("global:save")}}</button>
 							</div>
 						</div>
 					</div>
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index bda9399d9..a211452cb 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -1,21 +1,21 @@
 <!-- IMPORT partials/account/header.tpl -->
 
 <div class="d-flex flex-wrap justify-content-between align-items-center gap-2 mb-3">
-	<h3 class="fw-semibold fs-4 mb-0">[[global:posts]]</h3>
+	<h3 class="fw-semibold fs-4 mb-0">{{tx("global:posts")}}</h3>
 	<div class="d-flex flex-wrap gap-1">
-		<a href="{config.relative_path}/user/{userslug}/posts" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/posts }}}active{{{ end }}}">[[global:header.recent]]</a>
+		<a href="{config.relative_path}/user/{userslug}/posts" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/posts }}}active{{{ end }}}">{{tx("global:header.recent")}}</a>
 		{{{ if !reputation:disabled }}}
-		<a href="{config.relative_path}/user/{userslug}/best"class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/best }}}active{{{ end }}}">[[global:best]]</a>
-		<a href="{config.relative_path}/user/{userslug}/controversial" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/controversial }}}active{{{ end }}}">[[global:controversial]]</a>
+		<a href="{config.relative_path}/user/{userslug}/best"class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/best }}}active{{{ end }}}">{{tx("global:best")}}</a>
+		<a href="{config.relative_path}/user/{userslug}/controversial" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/controversial }}}active{{{ end }}}">{{tx("global:controversial")}}</a>
 		{{{ if canEdit }}}
-		<a href="{config.relative_path}/user/{userslug}/upvoted" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/upvoted }}}active{{{ end }}}">[[global:upvoted]]</a>
+		<a href="{config.relative_path}/user/{userslug}/upvoted" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/upvoted }}}active{{{ end }}}">{{tx("global:upvoted")}}</a>
 		{{{ if !downvote:disabled }}}
-		<a href="{config.relative_path}/user/{userslug}/downvoted" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/downvoted }}}active{{{ end }}}">[[global:downvoted]]</a>
+		<a href="{config.relative_path}/user/{userslug}/downvoted" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/downvoted }}}active{{{ end }}}">{{tx("global:downvoted")}}</a>
 		{{{ end }}}
 		{{{ end }}}
 		{{{ end }}}
 		{{{ if canEdit }}}
-		<a href="{config.relative_path}/user/{userslug}/bookmarks" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/bookmarks }}}active{{{ end }}}">[[user:bookmarks]]</a>
+		<a href="{config.relative_path}/user/{userslug}/bookmarks" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/bookmarks }}}active{{{ end }}}">{{tx("user:bookmarks")}}</a>
 		{{{ end }}}
 	</div>
 </div>
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 74e3d9517..8ec6418f0 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -8,18 +8,18 @@
 		{{{ if banned }}}
 		<div class="text-center">
 		{{{ if banned_until }}}
-		[[user:info.banned-until, {isoTimeToLocaleString(./banned_until_readable, config.userLang)}]]
+		{{tx("user:info.banned-until", isoTimeToLocaleString(./banned_until_readable, config.userLang))}}
 		{{{ else }}}
-		[[user:info.banned-permanently]]
+		{{tx("user:info.banned-permanently")}}
 		{{{ end }}}
 		</div>
 		{{{ end }}}
 		{{{ if muted }}}
 		<div class="text-center">
 		{{{ if mutedUntil }}}
-		[[user:info.muted-until, {isoTimeToLocaleString(./muted_until_readable, config.userLang)}]]
+		{{tx("user:info.muted-until", isoTimeToLocaleString(./muted_until_readable, config.userLang))}}
 		{{{ else }}}
-		[[user:info.muted-permanently]]
+		{{tx("user:info.muted-permanently")}}
 		{{{ end }}}
 		</div>
 		{{{ end }}}
@@ -43,54 +43,54 @@
 		<!-- IF !reputation:disabled -->
 		<div class="stat d-inline-block" style="min-width: 100px;">
 			<div title="{reputation}">{humanReadableNumber(reputation)}</div>
-			<div class="stat-label text-xs text-uppercase text-secondary">[[global:reputation]]</div>
+			<div class="stat-label text-xs text-uppercase text-secondary">{{tx("global:reputation")}}</div>
 		</div>
 		<!-- ENDIF !reputation:disabled -->
 
 		<div class="stat d-inline-block" style="min-width: 100px;">
 			<div title="{profileviews}">{humanReadableNumber(profileviews)}</div>
-			<div class="stat-label text-xs text-uppercase text-secondary">[[user:profile-views]]</div>
+			<div class="stat-label text-xs text-uppercase text-secondary">{{tx("user:profile-views")}}</div>
 		</div>
 
 		<div class="stat d-inline-block" style="min-width: 100px;">
 			<div><a title="{counts.posts}" href="{config.relative_path}/user/{userslug}/posts">{humanReadableNumber(counts.posts)}</a></div>
-			<div class="stat-label text-xs text-uppercase text-secondary">[[global:posts]]</div>
+			<div class="stat-label text-xs text-uppercase text-secondary">{{tx("global:posts")}}</div>
 		</div>
 
 		<div class="stat d-inline-block" style="min-width: 100px;">
 			<div><a title="{counts.followers}" href="{config.relative_path}/user/{userslug}/followers">{humanReadableNumber(counts.followers)}</a></div>
-			<div class="stat-label text-xs text-uppercase text-secondary">[[user:followers]]</div>
+			<div class="stat-label text-xs text-uppercase text-secondary">{{tx("user:followers")}}</div>
 		</div>
 
 		<div class="stat d-inline-block" style="min-width: 100px;">
 			<div><a title="{counts.following}" href="{config.relative_path}/user/{userslug}/following">{humanReadableNumber(counts.following)}</a></div>
-			<div class="stat-label text-xs text-uppercase text-secondary">[[user:following]]</div>
+			<div class="stat-label text-xs text-uppercase text-secondary">{{tx("user:following")}}</div>
 		</div>
 	</div>
 
 	<div class="profile-meta text-xs text-uppercase d-flex gap-3 flex-wrap justify-content-center align-items-center">
 		<div class="w-100 d-flex gap-3 justify-content-center">
 			<div>
-				<span class="stat-label">[[user:joined]]</span>
+				<span class="stat-label">{{tx("user:joined")}}</span>
 				<span class="timeago fw-bold" title="{joindateISO}"></span>
 			</div>
 
 			<div>
-				<span class="stat-label">[[user:lastonline]]</span>
+				<span class="stat-label">{{tx("user:lastonline")}}</span>
 				<span class="timeago fw-bold" title="{lastonlineISO}"></span>
 			</div>
 		</div>
 
 		{{{ if email }}}
 		<div>
-			<span class="stat-label">[[user:email]]</span>
-			<strong><i class="fa fa-eye-slash {emailClass}" title="[[user:email-hidden]]"></i> {email}</strong>
+			<span class="stat-label">{{tx("user:email")}}</span>
+			<strong><i class="fa fa-eye-slash {emailClass}" title="{{tx("user:email-hidden")}}"></i> {email}</strong>
 		</div>
 		{{{ end }}}
 
 		{{{ if age }}}
 		<div class="">
-			<span class="stat-label">[[user:age]]</span>
+			<span class="stat-label">{{tx("user:age")}}</span>
 			<span class="fw-bold">{age}</span>
 		</div>
 		{{{ end }}}
@@ -121,8 +121,8 @@
 			</span>
 
 			<!-- IF !isSelf -->
-			<a component="account/unfollow" href="#" class="btn btn-outline-secondary{{{ if !isFollowing }}} hide{{{ end }}}">[[user:unfollow]]</a>
-			<a component="account/follow" href="#" class="btn btn-primary{{{ if isFollowing }}} hide{{{ end }}}">[[user:follow]]</a>
+			<a component="account/unfollow" href="#" class="btn btn-outline-secondary{{{ if !isFollowing }}} hide{{{ end }}}">{{tx("user:unfollow")}}</a>
+			<a component="account/follow" href="#" class="btn btn-primary{{{ if isFollowing }}} hide{{{ end }}}">{{tx("user:follow")}}</a>
 			<!-- ENDIF !isSelf -->
 		</div>
 	</div>
@@ -138,23 +138,6 @@
 </div>
 <!-- ENDIF groups.length -->
 
-<!-- IF ips.length -->
-<div class="row">
-	<div class="col-12 hidden">
-		<div class="card">
-			<h5 class="card-header">
-				[[global:recentips]]
-			</h5>
-			<div class="card-body">
-			{{{each ips}}}
-				<div>{ips}</div>
-			{{{end}}}
-			</div>
-		</div>
-	</div>
-</div>
-<!-- ENDIF ips.length -->
-
 <div class="row">
 	{{{ if (bestPosts.length || latestPosts.length) }}}
 	<div class="col-12">
@@ -171,7 +154,7 @@
 					aria-controls="best-posts-pane"
 					aria-selected="true"
 				>
-					[[pages:account/best, {username}]]
+					{{tx("pages:account/best", txEscape(username))}}
 				</button>
 			</li>
 			{{{ end }}}
@@ -187,7 +170,7 @@
 					aria-controls="latest-posts-pane"
 					aria-selected="{{{ if !bestPosts.length }}}true{{{ else }}}false{{{ end }}}"
 				>
-					[[pages:account/latest-posts, {username}]]
+					{{tx("pages:account/latest-posts", txEscape(username))}}
 				</button>
 			</li>
 			{{{ end }}}
diff --git a/templates/account/sessions.tpl b/templates/account/sessions.tpl
index e63e95585..ac9f37b7a 100644
--- a/templates/account/sessions.tpl
+++ b/templates/account/sessions.tpl
@@ -3,7 +3,7 @@
 <!-- IF sessions.length -->
 <div class="row">
 	<div class="col-12 col-md-12">
-		<p class="lead">[[user:sessions.description]]</p>
+		<p class="lead">{{tx("user:sessions.description")}}</p>
 		<hr />
 		<ul class="list-group" component="user/sessions">
 			<!-- IMPORT partials/account/session-list.tpl -->
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 7379229e5..ef11a2a8a 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -4,7 +4,7 @@
 	<div class="row">
 		<div class="col-12 col-md-6">
 			<!-- IF !disableCustomUserSkins -->
-			<h4>[[user:select-skin]]</h4>
+			<h4>{{tx("user:select-skin")}}</h4>
 			<div class="card card-body mb-3">
 				<select class="form-select" id="bootswatchSkin" data-property="bootswatchSkin">
 					{{{each bootswatchSkinOptions}}}
@@ -15,7 +15,7 @@
 			<!-- ENDIF !disableCustomUserSkins -->
 
 			<!-- IF allowUserHomePage -->
-			<h4>[[user:select-homepage]]</h4>
+			<h4>{{tx("user:select-homepage")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2">
 					<select class="form-select" id="homePageRoute" data-property="homePageRoute">
@@ -24,39 +24,39 @@
 						<option value="{homePageRoutes.route}" <!-- IF homePageRoutes.selected -->selected="1"<!-- ENDIF homePageRoutes.selected -->>{homePageRoutes.name}</option>
 						{{{end}}}
 					</select>
-					<p class="form-text mb-0">[[user:homepage-description]]</p>
+					<p class="form-text mb-0">{{tx("user:homepage-description")}}</p>
 				</div>
 				<div id="homePageCustomContainer" class="mb-2" style="display: none;">
-					<label for="homePageCustom" class="form-label">[[user:custom-route]]</label>
+					<label for="homePageCustom" class="form-label">{{tx("user:custom-route")}}</label>
 					<input type="text" class="form-control" data-property="homePageCustom" id="homePageCustom" value="{settings.homePageRoute}"/>
-					<p class="form-text">[[user:custom-route-help]]</p>
+					<p class="form-text">{{tx("user:custom-route-help")}}</p>
 				</div>
 			</div>
 			<!-- ENDIF allowUserHomePage -->
 
-			<h4>[[global:privacy]]</h4>
+			<h4>{{tx("global:privacy")}}</h4>
 			<div class="card card-body mb-3">
 				<!-- IF !hideEmail -->
 				<div class="form-check mb-2">
 					<input id="showemail" class="form-check-input" type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->/>
-					<label for="showemail" class="form-check-label">[[user:show-email]]</label>
+					<label for="showemail" class="form-check-label">{{tx("user:show-email")}}</label>
 				</div>
 				<!-- ENDIF !hideEmail -->
 
 				<!-- IF !hideFullname -->
 				<div class="form-check mb-2">
 					<input id="showfullname" class="form-check-input" type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->/>
-					<label for="showfullname" class="form-check-label">[[user:show-fullname]]</label>
+					<label for="showfullname" class="form-check-label">{{tx("user:show-fullname")}}</label>
 				</div>
 				<!-- ENDIF !hideFullname -->
 				<!-- IF !config.disableChat -->
 				<div class="form-check mb-2">
 					<input id="disableIncomingMessages" class="form-check-input" type="checkbox" data-property="disableIncomingMessages" <!-- IF settings.disableIncomingMessages -->checked<!-- ENDIF settings.disableIncomingMessages -->/>
-					<label for="disableIncomingMessages" class="form-check-label">[[user:disable-incoming-chats]]</label>
+					<label for="disableIncomingMessages" class="form-check-label">{{tx("user:disable-incoming-chats")}}</label>
 				</div>
 
 				<div class="d-flex flex-column mb-3">
-					<label class="form-label text-sm" for="chatAllowListAdd">[[user:chat-allow-list]]</label>
+					<label class="form-label text-sm" for="chatAllowListAdd">{{tx("user:chat-allow-list")}}</label>
 
 					<div component="chat/allow/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatAllowListUsers }}}
@@ -71,7 +71,7 @@
 				</div>
 
 				<div class="d-flex flex-column mb-3">
-					<label class="form-label text-sm" for="chatAllowListAdd">[[user:chat-deny-list]]</label>
+					<label class="form-label text-sm" for="chatAllowListAdd">{{tx("user:chat-deny-list")}}</label>
 
 					<div component="chat/deny/list" class="d-flex flex-wrap gap-2 mb-2">
 						{{{ each settings.chatDenyListUsers }}}
@@ -82,99 +82,99 @@
 						{{{ end }}}
 					</div>
 
-					<input type="text" class="form-control form-control-sm" id="chatDenyListAdd" placeholder="[[user:chat-list-add-user]]"/>
+					<input type="text" class="form-control form-control-sm" id="chatDenyListAdd" placeholder="{{tx("user:chat-list-add-user")}}"/>
 				</div>
 
 				<!-- ENDIF !config.disableChat -->
 			</div>
 
-			<h4>[[user:browsing]]</h4>
+			<h4>{{tx("user:browsing")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2">
 					<div class="d-flex gap-4 align-items-center justify-content-between mb-3">
-						<label class="form-label text-sm mb-0" for="unreadCutoff">[[user:unread.cutoff, {maxUnreadCutoff}]]</label>
+						<label class="form-label text-sm mb-0" for="unreadCutoff">{{tx("user:unread.cutoff", maxUnreadCutoff)}}</label>
 						<input id="unreadCutoff" value="{settings.unreadCutoff}" type="number" class="form-control form-control-sm text-end" data-property="unreadCutoff" min="1" max="{maxUnreadCutoff}" style="max-width: 64px;">
 					</div>
-					<p class="form-text text-xs">[[user:unread.cutoff-help]]</p>
+					<p class="form-text text-xs">{{tx("user:unread.cutoff-help")}}</p>
 				</div>
 
 				<div class="form-check mb-2">
 					<input id="openOutgoingLinksInNewTab" class="form-check-input" type="checkbox" data-property="openOutgoingLinksInNewTab" <!-- IF settings.openOutgoingLinksInNewTab -->checked<!-- ENDIF settings.openOutgoingLinksInNewTab -->/>
-					<label for="openOutgoingLinksInNewTab" class="form-check-label">[[user:open-links-in-new-tab]]</label>
+					<label for="openOutgoingLinksInNewTab" class="form-check-label">{{tx("user:open-links-in-new-tab")}}</label>
 				</div>
 
 				<div class="form-check mb-2">
 					<input id="updateUrlWithPostIndex" class="form-check-input" type="checkbox" data-property="updateUrlWithPostIndex" {{{ if settings.updateUrlWithPostIndex }}}checked{{{ end }}}/>
-					<label for="updateUrlWithPostIndex" class="form-check-label">[[user:update-url-with-post-index]]</label>
+					<label for="updateUrlWithPostIndex" class="form-check-label">{{tx("user:update-url-with-post-index")}}</label>
 				</div>
 				<div class="form-check mb-2">
 					<input id="scrollToMyPost" class="form-check-input" type="checkbox" data-property="scrollToMyPost" <!-- IF settings.scrollToMyPost -->checked<!-- ENDIF settings.scrollToMyPost -->/>
-					<label for="scrollToMyPost" class="form-check-label">[[user:scroll-to-my-post]]</label>
+					<label for="scrollToMyPost" class="form-check-label">{{tx("user:scroll-to-my-post")}}</label>
 				</div>
 				{{{ if inTopicSearchAvailable }}}
 				<div class="form-check">
 					<input id="topicSearchEnabled" class="form-check-input" type="checkbox" data-property="topicSearchEnabled" <!-- IF settings.topicSearchEnabled -->checked<!-- ENDIF settings.topicSearchEnabled -->/>
-					<label for="topicSearchEnabled" class="form-check-label">[[user:enable-topic-searching]]</label>
+					<label for="topicSearchEnabled" class="form-check-label">{{tx("user:enable-topic-searching")}}</label>
 				</div>
-				<p class="form-text">[[user:topic-search-help]]</p>
+				<p class="form-text">{{tx("user:topic-search-help")}}</p>
 				{{{ end }}}
 			</div>
 
-			<h4>[[global:pagination]]</h4>
+			<h4>{{tx("global:pagination")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="form-check mb-2">
 					<input id="usePagination" type="checkbox" class="form-check-input" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->>
-					<label for="usePagination" class="form-check-label">[[user:paginate-description]]</label>
+					<label for="usePagination" class="form-check-label">{{tx("user:paginate-description")}}</label>
 				</div>
 				<div class="d-flex gap-4 align-items-center justify-content-between  mb-2">
-					<label class="form-label text-sm text-nowrap mb-0" for="topicsPerPage">[[user:topics-per-page]] ([[user:max-items-per-page, {maxTopicsPerPage}]])</label>
+					<label class="form-label text-sm text-nowrap mb-0" for="topicsPerPage">{{tx("user:topics-per-page")}} ({{tx("user:max-items-per-page", maxTopicsPerPage)}})</label>
 					<input type="number" class="form-control form-control-sm text-end" id="topicsPerPage" data-property="topicsPerPage" value="{settings.topicsPerPage}" min="1" max="{maxTopicsPerPage}" style="max-width: 64px;">
 				</div>
 				<div class="d-flex gap-4 align-items-center justify-content-between">
-					<label class="form-label text-sm text-nowrap mb-0" for="postsPerPage">[[user:posts-per-page]] ([[user:max-items-per-page, {maxPostsPerPage}]])</label>
+					<label class="form-label text-sm text-nowrap mb-0" for="postsPerPage">{{tx("user:posts-per-page")}} ({{tx("user:max-items-per-page", maxPostsPerPage)}})</label>
 					<input type="number" class="form-control form-control-sm text-end" id="postsPerPage" data-property="postsPerPage" value="{settings.postsPerPage}" min="1" max="{maxPostsPerPage}" style="max-width: 64px;">
 				</div>
 			</div>
 
-			<h4>[[global:sort]]</h4>
+			<h4>{{tx("global:sort")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2">
-					<label for="categoryTopicSort" class="form-label">[[user:category-topic-sort]]</label>
+					<label for="categoryTopicSort" class="form-label">{{tx("user:category-topic-sort")}}</label>
 					<select id="categoryTopicSort" class="form-select" data-property="categoryTopicSort">
-						<option value="recently_replied" {{{ if (settings.categoryTopicSort == "recently_replied") }}}selected{{{ end }}}>[[topic:recently-replied]]</option>
-						<option value="recently_created" {{{ if (settings.categoryTopicSort == "recently_created") }}}selected{{{ end }}}>[[topic:recently-created]]</option>
-						<option value="most_posts" {{{ if (settings.categoryTopicSort == "most_posts") }}}selected{{{ end }}}>[[topic:most-posts]]</option>
-						<option value="most_votes" {{{ if (settings.categoryTopicSort == "most_votes") }}}selected{{{ end }}}>[[topic:most-votes]]</option>
-						<option value="most_views" {{{ if (settings.categoryTopicSort == "most_views") }}}selected{{{ end }}}>[[topic:most-views]]</option>
+						<option value="recently_replied" {{{ if (settings.categoryTopicSort == "recently_replied") }}}selected{{{ end }}}>{{tx("topic:recently-replied")}}</option>
+						<option value="recently_created" {{{ if (settings.categoryTopicSort == "recently_created") }}}selected{{{ end }}}>{{tx("topic:recently-created")}}</option>
+						<option value="most_posts" {{{ if (settings.categoryTopicSort == "most_posts") }}}selected{{{ end }}}>{{tx("topic:most-posts")}}</option>
+						<option value="most_votes" {{{ if (settings.categoryTopicSort == "most_votes") }}}selected{{{ end }}}>{{tx("topic:most-votes")}}</option>
+						<option value="most_views" {{{ if (settings.categoryTopicSort == "most_views") }}}selected{{{ end }}}>{{tx("topic:most-views")}}</option>
 					</select>
 				</div>
 				<div>
-					<label for="topicPostSort" class="form-label">[[user:topic-post-sort]]</label>
+					<label for="topicPostSort" class="form-label">{{tx("user:topic-post-sort")}}</label>
 					<select id="topicPostSort" class="form-select" data-property="topicPostSort">
-						<option value="oldest_to_newest" {{{ if (settings.topicPostSort == "oldest_to_newest") }}}selected{{{ end }}}>[[topic:oldest-to-newest]]</option>
-						<option value="newest_to_oldest" {{{ if (settings.topicPostSort == "newest_to_oldest") }}}selected{{{ end }}}>[[topic:newest-to-oldest]]</option>
-						<option value="most_votes" {{{ if (settings.topicPostSort == "most_votes") }}}selected{{{ end }}}>[[topic:most-votes]]</option>
+						<option value="oldest_to_newest" {{{ if (settings.topicPostSort == "oldest_to_newest") }}}selected{{{ end }}}>{{tx("topic:oldest-to-newest")}}</option>
+						<option value="newest_to_oldest" {{{ if (settings.topicPostSort == "newest_to_oldest") }}}selected{{{ end }}}>{{tx("topic:newest-to-oldest")}}</option>
+						<option value="most_votes" {{{ if (settings.topicPostSort == "most_votes") }}}selected{{{ end }}}>{{tx("topic:most-votes")}}</option>
 					</select>
 				</div>
 			</div>
 
 			<!-- IF !disableEmailSubscriptions -->
-			<h4>[[global:email]]</h4>
+			<h4>{{tx("global:email")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="mb-2">
-					<label class="form-label" for="dailyDigestFreq">[[user:digest-label]]</label>
+					<label class="form-label" for="dailyDigestFreq">{{tx("user:digest-label")}}</label>
 					<select class="form-select" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
 						{{{each dailyDigestFreqOptions}}}
 						<option value="{./value}" {{{ if ./selected }}}selected="1"{{{ end }}}>{{tx(./name)}}</option>
 						{{{end}}}
 					</select>
-					<p class="form-text">[[user:digest-description]]</p>
+					<p class="form-text">{{tx("user:digest-description")}}</p>
 				</div>
 			</div>
 			<!-- ENDIF !disableEmailSubscriptions -->
 
 			{{{each customSettings}}}
-			<h4>{customSettings.title}</h4>
+			<h4>{{tx(customSettings.title)}}</h4>
 			<div class="card card-body mb-3">
 				{{customSettings.content}}
 			</div>
@@ -183,7 +183,7 @@
 		</div>
 
 		<div class="col-12 col-md-6">
-			<h4>[[global:language]]</h4>
+			<h4>{{tx("global:language")}}</h4>
 			<div class="card card-body mb-3">
 				<select data-property="userLang" class="form-select">
 					{{{each languages}}}
@@ -193,7 +193,7 @@
 			</div>
 			<!-- IF isAdmin -->
 			<!-- IF isSelf -->
-			<h4>[[user:acp-language]]</h4>
+			<h4>{{tx("user:acp-language")}}</h4>
 			<div class="card card-body mb-3">
 				<select id="acpLang" data-property="acpLang" class="form-select">
 					{{{each acpLanguages}}}
@@ -204,38 +204,38 @@
 			<!-- ENDIF isSelf -->
 			<!-- ENDIF isAdmin -->
 
-			<h4>[[topic:watch]]</h4>
+			<h4>{{tx("topic:watch")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="form-check mb-2">
 					<input id="followTopicsOnCreate" class="form-check-input" type="checkbox" data-property="followTopicsOnCreate" <!-- IF settings.followTopicsOnCreate -->checked <!-- ENDIF settings.followTopicsOnCreate -->/>
-					<label for="followTopicsOnCreate" class="form-check-label">[[user:follow-topics-you-create]]</label>
+					<label for="followTopicsOnCreate" class="form-check-label">{{tx("user:follow-topics-you-create")}}</label>
 				</div>
 				<div class="form-check mb-2">
 					<input id="followTopicsOnReply" class="form-check-input" type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->/>
-					<label for="followTopicsOnReply" class="form-check-label">[[user:follow-topics-you-reply-to]]</label>
+					<label for="followTopicsOnReply" class="form-check-label">{{tx("user:follow-topics-you-reply-to")}}</label>
 				</div>
 				<div class="">
-					<label for="categoryWatchState" class="form-label">[[user:default-category-watch-state]]</label>
+					<label for="categoryWatchState" class="form-label">{{tx("user:default-category-watch-state")}}</label>
 					<select id="categoryWatchState" class="form-select" data-property="categoryWatchState">
-						<option value="tracking" <!-- IF categoryWatchState.tracking -->selected<!-- ENDIF categoryWatchState.tracking -->>[[category:tracking]]</option>
-						<option value="notwatching" <!-- IF categoryWatchState.notwatching -->selected<!-- ENDIF categoryWatchState.notwatching -->>[[category:not-watching]]</option>
-						<option value="ignoring" <!-- IF categoryWatchState.ignoring -->selected<!-- ENDIF categoryWatchState.ignoring -->>[[category:ignoring]]</option>
+						<option value="tracking" <!-- IF categoryWatchState.tracking -->selected<!-- ENDIF categoryWatchState.tracking -->>{{tx("category:tracking")}}</option>
+						<option value="notwatching" <!-- IF categoryWatchState.notwatching -->selected<!-- ENDIF categoryWatchState.notwatching -->>{{tx("category:not-watching")}}</option>
+						<option value="ignoring" <!-- IF categoryWatchState.ignoring -->selected<!-- ENDIF categoryWatchState.ignoring -->>{{tx("category:ignoring")}}</option>
 					</select>
 				</div>
 			</div>
 
 
-			<h4>[[user:notifications]]</h4>
+			<h4>{{tx("user:notifications")}}</h4>
 			<div class="card card-body mb-3">
 				<div class="row align-items-center mb-2">
 					<div class="col-7">
-						<label class="text-sm" for="upvote-notif-freq">[[user:upvote-notif-freq]]</label>
+						<label class="text-sm" for="upvote-notif-freq">{{tx("user:upvote-notif-freq")}}</label>
 					</div>
 					<div class="col-5">
 						<select class="form-select form-select-sm" id="upvote-notif-freq" name="upvote-notif-freq" data-property="upvoteNotifFreq">
 							{{{ each upvoteNotifFreq }}}
 							<option value="{./name}" {{{ if ./selected }}}selected{{{ end }}}>
-								[[user:upvote-notif-freq.{./name}]]
+								{{tx(./label)}}
 							</option>
 							{{{end}}}
 						</select>
@@ -243,15 +243,15 @@
 				</div>
 				<div class="form-check mb-3">
 					<input class="form-check-input" type="checkbox" role="switch" id="hideReadNotifications" data-property="hideReadNotifications" {{{ if settings.hideReadNotifications }}}checked{{{ end }}} />
-					<label class="form-check-label text-sm" for="hideReadNotifications">[[user:hide-read-notifications]]</label>
+					<label class="form-check-label text-sm" for="hideReadNotifications">{{tx("user:hide-read-notifications")}}</label>
 				</div>
 				<hr />
 				<table component="notification/table" class="table">
 					<thead>
 						<tr>
 							<th></th>
-							<th class="text-center fw-semibold px-2">[[user:notification-type-web]]</th>
-							<th class="text-center fw-semibold px-2">[[user:notification-type-email]]</th>
+							<th class="text-center fw-semibold px-2">{{tx("user:notification-type-web")}}</th>
+							<th class="text-center fw-semibold px-2">{{tx("user:notification-type-email")}}</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -283,7 +283,7 @@
 		</div>
 	</div>
 	<div class="form-actions">
-		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save-changes]]</a>
+		<a id="submitBtn" href="#" class="btn btn-primary">{{tx("global:save-changes")}}</a>
 	</div>
 </div>
 
diff --git a/templates/account/theme.tpl b/templates/account/theme.tpl
index 13a630518..66739f845 100644
--- a/templates/account/theme.tpl
+++ b/templates/account/theme.tpl
@@ -1,26 +1,26 @@
 <!-- IMPORT partials/account/header.tpl -->
 
-<p>[[themes/persona:settings.intro]]</p>
+<p>{{tx("themes/persona:settings.intro")}}</p>
 
 <hr />
 
 <form id="theme-settings" role="form">
 	<div class="form-check mb-3">
 		<input class="form-check-input" type="checkbox" id="persona:menus:legacy-layout" name="persona:menus:legacy-layout">
-		<label class="form-check-label" for="persona:menus:legacy-layout">[[themes/persona:settings.mobile-menu-side]]</label>
+		<label class="form-check-label" for="persona:menus:legacy-layout">{{tx("themes/persona:settings.mobile-menu-side")}}</label>
 	</div>
 
 	<div class="mb-3">
-		<label for="persona:navbar:autohide">[[themes/persona:settings.autoHidingNavbar]]</label>
+		<label for="persona:navbar:autohide">{{tx("themes/persona:settings.autoHidingNavbar")}}</label>
 		<select multiple class="form-control" name="persona:navbar:autohide" id="persona:navbar:autohide">
-			<option value="xs">[[themes/persona:settings.autoHidingNavbar-xs]]</option>
-			<option value="sm">[[themes/persona:settings.autoHidingNavbar-sm]]</option>
-			<option value="md">[[themes/persona:settings.autoHidingNavbar-md]]</option>
-			<option value="lg">[[themes/persona:settings.autoHidingNavbar-lg]]</option>
+			<option value="xs">{{tx("themes/persona:settings.autoHidingNavbar-xs")}}</option>
+			<option value="sm">{{tx("themes/persona:settings.autoHidingNavbar-sm")}}</option>
+			<option value="md">{{tx("themes/persona:settings.autoHidingNavbar-md")}}</option>
+			<option value="lg">{{tx("themes/persona:settings.autoHidingNavbar-lg")}}</option>
 		</select>
 	</div>
 
-	<button id="save" type="button" class="btn btn-primary">[[global:save-changes]]</button>
+	<button id="save" type="button" class="btn btn-primary">{{tx("global:save-changes")}}</button>
 </form>
 
 <!-- IMPORT partials/account/footer.tpl -->
\ No newline at end of file
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index b766d21b7..ff1f53375 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -2,10 +2,10 @@
 
 <div class="d-flex justify-content-between align-items-center mb-3">
 	<div class="d-flex gap-1">
-		<h3 class="fw-semibold fs-4 mb-0 align-self-center">[[global:topics]]</h3>
+		<h3 class="fw-semibold fs-4 mb-0 align-self-center">{{tx("global:topics")}}</h3>
 		{{{ if showSort }}}
 		<div class="dropdown bottom-sheet" component="thread/sort">
-			<button title="[[global:sort]]" class="btn btn-ghost btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button"><i class="fa-solid fa-arrow-up-wide-short"></i></button>
+			<button title="{{tx("global:sort")}}" class="btn btn-ghost btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button"><i class="fa-solid fa-arrow-up-wide-short"></i></button>
 			<ul class="dropdown-menu p-1 text-sm" role="menu">
 				{{{each sortOptions }}}
 				<li>
@@ -22,10 +22,10 @@
 
 	<div class="d-flex gap-1">
 		{{{ if canEdit }}}
-		<a href="{config.relative_path}/user/{userslug}/topics" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/topics }}}active{{{ end }}}">[[global:header.recent]]</a>
-		<a href="{config.relative_path}/user/{userslug}/watched"class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/watched }}}active{{{ end }}}">[[user:watched]]</a>
-		<a href="{config.relative_path}/user/{userslug}/ignored" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/ignored }}}active{{{ end }}}">[[user:ignored]]</a>
-		<a href="{config.relative_path}/user/{userslug}/read" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/read }}}active{{{ end }}}">[[user:read]]</a>
+		<a href="{config.relative_path}/user/{userslug}/topics" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/topics }}}active{{{ end }}}">{{tx("global:header.recent")}}</a>
+		<a href="{config.relative_path}/user/{userslug}/watched"class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/watched }}}active{{{ end }}}">{{tx("user:watched")}}</a>
+		<a href="{config.relative_path}/user/{userslug}/ignored" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/ignored }}}active{{{ end }}}">{{tx("user:ignored")}}</a>
+		<a href="{config.relative_path}/user/{userslug}/read" class="btn btn-ghost btn-sm ff-secondary fw-semibold {{{ if template.account/read }}}active{{{ end }}}">{{tx("user:read")}}</a>
 		{{{ end }}}
 	</div>
 </div>
diff --git a/templates/account/uploads.tpl b/templates/account/uploads.tpl
index 81a09515a..f7b001cc0 100644
--- a/templates/account/uploads.tpl
+++ b/templates/account/uploads.tpl
@@ -1,13 +1,13 @@
 <!-- IMPORT partials/account/header.tpl -->
 <h1 class="fs-4">{{tx(title)}}</h1>
 <!-- IF privateUploads -->
-<div class="alert alert-info text-center">[[uploads:private-uploads-info]]</div>
+<div class="alert alert-info text-center">{{tx("uploads:private-uploads-info")}}</div>
 <!-- ELSE -->
-<div class="alert alert-info text-center">[[uploads:public-uploads-info]]</div>
+<div class="alert alert-info text-center">{{tx("uploads:public-uploads-info")}}</div>
 <!-- ENDIF privateUploads -->
 
 <!-- IF !uploads.length -->
-	<div class="alert alert-warning text-center">[[uploads:no-uploads-found]]</div>
+	<div class="alert alert-warning text-center">{{tx("uploads:no-uploads-found")}}</div>
 <!-- ENDIF !uploads.length -->
 
 <div class="table-responsive">
@@ -25,7 +25,7 @@
 					<a class="text-break text-reset text-sm" href="{config.relative_path}{./url}">{./url}</a>
 				</td>
 				<td style="width: 1%; white-space: nowrap;">
-					<button class="btn btn-danger btn-sm" data-action="delete" aria-label="[[aria:delete-upload-button]]"><i class="fa fa-trash"></i></button>
+					<button class="btn btn-danger btn-sm" data-action="delete" aria-label="{{tx("aria:delete-upload-button")}}"><i class="fa fa-trash"></i></button>
 				</td>
 			</tr>
 			{{{ end }}}
diff --git a/templates/categories.tpl b/templates/categories.tpl
index dd860bcb0..ed8c8caa4 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -9,7 +9,7 @@
 		{{{ if pagination.pages.length }}}
 		<div><!-- IMPORT partials/category/selector-dropdown-left.tpl --></div>
 		{{{ else }}}
-		<h1 class="categories-title text-uppercase text-sm mb-2 fw-normal">[[pages:categories]]</h1>
+		<h1 class="categories-title text-uppercase text-sm mb-2 fw-normal">{{tx("pages:categories")}}</h1>
 		{{{ end }}}
 		<ul class="categories list-unstyled" itemscope itemtype="http://www.schema.org/ItemList">
 			{{{ each categories }}}
diff --git a/templates/category.tpl b/templates/category.tpl
index a00cd8b58..9bfa0a950 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -12,22 +12,22 @@
 		<div class="topic-list-header sticky-top btn-toolbar justify-content-between align-items-center px-1 py-2 mb-2 flex-nowrap">
 			<div class="d-flex gap-1">
 				{{{ if privileges.topics:create }}}
-				<a href="{config.relative_path}/compose?cid={cid}" component="category/post" id="new_topic" class="btn btn-primary btn-sm text-nowrap" data-ajaxify="false" role="button">[[category:new-topic-button]]</a>
+				<a href="{config.relative_path}/compose?cid={cid}" component="category/post" id="new_topic" class="btn btn-primary btn-sm text-nowrap" data-ajaxify="false" role="button">{{tx("category:new-topic-button")}}</a>
 				{{{ else }}}
 					{{{ if !loggedIn }}}
-					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">[[category:guest-login-post]]</a>
+					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">{{tx("category:guest-login-post")}}</a>
 					{{{ end }}}
 				{{{ end }}}
 
 				<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>
+					<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>{{tx("recent:load-new-posts")}}</div>
 				</a>
 			</div>
 			<div component="category/controls" class="d-flex gap-1">
 				{{{ if !isNumber(cid) }}}
 				<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>
+					<span class="fw-semibold">{{tx("category:view-original")}}</span>
 				</a>
 				{{{ end }}}
 				<!-- IMPORT partials/category/watch.tpl -->
@@ -40,7 +40,7 @@
 		{{{ if (./inbox && (./hasFollowers == false)) }}}
 		<div class="alert alert-warning mb-4" id="category-no-followers" data-bs-toggle="dropdown" data-bs-target='[component="topic/watch"] button' aria-hidden="true">
 			<i class="fa fa-triangle-exclamation pe-2"></i>
-			[[category:no-followers]]
+			{{tx("category:no-followers")}}
 			<a href="#" class="stretched-link"></a>
 		</div>
 		{{{ end }}}
@@ -48,7 +48,7 @@
 		{{{ if (!topics.length && privileges.topics:create)}}}
 		<hr class="visible-xs" />
 		<div class="alert alert-warning" id="category-no-topics">
-			[[category:no-topics]]
+			{{tx("category:no-topics")}}
 		</div>
 		{{{ end }}}
 
diff --git a/templates/modules/usercard.tpl b/templates/modules/usercard.tpl
index f4e9caffc..72a281839 100644
--- a/templates/modules/usercard.tpl
+++ b/templates/modules/usercard.tpl
@@ -10,20 +10,20 @@
 
 		<div class="d-flex gap-2 align-items-center">
 			<a href="{config.relative_path}/user/{userslug}" class="text-reset text-truncate d-block">
-				<span class="usercard-username text-uppercase text-sm text-truncate">{{{ if !banned }}}@{username}{{{ else }}}[[user:banned]]{{{ end }}}</span>
+				<span class="usercard-username text-uppercase text-sm text-truncate">{{{ if !banned }}}@{username}{{{ else }}}{{tx("user:banned")}}{{{ end }}}</span>
 			</a>
 			{{{ if !banned }}}
-			<span component="user/status" class="border border-white border-2 m-0 rounded-circle status {status}" title="[[global:{status}]]" style="transform: none;"><span class="visually-hidden">[[global:{posts.user.status}]]</span></span>
+			<span component="user/status" class="border border-white border-2 m-0 rounded-circle status {status}" title="{{tx(concat("global:", status))}}" style="transform: none;"><span class="visually-hidden">{{tx(concat("global:", status))}}</span></span>
 			{{{ end }}}
 		</div>
 
 		<div class="d-flex justify-content-between usercard-info">
 			<div class="d-flex flex-column text-center">
-				<small>[[global:posts]]</small>
+				<small>{{tx("global:posts")}}</small>
 				<span class="fs-5">{humanReadableNumber(postcount)}</span>
 			</div>
 			<div class="d-flex flex-column text-center">
-				<small>[[global:reputation]]</small>
+				<small>{{tx("global:reputation")}}</small>
 				<span class="fs-5">{humanReadableNumber(reputation)}</span>
 			</div>
 			<button class="btn-morph persona-fab fs-3  {{{ if banned }}} invisible{{{ end }}}">
@@ -35,5 +35,4 @@
 			</button>
 		</div>
 	</div>
-
 </div>
\ No newline at end of file
diff --git a/templates/notifications.tpl b/templates/notifications.tpl
index 9d33019b9..790378d49 100644
--- a/templates/notifications.tpl
+++ b/templates/notifications.tpl
@@ -25,14 +25,14 @@
 
 		<button component="notifications/mark_all" class="btn btn-ghost btn-sm" type="button">
 			<i class="fa fa-eye"></i>
-			[[notifications:mark-all-read]]
+			{{tx("notifications:mark-all-read")}}
 		</button>
 	</div>
 
 	<hr />
 
 	<div class="alert alert-info {{{ if notifications.length }}}hidden{{{ end }}}">
-		[[notifications:no-notifs]]
+		{{tx("notifications:no-notifs")}}
 	</div>
 
 	<ul component="notifications/list" class="notifications-list list-unstyled" data-nextstart="{nextStart}">
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl
index cf26daf65..973201809 100644
--- a/templates/partials/account/header.tpl
+++ b/templates/partials/account/header.tpl
@@ -16,10 +16,10 @@
 			</a>
 			{{{ end }}}
 
-			<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>
+			<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">{{tx(concat("global:", status))}}</span></span>
 
 			{{{ if !isSelf }}}
-			<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 }}}">
+			<button style="top: 93px; right:4px;" class="btn-morph persona-fab position-absolute {{{ if isFollowing }}}heart{{{ else }}}plus{{{ end }}}" title="{{{ if isFollowing }}}{{tx("global:unfollow")}}{{{ else }}}{{tx("global:follow")}}{{{ end }}}">
 				<span>
 					<span class="s1"></span>
 					<span class="s2"></span>
@@ -36,8 +36,8 @@
 				<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 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>
+			<a href="#" class="save btn btn-primary">{{tx("groups:cover-save")}} <i class="fa fa-fw fa-floppy-o"></i></a>
+			<div class="indicator text-bg-primary">{{tx("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 e4060da8d..113f07c86 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -8,93 +8,93 @@
 		<!-- IF !banned -->
 		<!-- IF canChat -->
 		<li class="<!-- IF !hasPrivateChat -->hidden<!-- ENDIF !hasPrivateChat -->">
-			<a class="dropdown-item rounded-1" component="account/chat" href="#" role="menuitem">[[user:chat-with, {username}]]</a>
+			<a class="dropdown-item rounded-1" component="account/chat" href="#" role="menuitem">{{tx("user:chat-with", txEscape(username))}}</a>
 		</li>
 		<li>
-			<a class="dropdown-item rounded-1" component="account/new-chat" href="#" role="menuitem">[[user:new-chat-with, {username}]]</a>
+			<a class="dropdown-item rounded-1" component="account/new-chat" href="#" role="menuitem">{{tx("user:new-chat-with", txEscape(username))}}</a>
 		</li>
 		<!-- ENDIF canChat -->
 		<li>
-			<a {{{if flagId }}}hidden{{{end}}} class="dropdown-item rounded-1" component="account/flag" href="#" role="menuitem">[[user:flag-profile]]</a>
+			<a {{{if flagId }}}hidden{{{end}}} class="dropdown-item rounded-1" component="account/flag" href="#" role="menuitem">{{tx("user:flag-profile")}}</a>
 		</li>
 		<li>
-			<a {{{if !flagId }}}hidden{{{end}}} class="dropdown-item rounded-1" component="account/already-flagged" href="#" role="menuitem" data-flag-id="{flagId}">[[user:profile-flagged]]</a>
+			<a {{{if !flagId }}}hidden{{{end}}} class="dropdown-item rounded-1" component="account/already-flagged" href="#" role="menuitem" data-flag-id="{flagId}">{{tx("user:profile-flagged")}}</a>
 		</li>
 		<li>
-			<a class="dropdown-item rounded-1 {{{ if ./isBlocked }}}hidden{{{ end }}}" component="account/block" href="#" role="menuitem">[[user:block-user]]</a>
+			<a class="dropdown-item rounded-1 {{{ if ./isBlocked }}}hidden{{{ end }}}" component="account/block" href="#" role="menuitem">{{tx("user:block-user")}}</a>
 		</li>
 		<li>
-			<a class="dropdown-item rounded-1 {{{ if !./isBlocked }}}hidden{{{ end }}}" component="account/unblock" href="#" role="menuitem">[[user:unblock-user]]</a>
+			<a class="dropdown-item rounded-1 {{{ if !./isBlocked }}}hidden{{{ end }}}" component="account/unblock" href="#" role="menuitem">{{tx("user:unblock-user")}}</a>
 		</li>
 		<li role="separator" class="dropdown-divider"></li>
 		<!-- ENDIF !banned -->
 		<!-- ENDIF !isSelf -->
 		<!-- ENDIF loggedIn -->
 		<li>
-			<a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}" class="d-inline-block" id="profile" role="menuitem">[[user:profile]]</a>
+			<a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}" class="d-inline-block" id="profile" role="menuitem">{{tx("user:profile")}}</a>
 		</li>
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}/edit" role="menuitem">[[user:edit]]</a></li>
-		<li><a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}/settings" role="menuitem">[[user:settings]]</a></li>
+		<li><a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}/edit" role="menuitem">{{tx("user:edit")}}</a></li>
+		<li><a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}/settings" role="menuitem">{{tx("user:settings")}}</a></li>
 		<!-- ENDIF canEdit -->
 
 		<!-- IF !isSelf -->
 		{{{ if (canBan || canMute) }}}
 		<li role="separator" class="dropdown-divider"></li>
-		<li class="dropdown-header">[[user:admin-actions-label]]</li>
+		<li class="dropdown-header">{{tx("user:admin-actions-label")}}</li>
 		{{{ end }}}
 		{{{ if canBan }}}
 		<li class="<!-- IF banned -->hide<!-- ENDIF banned -->">
-			<a class="dropdown-item rounded-1" component="account/ban" href="#" role="menuitem">[[user:ban-account]]</a>
+			<a class="dropdown-item rounded-1" component="account/ban" href="#" role="menuitem">{{tx("user:ban-account")}}</a>
 		</li>
 		<li class="<!-- IF !banned -->hide<!-- ENDIF !banned -->">
-			<a class="dropdown-item rounded-1" component="account/unban" href="#" role="menuitem">[[user:unban-account]]</a>
+			<a class="dropdown-item rounded-1" component="account/unban" href="#" role="menuitem">{{tx("user:unban-account")}}</a>
 		</li>
 		{{{ end }}}
 		{{{ if canMute }}}
 		<li class="<!-- IF muted -->hide<!-- ENDIF muted -->">
-			<a class="dropdown-item rounded-1" component="account/mute" href="#" role="menuitem">[[user:mute-account]]</a>
+			<a class="dropdown-item rounded-1" component="account/mute" href="#" role="menuitem">{{tx("user:mute-account")}}</a>
 		</li>
 		<li class="<!-- IF !muted -->hide<!-- ENDIF !muted -->">
-			<a class="dropdown-item rounded-1" component="account/unmute" href="#" role="menuitem">[[user:unmute-account]]</a>
+			<a class="dropdown-item rounded-1" component="account/unmute" href="#" role="menuitem">{{tx("user:unmute-account")}}</a>
 		</li>
 		{{{ end }}}
 		<!-- IF isAdmin -->
 		<li>
-			<a component="account/delete-account" href="#" class="dropdown-item rounded-1" role="menuitem">[[user:delete-account-as-admin]]</a>
-			<a component="account/delete-content" href="#" class="dropdown-item rounded-1" role="menuitem">[[user:delete-content]]</a>
-			<a component="account/delete-all" href="#" class="dropdown-item rounded-1" role="menuitem">[[user:delete-all]]</a>
+			<a component="account/delete-account" href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("user:delete-account-as-admin")}}</a>
+			<a component="account/delete-content" href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("user:delete-content")}}</a>
+			<a component="account/delete-all" href="#" class="dropdown-item rounded-1" role="menuitem">{{tx("user:delete-all")}}</a>
 		</li>
 		<!-- ENDIF isAdmin -->
 		<!-- ENDIF !isSelf -->
 
 		<li role="separator" class="dropdown-divider"></li>
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/following" role="menuitem">[[user:following]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.following}">{formattedNumber(counts.following)}</span></a></li>
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/followers" role="menuitem">[[user:followers]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.followers}">{formattedNumber(counts.followers)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/following" role="menuitem">{{tx("user:following")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.following}">{formattedNumber(counts.following)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/followers" role="menuitem">{{tx("user:followers")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.followers}">{formattedNumber(counts.followers)}</span></a></li>
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/blocks" role="menuitem">[[user:blocks]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.blocks}">{formattedNumber(counts.blocks)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/blocks" role="menuitem">{{tx("user:blocks")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.blocks}">{formattedNumber(counts.blocks)}</span></a></li>
 		<!-- ENDIF canEdit -->
 		<li role="separator" class="dropdown-divider"></li>
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/topics" role="menuitem">[[global:topics]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.topics}">{formattedNumber(counts.topics)}</span></a></li>
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/posts" role="menuitem">[[global:posts]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.posts}">{formattedNumber(counts.posts)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/topics" role="menuitem">{{tx("global:topics")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.topics}">{formattedNumber(counts.topics)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/posts" role="menuitem">{{tx("global:posts")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.posts}">{formattedNumber(counts.posts)}</span></a></li>
 
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/groups" role="menuitem">[[global:header.groups]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.groups}">{formattedNumber(counts.groups)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/groups" role="menuitem">{{tx("global:header.groups")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.groups}">{formattedNumber(counts.groups)}</span></a></li>
 
 		<!-- IF canEdit -->
-		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/categories" role="menuitem">[[user:watched-categories]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.categoriesWatched}">{formattedNumber(counts.categoriesWatched)}</span></a></li>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/categories" role="menuitem">{{tx("user:watched-categories")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.categoriesWatched}">{formattedNumber(counts.categoriesWatched)}</span></a></li>
 		{{{ if isSelf }}}
 		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/tags" role="menuitem">
-		[[user:watched-tags]] <span class="badge bg-secondary rounded-pill ms-2" title="{counts.tagsWatched}">{formattedNumber(counts.tagsWatched)}</span></a></li>
+		{{tx("user:watched-tags")}} <span class="badge bg-secondary rounded-pill ms-2" title="{counts.tagsWatched}">{formattedNumber(counts.tagsWatched)}</span></a></li>
 		{{{ end }}}
 
-		<li><a class="dropdown-item rounded-1 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>
+		<li><a class="dropdown-item rounded-1 d-flex justify-content-between align-items-center" href="{config.relative_path}/user/{userslug}/uploads" role="menuitem">{{tx("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 }}}
 		<!-- IF @first -->
 		<li role="separator" class="dropdown-divider"></li>
 		<!-- ENDIF @first -->
-		<li id="{./id}" class="plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}}"><a class="dropdown-item rounded-1" href="{config.relative_path}/user/{userslug}/{profile_links.route}">{{{ if icon }}}<i class="fa fa-fw {./icon}"></i> {{{ end }}}{tx(./name)}</a></li>
+		<li id="{./id}" class="plugin-link {{{ if ./public }}}public{{{ else }}}private{{{ end }}}"><a class="dropdown-item rounded-1" 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 7c6e1d241..413c8d9c2 100644
--- a/templates/partials/account/session-list.tpl
+++ b/templates/partials/account/session-list.tpl
@@ -3,16 +3,16 @@
 	<div class="float-end">
 		{{{ if isSelfOrAdminOrGlobalModerator }}}
 		{{{ if !./current }}}
-		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">[[user:revoke-session]]</button>
+		<button class="btn btn-sm btn-outline-secondary" type="button" data-action="revokeSession">{{tx("user:revoke-session")}}</button>
 		{{{ end }}}
 		{{{ end }}}
 		{{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 />
+	{{tx("user:browser-version-on-platform", ./browser, ./version, ./platform)}}<br />
 	<small class="timeago text-muted" title="{../datetimeISO}"></small>
 	<ul>
-		<li><strong>[[global:ip-address]]</strong>: {../ip}</li>
+		<li><strong>{{tx("global:ip-address")}}</strong>: {../ip}</li>
 	</ul>
 </li>
 {{{ end }}}
diff --git a/templates/partials/buttons/newTopic.tpl b/templates/partials/buttons/newTopic.tpl
index 528e01945..5e5307a3f 100644
--- a/templates/partials/buttons/newTopic.tpl
+++ b/templates/partials/buttons/newTopic.tpl
@@ -1,6 +1,6 @@
 <noscript><div class="dropdown" component="category-selector"></noscript>
 <button component="category/post" for="category-dropdown-check" class="btn btn-primary btn-sm text-nowrap" id="new_topic" role="button">
-	[[category:new-topic-button]]
+	{{tx("category:new-topic-button")}}
 </button>
 <noscript>
 	<input type="checkbox" class="hidden" id="category-dropdown-check" aria-hidden="true">
diff --git a/templates/partials/categories/item.tpl b/templates/partials/categories/item.tpl
index abc1cadde..7ce09c2ac 100644
--- a/templates/partials/categories/item.tpl
+++ b/templates/partials/categories/item.tpl
@@ -41,11 +41,11 @@
 		<div class="meta stats d-none d-lg-grid col-6 gap-1 pe-2 text-muted" style="grid-template-columns: 1fr 1fr;">
 			<div class="overflow-hidden rounded-1 d-flex flex-column align-items-center">
 				<span class="fs-4" title="{./totalTopicCount}">{humanReadableNumber(./totalTopicCount, 0)}</span>
-				<span class="text-uppercase text-xs">[[global:topics]]</span>
+				<span class="text-uppercase text-xs">{{tx("global:topics")}}</span>
 			</div>
 			<div class="overflow-hidden rounded-1 d-flex flex-column align-items-center">
 				<span class="fs-4" title="{./totalPostCount}">{humanReadableNumber(./totalPostCount, 0)}</span>
-				<span class="text-uppercase text-xs">[[global:posts]]</span>
+				<span class="text-uppercase text-xs">{{tx("global:posts")}}</span>
 			</div>
 		</div>
 		{{{ if !config.hideCategoryLastPost }}}
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index 4a180ca2e..57901d05c 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -4,10 +4,10 @@
 	<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="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./timestampISO}" aria-label="[[global:lastpost]]"></a>
+			<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./timestampISO}" aria-label="{{tx("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>
+			<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" aria-label="{{tx("global:lastpost")}}"></a>
 			{{txEscape(./content)}}
 		</div>
 	</div>
@@ -17,7 +17,7 @@
 	{{{ if !./posts.length }}}
 	<div component="category/posts" class="ps-2">
 		<div class="post-content overflow-hidden text-xs">
-			[[category:no-new-posts]]
+			{{tx("category:no-new-posts")}}
 		</div>
 	</div>
 	{{{ end }}}
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 54fba0fbd..da1d26420 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -3,7 +3,7 @@
 	{{{ if hasMoreSubCategories }}}
 	<div class="mb-2"><!-- IMPORT partials/category/selector-dropdown-left.tpl --></div>
 	{{{ else }}}
-	<p>[[category:subcategories]]</p>
+	<p>{{tx("category:subcategories")}}</p>
 	{{{ end }}}
 
 	<ul component="category/subcategory/container" class="categories list-unstyled" itemscope itemtype="http://www.schema.org/ItemList">
@@ -12,7 +12,7 @@
 		{{{end}}}
 	</ul>
 	{{{ if (hasMoreSubCategories && children.length) }}}
-	<button class="btn btn-ghost btn-sm mb-2" component="category/load-more-subcategories">[[category:x-more-categories, {subCategoriesLeft}]]</button>
+	<button class="btn btn-ghost btn-sm mb-2" component="category/load-more-subcategories">{{tx("category:x-more-categories", subCategoriesLeft)}}</button>
 	{{{ end }}}
 </div>
 {{{ end }}}
\ No newline at end of file
diff --git a/templates/partials/chats-menu.tpl b/templates/partials/chats-menu.tpl
index d09e6a362..8f691bcbc 100644
--- a/templates/partials/chats-menu.tpl
+++ b/templates/partials/chats-menu.tpl
@@ -24,7 +24,7 @@
 	<div class="tab-pane fade" id="notifications">
 		<section class="menu-section text-bg-dark px-1" data-section="notifications">
 			<ul class="menu-section-list notification-list-mobile list-unstyled" component="notifications/list"></ul>
-			<div class="menu-section-list text-center p-3"><a href="{relative_path}/notifications">[[notifications:see-all]]</a></div>
+			<div class="menu-section-list text-center p-3"><a href="{relative_path}/notifications">{{tx("notifications:see-all")}}</a></div>
 		</section>
 	</div>
 	{{{ if !config.disableChat }}}
@@ -33,7 +33,7 @@
 			<ul class="menu-section-list chat-list list-unstyled" component="chat/list">
 
 			</ul>
-			<div class="menu-section-list text-center p-3"><a class="navigation-link" href="{relative_path}/user/{user.userslug}/chats">[[modules:chat.see-all]]</a></div>
+			<div class="menu-section-list text-center p-3"><a class="navigation-link" href="{relative_path}/user/{user.userslug}/chats">{{tx("modules:chat.see-all")}}</a></div>
 		</section>
 	</div>
 	{{{ end }}}
diff --git a/templates/partials/cookie-consent.tpl b/templates/partials/cookie-consent.tpl
index f77a4b754..7944237b6 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">{{tx(dismiss){}}</button>
+    <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/header/chats.tpl b/templates/partials/header/chats.tpl
index 9219e4b01..bfedd83d2 100644
--- a/templates/partials/header/chats.tpl
+++ b/templates/partials/header/chats.tpl
@@ -1,5 +1,5 @@
 <a class="nav-link" data-bs-toggle="dropdown" href="{relative_path}/user/{user.userslug}/chats" data-ajaxify="false" id="chat_dropdown" component="chat/dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-	<i component="chat/icon" class="fa {{{ if unreadCount.chat}}}fa-comment{{{ else }}}fa-comment-o{{{ end }}} fa-fw unread-count" data-content="{unreadCount.chat}"></i> <span class="d-inline d-sm-none">[[global:header.chats]]</span>
+	<i component="chat/icon" class="fa {{{ if unreadCount.chat}}}fa-comment{{{ else }}}fa-comment-o{{{ end }}} fa-fw unread-count" data-content="{unreadCount.chat}"></i> <span class="d-inline d-sm-none">{{tx("global:header.chats")}}</span>
 </a>
 <ul class="dropdown-menu dropdown-menu-end p-1" aria-labelledby="chat_dropdown" role="menu">
 	<li>
@@ -28,8 +28,8 @@
 	<li class="dropdown-divider"></li>
 	<li>
 		<div class="d-flex justify-content-center gap-1 flex-wrap">
-			<a class="btn btn-light btn-sm mark-all-read flex-fill text-nowrap" href="#" component="chats/mark-all-read"><i class="fa fa-check-double"></i> [[modules:chat.mark-all-read]]</a>
-			<a class="btn btn-primary btn-sm flex-fill text-nowrap" href="{relative_path}/user/{user.userslug}/chats"><i class="fa fa-comments"></i> [[modules:chat.see-all]]</a>
+			<a class="btn btn-light btn-sm mark-all-read flex-fill text-nowrap" href="#" component="chats/mark-all-read"><i class="fa fa-check-double"></i> {{tx("modules:chat.mark-all-read")}}</a>
+			<a class="btn btn-primary btn-sm flex-fill text-nowrap" href="{relative_path}/user/{user.userslug}/chats"><i class="fa fa-comments"></i> {{tx("modules:chat.see-all")}}</a>
 		</div>
 	</li>
 </ul>
\ No newline at end of file
diff --git a/templates/partials/header/notifications.tpl b/templates/partials/header/notifications.tpl
index 881deecf1..df658a501 100644
--- a/templates/partials/header/notifications.tpl
+++ b/templates/partials/header/notifications.tpl
@@ -1,11 +1,11 @@
-<a data-bs-toggle="dropdown" data-bs-auto-close="outside" href="#" role="button" class="nav-link position-relative" aria-haspopup="true" aria-expanded="false" aria-label="[[global:header.notifications]]">
+<a data-bs-toggle="dropdown" data-bs-auto-close="outside" href="#" role="button" class="nav-link position-relative" aria-haspopup="true" aria-expanded="false" aria-label="{{tx("global:header.notifications")}}">
 	<i component="notifications/icon" class="fa fa-fw {{{ if unreadCount.notification}}}fa-bell{{{ else }}}fa-bell-o{{{ end }}} unread-count" data-content="{unreadCount.notification}"></i>
 </a>
 
 <ul class="notifications-dropdown dropdown-menu dropdown-menu-end p-1 shadow" role="menu">
 	<li>
-		<button type="button" class="btn btn-ghost btn-sm fw-bold" data-filter="all">All</button>
-		<button type="button" class="btn btn-ghost btn-sm" data-filter="unread">Unread</button>
+		<button type="button" class="btn btn-ghost btn-sm fw-bold" data-filter="all">{{tx("notifications:all")}}</button>
+		<button type="button" class="btn btn-ghost btn-sm" data-filter="unread">{{tx("unread:title")}}</button>
 	</li>
 	<li class="dropdown-divider"></li>
 	<li>
@@ -41,8 +41,8 @@
 	<li class="dropdown-divider"></li>
 	<li>
 		<div class="d-flex justify-content-center gap-1 flex-wrap">
-			<a role="button" href="#" class="btn btn-sm btn-light mark-all-read flex-fill text-nowrap text-truncate ff-secondary"><i class="fa fa-check-double"></i> [[notifications:mark-all-read]]</a>
-			<a class="btn btn-sm btn-primary flex-fill text-nowrap text-truncate ff-secondary" href="{relative_path}/notifications"><i class="fa fa-list"></i> [[notifications:see-all]]</a>
+			<a role="button" href="#" class="btn btn-sm btn-light mark-all-read flex-fill text-nowrap text-truncate ff-secondary"><i class="fa fa-check-double"></i> {{tx("notifications:mark-all-read")}}</a>
+			<a class="btn btn-sm btn-primary flex-fill text-nowrap text-truncate ff-secondary" href="{relative_path}/notifications"><i class="fa fa-list"></i> {{tx("notifications:see-all")}}</a>
 		</div>
 	</li>
 </ul>
diff --git a/templates/partials/header/search.tpl b/templates/partials/header/search.tpl
index f0eb3a422..7bb065c24 100644
--- a/templates/partials/header/search.tpl
+++ b/templates/partials/header/search.tpl
@@ -1,9 +1,9 @@
 <form component="search/form" id="search-form" class="d-flex justify-content-end align-items-center" role="search" method="GET">
 	<div component="search/fields" class="hidden" id="search-fields">
 		<div class="input-group flex-nowrap">
-			<input autocomplete="off" type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
+			<input autocomplete="off" type="text" class="form-control" placeholder="{{tx("global:search")}}" name="query" value="">
 
-			<a href="{config.relative_path}/search" class="btn btn-outline-secondary" aria-label="[[search:type-to-search]]">
+			<a href="{config.relative_path}/search" class="btn btn-outline-secondary" aria-label="{{tx("search:type-to-search")}}">
 				<i class="fa fa-gears fa-fw"></i>
 			</a>
 		</div>
@@ -17,8 +17,8 @@
 			<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>
 			<div class="quick-search-results-container"></div>
 		</div>
-		<button type="submit" class="btn btn-outline-secondary hide">[[global:search]]</button>
+		<button type="submit" class="btn btn-outline-secondary hide">{{tx("global:search")}}</button>
 	</div>
 
-	<div class="nav-item" title="[[global:search]]"><a component="search/button" id="search-button" href="#" class="nav-link" aria-label="[[global:search]]"><i class="fa fa-search fa-fw"></i></a></div>
+	<div class="nav-item" title="{{tx("global:search")}}"><a component="search/button" id="search-button" href="#" class="nav-link" aria-label="{{tx("global:search")}}"><i class="fa fa-search fa-fw"></i></a></div>
 </form>
diff --git a/templates/partials/header/user-menu.tpl b/templates/partials/header/user-menu.tpl
index b9198a746..85c1d6f87 100644
--- a/templates/partials/header/user-menu.tpl
+++ b/templates/partials/header/user-menu.tpl
@@ -1,4 +1,4 @@
-<li id="user_label" class="nav-item dropdown px-3" title="[[global:header.profile]]">
+<li id="user_label" class="nav-item dropdown px-3" title="{{tx("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)}}
 		<span id="user-header-name" class="d-block d-sm-none">{user.username}</span>
@@ -6,83 +6,83 @@
 	<input type="checkbox" class="hidden" id="user-control-list-check" aria-hidden="true">
 	<ul id="user-control-list" component="header/usercontrol" class="overscroll-behavior-contain user-dropdown dropdown-menu dropdown-menu-end shadow p-1 text-sm ff-base" role="menu">
 		<li>
-			<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" component="header/profilelink" href="{relative_path}/user/{user.userslug}" role="menuitem" aria-label="[[user:profile]]">
-				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status {user.status}"><span class="visually-hidden">[[global:{user.status}]]</span></span>
+			<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" component="header/profilelink" href="{relative_path}/user/{user.userslug}" role="menuitem" aria-label="{{tx("user:profile")}}">
+				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status {user.status}"><span class="visually-hidden">{{tx(concat("global:", user.status))}}</span></span>
 				<span class="fw-semibold" component="header/username">{user.username}</span>
 			</a>
 		</li>
 		<li role="presentation" class="dropdown-divider"></li>
-		<li><h6 class="dropdown-header text-xs">[[global:status]]</h6></li>
+		<li><h6 class="dropdown-header text-xs">{{tx("global:status")}}</h6></li>
 		<li>
 			<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.online }}}selected{{{ end }}}" data-status="online" role="menuitem">
 				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status online"></span>
-				<span class="flex-grow-1">[[global:online]]</span>
+				<span class="flex-grow-1">{{tx("global:online")}}</span>
 			</a>
 		</li>
 		<li>
 			<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.away }}}selected{{{ end }}}" data-status="away" role="menuitem">
 				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status away"></span>
-				<span class="flex-grow-1">[[global:away]]</span>
+				<span class="flex-grow-1">{{tx("global:away")}}</span>
 			</a>
 		</li>
 		<li>
 			<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.dnd }}}selected{{{ end }}}" data-status="dnd" role="menuitem">
 				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status dnd"></span>
-				<span class="flex-grow-1">[[global:dnd]]</span>
+				<span class="flex-grow-1">{{tx("global:dnd")}}</span>
 			</a>
 		</li>
 		<li>
 			<a href="#" class="dropdown-item rounded-1 user-status d-flex align-items-center gap-2 {{{ if user.offline }}}selected{{{ end }}}" data-status="offline" role="menuitem">
 				<span component="user/status" class="flex-shrink-0 border border-white border-2 rounded-circle status offline"></span>
-				<span class="flex-grow-1">[[global:invisible]]</span>
+				<span class="flex-grow-1">{{tx("global:invisible")}}</span>
 			</a>
 		</li>
 		<li role="presentation" class="dropdown-divider"></li>
 		<li>
 			<a class="dropdown-item" href="{relative_path}/user/{user.userslug}/bookmarks" role="menuitem">
-				<i class="fa fa-fw fa-bookmark"></i> <span>[[user:bookmarks]]</span>
+				<i class="fa fa-fw fa-bookmark"></i> <span>{{tx("user:bookmarks")}}</span>
 			</a>
 		</li>
 		<li>
 			<a class="dropdown-item" component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit" role="menuitem">
-				<i class="fa fa-fw fa-edit"></i> <span>[[user:edit-profile]]</span>
+				<i class="fa fa-fw fa-edit"></i> <span>{{tx("user:edit-profile")}}</span>
 			</a>
 		</li>
 		<li>
 			<a class="dropdown-item" component="header/profilelink/settings" href="{relative_path}/user/{user.userslug}/settings" role="menuitem">
-				<i class="fa fa-fw fa-gear"></i> <span>[[user:settings]]</span>
+				<i class="fa fa-fw fa-gear"></i> <span>{{tx("user:settings")}}</span>
 			</a>
 		</li>
 		{{{ if showModMenu }}}
 		<li role="presentation" class="dropdown-divider"></li>
-		<li><h6 class="dropdown-header">[[pages:moderator-tools]]</h6></li>
+		<li><h6 class="dropdown-header">{{tx("pages:moderator-tools")}}</h6></li>
 		<li>
 			<a class="dropdown-item" href="{relative_path}/flags" role="menuitem">
-				<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>
+				<i class="fa fa-fw fa-flag"></i> <span>{{tx("pages:flagged-content")}}</span>
 			</a>
 		</li>
 		<li>
 			<a class="dropdown-item" href="{relative_path}/post-queue" role="menuitem">
-				<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
+				<i class="fa fa-fw fa-list-alt"></i> <span>{{tx("pages:post-queue")}}</span>
 			</a>
 		</li>
 		{{{ if registrationQueueEnabled }}}
 		<li>
 			<a class="dropdown-item" href="{relative_path}/registration-queue" role="menuitem">
-				<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:registration-queue]]</span>
+				<i class="fa fa-fw fa-list-alt"></i> <span>{{tx("pages:registration-queue")}}</span>
 			</a>
 		</li>
 		{{{ end }}}
 		<li>
 			<a class="dropdown-item" href="{relative_path}/ip-blacklist" role="menuitem">
-				<i class="fa fa-fw fa-ban"></i> <span>[[pages:ip-blacklist]]</span>
+				<i class="fa fa-fw fa-ban"></i> <span>{{tx("pages:ip-blacklist")}}</span>
 			</a>
 		</li>
 		{{{ else }}}
 		{{{ if postQueueEnabled }}}
 		<li>
 			<a class="dropdown-item" href="{relative_path}/post-queue" role="menuitem">
-				<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
+				<i class="fa fa-fw fa-list-alt"></i> <span>{{tx("pages:post-queue")}}</span>
 			</a>
 		</li>
 		{{{ end }}}
@@ -94,7 +94,7 @@
 				<input type="hidden" name="_csrf" value="{config.csrf_token}">
 				<input type="hidden" name="noscript" value="true">
 				<button type="submit" class="dropdown-item" role="menuitem">
-					<i class="fa fa-fw fa-sign-out"></i><span> [[global:logout]]</span>
+					<i class="fa fa-fw fa-sign-out"></i><span> {{tx("global:logout")}}</span>
 				</button>
 			</form>
 		</li>
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 0fbaa8d96..ffd9b6023 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -20,8 +20,8 @@
 			{{{ if (config.searchEnabled && user.privileges.search:content) }}}
 			<div class="navbar-search visible-xs">
 				<form action="{config.relative_path}/search" method="GET">
-					<button type="button" class="btn btn-link"><i class="fa fa-lg fa-fw fa-search" title="[[global:header.search]]"></i></button>
-					<input autocomplete="off" type="text" class="form-control hidden" name="term" placeholder="[[global:search]]"/>
+					<button type="button" class="btn btn-link"><i class="fa fa-lg fa-fw fa-search" title="{{tx("global:header.search")}}"></i></button>
+					<input autocomplete="off" type="text" class="form-control hidden" name="term" placeholder="{{tx("global:search")}}"/>
 					<button class="btn btn-primary hidden" type="submit"></button>
 					<input type="text" class="hidden" name="in" value="{config.searchDefaultInQuick}" />
 				</form>
@@ -71,7 +71,7 @@
 				</ul>
 				<ul class="navbar-nav mb-2 mb-lg-0 hidden-xs">
 					<li class="nav-item">
-						<a href="#" id="reconnect" class="nav-link hide" title="[[global:reconnecting-message, {config.siteTitle}]]">
+						<a href="#" id="reconnect" class="nav-link hide" title="{{tx("global:reconnecting-message", config.siteTitle)}}">
 							<i class="fa fa-check"></i>
 						</a>
 					</li>
@@ -85,12 +85,12 @@
 				{{{ if !maintenanceHeader }}}
 				{{{ if config.loggedIn }}}
 				<ul id="logged-in-menu" class="navbar-nav me-0 mb-2 mb-lg-0 align-items-center">
-					<li class="nav-item notifications dropdown d-none d-sm-block" component="notifications" title="[[global:header.notifications]]">
+					<li class="nav-item notifications dropdown d-none d-sm-block" component="notifications" title="{{tx("global:header.notifications")}}">
 						<!-- IMPORT partials/header/notifications.tpl -->
 					</li>
 
 					{{{ if canChat }}}
-					<li class="nav-item chats dropdown" title="[[global:header.chats]]">
+					<li class="nav-item chats dropdown" title="{{tx("global:header.chats")}}">
 						<!-- IMPORT partials/header/chats.tpl -->
 					</li>
 					{{{ end }}}
@@ -103,14 +103,14 @@
 					<li class="nav-item">
 						<a class="nav-link" href="{relative_path}/register">
 							<i class="fa fa-pencil fa-fw d-inline-block d-sm-none"></i>
-							<span>[[global:register]]</span>
+							<span>{{tx("global:register")}}</span>
 						</a>
 					</li>
 					{{{ end }}}
 					<li class="nav-item">
 						<a class="nav-link" href="{relative_path}/login">
 							<i class="fa fa-sign-in fa-fw d-inline-block d-sm-none"></i>
-							<span>[[global:login]]</span>
+							<span>{{tx("global:login")}}</span>
 						</a>
 					</li>
 				</ul>
@@ -120,7 +120,7 @@
 					<li class="nav-item">
 						<a href="{relative_path}/login">
 							<i class="fa fa-sign-in fa-fw d-block d-sm-none"></i>
-							<span>[[global:login]]</span>
+							<span>{{tx("global:login")}}</span>
 						</a>
 					</li>
 				</ul>
diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
index 24f9d412d..5fe89acf8 100644
--- a/templates/partials/notifications_list.tpl
+++ b/templates/partials/notifications_list.tpl
@@ -1,7 +1,7 @@
 {{{ if !notifications.length }}}
 <div class="no-notifs text-center p-4 d-flex flex-column">
 	<div class="p-4"><i class="fa-solid fa-wind fs-2 text-muted"></i></div>
-	<div class="text-xs fw-semibold text-muted">[[notifications:no-notifs]]</div>
+	<div class="text-xs fw-semibold text-muted">{{tx("notifications:no-notifs")}}</div>
 </div>
 {{{ end }}}
 
@@ -38,8 +38,8 @@
 		<div>
 			{{{ if ./nid }}}
 			<button class="mark-read btn btn-ghost btn-sm d-flex align-items-center justify-content-center flex-grow-0 flex-shrink-0 p-1" style="width: 1.5rem; height: 1.5rem;">
-				<i class="lh-1 unread fa fa-2xs fa-circle text-primary {{{ if ./read }}}hidden{{{ end }}}" aria-label="[[unread:mark-as-read]]"></i>
-				<i class="lh-1 read fa fa-2xs fa-circle-o text-secondary {{{ if !./read }}}hidden{{{ end }}}" aria-label="[[unread:mark-as-unread]]"></i>
+				<i class="lh-1 unread fa fa-2xs fa-circle text-primary {{{ if ./read }}}hidden{{{ end }}}" aria-label="{{tx("unread:mark-as-read")}}"></i>
+				<i class="lh-1 read fa fa-2xs fa-circle-o text-secondary {{{ if !./read }}}hidden{{{ end }}}" aria-label="{{tx("unread:mark-as-unread")}}"></i>
 			</button>
 			{{{ end }}}
 		</div>
diff --git a/templates/partials/paginator.tpl b/templates/partials/paginator.tpl
index 80e130112..80af074b2 100644
--- a/templates/partials/paginator.tpl
+++ b/templates/partials/paginator.tpl
@@ -1,45 +1,45 @@
 <nav component="pagination" class="pagination-container<!-- IF !pagination.pages.length --> hidden<!-- ENDIF !pagination.pages.length -->" aria-label="[[global:pagination]]">
 	<ul class="pagination hidden-xs justify-content-center">
 		<li class="page-item previous float-start<!-- IF !pagination.prev.active --> disabled<!-- ENDIF !pagination.prev.active -->">
-			<a class="page-link" href="?{pagination.prev.qs}" data-page="{pagination.prev.page}" aria-label="[[global:pagination.previouspage]]"><i class="fa fa-chevron-left"></i> </a>
+			<a class="page-link" href="?{pagination.prev.qs}" data-page="{pagination.prev.page}" aria-label="{{tx("global:pagination.previouspage")}}"><i class="fa fa-chevron-left"></i> </a>
 		</li>
 
 		{{{each pagination.pages}}}
 			<!-- IF pagination.pages.separator -->
 			<li component="pagination/select-page" class="page-item page select-page">
-				<a class="page-link" href="#" aria-label="[[global:pagination.go-to-page]]"><i class="fa fa-ellipsis-h"></i></a>
+				<a class="page-link" href="#" aria-label="{{tx("global:pagination.go-to-page")}}"><i class="fa fa-ellipsis-h"></i></a>
 			</li>
 			<!-- ELSE -->
 			<li class="page-item page<!-- IF pagination.pages.active --> active<!-- ENDIF pagination.pages.active -->" >
-				<a class="page-link" href="?{pagination.pages.qs}" data-page="{pagination.pages.page}" aria-label="[[global:pagination.page-x, {./page}]]">{pagination.pages.page}</a>
+				<a class="page-link" href="?{pagination.pages.qs}" data-page="{pagination.pages.page}" aria-label="{{tx("global:pagination.page-x", ./page)}}">{pagination.pages.page}</a>
 			</li>
 			<!-- ENDIF pagination.pages.separator -->
 		{{{end}}}
 
 		<li class="page-item next float-end<!-- IF !pagination.next.active --> disabled<!-- ENDIF !pagination.next.active -->">
-			<a class="page-link" href="?{pagination.next.qs}" data-page="{pagination.next.page}" aria-label="[[global:pagination.nextpage]]"><i class="fa fa-chevron-right"></i></a>
+			<a class="page-link" href="?{pagination.next.qs}" data-page="{pagination.next.page}" aria-label="{{tx("global:pagination.nextpage")}}"><i class="fa fa-chevron-right"></i></a>
 		</li>
 	</ul>
 
 	<ul class="pagination hidden-sm hidden-md hidden-lg justify-content-center">
 		<li class="page-item first<!-- IF !pagination.prev.active --> disabled<!-- ENDIF !pagination.prev.active -->">
-			<a class="page-link" href="?{pagination.first.qs}" data-page="1" aria-label="[[global:pagination.firstpage]]"><i class="fa fa-fast-backward"></i> </a>
+			<a class="page-link" href="?{pagination.first.qs}" data-page="1" aria-label="{{tx("global:pagination.firstpage")}}"><i class="fa fa-fast-backward"></i> </a>
 		</li>
 
 		<li class="page-item previous<!-- IF !pagination.prev.active --> disabled<!-- ENDIF !pagination.prev.active -->">
-			<a class="page-link" href="?{pagination.prev.qs}" data-page="{pagination.prev.page}" aria-label="[[global:pagination.previouspage]]"><i class="fa fa-chevron-left"></i> </a>
+			<a class="page-link" href="?{pagination.prev.qs}" data-page="{pagination.prev.page}" aria-label="{{tx("global:pagination.previouspage")}}"><i class="fa fa-chevron-left"></i> </a>
 		</li>
 
 		<li component="pagination/select-page" class="page-item page select-page">
-			<a class="page-link" href="#" aria-label="[[global:pagination.go-to-page]]">{pagination.currentPage} / {pagination.pageCount}</a>
+			<a class="page-link" href="#" aria-label="{{tx("global:pagination.go-to-page")}}">{pagination.currentPage} / {pagination.pageCount}</a>
 		</li>
 
 		<li class="page-item next<!-- IF !pagination.next.active --> disabled<!-- ENDIF !pagination.next.active -->">
-			<a class="page-link" href="?{pagination.next.qs}" data-page="{pagination.next.page}" aria-label="[[global:pagination.nextpage]]"><i class="fa fa-chevron-right"></i></a>
+			<a class="page-link" href="?{pagination.next.qs}" data-page="{pagination.next.page}" aria-label="{{tx("global:pagination.nextpage")}}"><i class="fa fa-chevron-right"></i></a>
 		</li>
 
 		<li class="page-item last<!-- IF !pagination.next.active --> disabled<!-- ENDIF !pagination.next.active -->">
-			<a class="page-link" href="?{pagination.last.qs}" data-page="{pagination.pageCount}" aria-label="[[global:pagination.lastpage]]"><i class="fa fa-fast-forward"></i> </a>
+			<a class="page-link" href="?{pagination.last.qs}" data-page="{pagination.pageCount}" aria-label="{{tx("global:pagination.lastpage")}}"><i class="fa fa-fast-forward"></i> </a>
 		</li>
 	</ul>
 </nav>
\ No newline at end of file
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index cbd297159..1f66d3610 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,10 +1,10 @@
 <div class="topic-main-buttons d-flex gap-2 align-items-center">
 	<span class="loading-indicator btn float-start hidden" done="0">
-		<span class="hidden-xs">[[topic:loading-more-posts]]</span> <i class="fa fa-refresh fa-spin"></i>
+		<span class="hidden-xs">{{tx("topic:loading-more-posts")}}</span> <i class="fa fa-refresh fa-spin"></i>
 	</span>
 
 	{{{ if loggedIn }}}
-	<button component="topic/mark-unread" class="btn btn-sm btn-ghost" title="[[topic:mark-unread]]">
+	<button component="topic/mark-unread" class="btn btn-sm btn-ghost" title="{{tx("topic:mark-unread")}}">
 		<i class="fa fa-fw fa-inbox text-secondary"></i>
 	</button>
 	{{{ end }}}
diff --git a/templates/partials/posts_list_item.tpl b/templates/partials/posts_list_item.tpl
index 79ea7a28b..15802879c 100644
--- a/templates/partials/posts_list_item.tpl
+++ b/templates/partials/posts_list_item.tpl
@@ -9,7 +9,7 @@
         </div>
 
         <div class="mb-3">
-            <a class="topic-category text-xs fw-bold text-uppercase text-secondary mb-3" href="{config.relative_path}/category/{../category.slug}">[[global:posted-in, {../category.name}]]</a>
+            <a class="topic-category text-xs fw-bold text-uppercase text-secondary mb-3" href="{config.relative_path}/category/{../category.slug}">{{tx("global:posted-in", ../category.name)}}</a>
 
             {{{ if ../isMainPost }}}
             {{{ if ../topic.tags.length }}}
diff --git a/templates/partials/quick-category-search-results.tpl b/templates/partials/quick-category-search-results.tpl
index 92d81074c..199c56756 100644
--- a/templates/partials/quick-category-search-results.tpl
+++ b/templates/partials/quick-category-search-results.tpl
@@ -1,7 +1,7 @@
 {{{ if (multiplePages && !config.theme.topMobilebar) }}}
 <div class="show-more-container">
 	<div class="text-center d-block d-md-none">
-		<a href="{url}" class="btn btn-sm btn-primary">[[search:see-more-results, {matchCount}]]</a>
+		<a href="{url}" class="btn btn-sm btn-primary">{{tx("search:see-more-results", matchCount)}}</a>
 	</div>
 	<li role="separator" class="dropdown-divider d-block d-md-none"></li>
 </div>
@@ -35,16 +35,16 @@
 
 {{{ if multiplePages }}}
 <div class="text-center mt-2 d-none d-md-block">
-	<a href="{url}" class="btn btn-sm btn-primary">[[search:see-more-results, {matchCount}]]</a>
+	<a href="{url}" class="btn btn-sm btn-primary">{{tx("search:see-more-results", matchCount)}}</a>
 </div>
 {{{ end }}}
 {{{ if (multiplePages && config.theme.topMobilebar) }}}
 <div class="text-center mt-2 d-block d-md-none">
-	<a href="{url}" class="btn btn-sm btn-primary">[[search:see-more-results, {matchCount}]]</a>
+	<a href="{url}" class="btn btn-sm btn-primary">{{tx("search:see-more-results", matchCount)}}</a>
 </div>
 {{{ end }}}
 
 {{{if !categories.length}}}
-<div class="text-center no-results py-2 py-md-0">[[search:no-matches]]</li>
+<div class="text-center no-results py-2 py-md-0">{{tx("search:no-matches")}}</div>
 <li role="separator" class="dropdown-divider d-block d-md-none"></li>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index 3a9868041..6c9afc3aa 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -25,10 +25,10 @@
 <!-- IF multiplePages -->
 <div class="text-center mt-2">
 	<a href="{url}">
-		[[search:see-more-results, {matchCount}]]
+		{{tx("search:see-more-results", matchCount)}}
 	</a>
 </div>
 <!-- ENDIF multiplePages -->
 {{{if !posts.length}}}
-<div class="text-center no-results">[[search:no-matches]]</li>
+<div class="text-center no-results">{{tx("search:no-matches")}}</div>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/partials/search/results.tpl b/templates/partials/search/results.tpl
index e12c12032..d05ee37dd 100644
--- a/templates/partials/search/results.tpl
+++ b/templates/partials/search/results.tpl
@@ -3,7 +3,7 @@
 	<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>
+	<div class="alert alert-warning">{{tx("search:no-matches")}}</div>
 	{{{ end }}}
 	{{{ end }}}
 
@@ -17,7 +17,7 @@
 
 			{{{ if showAsPosts }}}
 			<div component="post/content" class="content">
-				{{./content}}
+				{{txEscape(./content)}}
 			</div>
 			{{{ end }}}
 
@@ -25,7 +25,7 @@
 				<a href="{config.relative_path}/category/{./category.slug}">
 					<div class="category-item d-inline-block">
 						{{buildCategoryIcon(./category, "24px", "rounded-circle")}}
-						{tx(./category.name)}
+						{{tx(./category.name)}}
 					</div>
 				</a> &bull;
 				<span class="timeago" title="{./timestampISO}"></span>
diff --git a/templates/partials/topic/crosspost.tpl b/templates/partials/topic/crosspost.tpl
index a350719ec..2c8c1a3ab 100644
--- a/templates/partials/topic/crosspost.tpl
+++ b/templates/partials/topic/crosspost.tpl
@@ -1,5 +1,5 @@
 {{{ if loggedIn }}}
-<button component="topic/crosspost" title="[[topic:crosspost-topic]]" class="btn btn-sm btn-ghost">
+<button component="topic/crosspost" title="{{tx("topic:crosspost-topic")}}" class="btn btn-sm btn-ghost">
 	<i class="fa fa-fw fa-square-arrow-up-right text-secondary"></i>
 </button>
 {{{ end }}}
\ No newline at end of file
diff --git a/templates/partials/topic/event.tpl b/templates/partials/topic/event.tpl
index 594915fa2..79d4d092d 100644
--- a/templates/partials/topic/event.tpl
+++ b/templates/partials/topic/event.tpl
@@ -1,12 +1,38 @@
-<li component="topic/event" class="timeline-event text-muted" data-topic-event-id="{./id}" data-topic-event-type="{./type}">
+{{{ if ./items.length }}}
+<li component="topic/event" class="timeline-event text-muted d-flex align-items-start gap-2 pt-4 px-2 px-lg-0">
+	<div class="timeline-badge my-2 my-lg-1">
+		<i class="fa fa-fw {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}} small"></i>
+	</div>
+	<div class="d-flex flex-column align-items-start">
+		<button class="btn btn-sm btn-ghost" type="button" data-bs-toggle="collapse" data-bs-target="#event-collapse-{./id}" aria-expanded="false" aria-controls="collapseExample">
+			{{tx("topic:announcers-x", ./items.length)}}
+		</button>
+		<div class="collapse align-self-start" id="event-collapse-{./id}">
+			<div component="topic/event/items">
+				{{{ each ./items }}}
+				<div class="d-flex gap-2 pt-3 pt-lg-2" data-topic-event-id="{./id}" data-topic-event-type="{./type}">
+					<span class="timeline-text small d-flex align-items-center gap-1 flex-wrap flex-grow-1 flex-lg-grow-0">
+						{{./text}}
+					</span>
+					{{{ if (privileges.isAdminOrMod && ./id) }}}
+					<span component="topic/event/delete" data-topic-event-id="{./id}" data-topic-event-type="{./type}" class="timeline-text pointer" title="{{tx("topic:delete-event")}}"><i class="fa fa-trash"></i></span>
+					{{{ end }}}
+				</div>
+				{{{ end }}}
+			</div>
+		</div>
+	</div>
+</li>
+{{{ else }}}
+<li component="topic/event" class="timeline-event text-muted d-flex align-items-start align-items-lg-center gap-2 pt-4 px-2 px-lg-0" data-topic-event-id="{./id}" data-topic-event-type="{./type}">
 	<div class="timeline-badge">
-		<i class="fa {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}}"></i>
+		<i class="fa fa-fw {{{ if ./icon }}}{./icon}{{{ else }}}fa-circle{{{ end }}} small"></i>
 	</div>
-	<span class="timeline-text">
+	<span class="timeline-text small d-flex align-items-center gap-1 flex-wrap flex-grow-1 flex-lg-grow-0">
 		{{./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>
+	<span component="topic/event/delete" data-topic-event-id="{./id}" data-topic-event-type="{./type}" class="timeline-text pointer" title="{{tx("topic:delete-event")}}"><i class="fa fa-trash"></i></span>
 	{{{ end }}}
 </li>
-
+{{{ end }}}
\ No newline at end of file
diff --git a/templates/partials/topic/navigator.tpl b/templates/partials/topic/navigator.tpl
index 276bd716d..29135d130 100644
--- a/templates/partials/topic/navigator.tpl
+++ b/templates/partials/topic/navigator.tpl
@@ -14,23 +14,23 @@
                     <div class="col-8 post-content"></div>
                     <div class="col-4 text-end">
                         <div class="scroller-content">
-                            <span class="pointer pagetop">[[topic:first-post]] <i class="fa fa-angle-double-up"></i></span>
+                            <span class="pointer pagetop">{{tx("topic:first-post")}} <i class="fa fa-angle-double-up"></i></span>
                             <div class="scroller-container">
                                 <div class="scroller-thumb">
                                     <span class="thumb-text"></span>
                                     <div class="scroller-thumb-icon"></div>
                                 </div>
                             </div>
-                            <span class="pointer pagebottom">[[topic:last-post]] <i class="fa fa-angle-double-down"></i></span>
+                            <span class="pointer pagebottom">{{tx("topic:last-post")}} <i class="fa fa-angle-double-down"></i></span>
                         </div>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-6">
-                        <button id="myNextPostBtn" class="btn btn-outline-secondary form-control" disabled>[[topic:go-to-my-next-post]]</button>
+                        <button id="myNextPostBtn" class="btn btn-outline-secondary form-control" disabled>{{tx("topic:go-to-my-next-post")}}</button>
                     </div>
                     <div class="col-6">
-                        <input type="number" class="form-control" id="indexInput" placeholder="[[global:pagination.enter-index]]">
+                        <input type="number" class="form-control" id="indexInput" placeholder="{{tx("global:pagination.enter-index")}}">
                     </div>
                 </div>
             </li>
diff --git a/templates/partials/topic/post-editor.tpl b/templates/partials/topic/post-editor.tpl
index 86cc30186..8f42ee6e8 100644
--- a/templates/partials/topic/post-editor.tpl
+++ b/templates/partials/topic/post-editor.tpl
@@ -1 +1 @@
-<small data-editor="{editor.userslug}" component="post/editor" class="hidden">[[global:last-edited-by, {editor.username}]] <span class="timeago" title="{isoTimeToLocaleString(editedISO, config.userLang)}"></span></small>
\ No newline at end of file
+<small data-editor="{editor.userslug}" component="post/editor" class="hidden">{{tx("global:last-edited-by", txEscape(editor.username))}} <span class="timeago" title="{isoTimeToLocaleString(editedISO, config.userLang)}"></span></small>
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 7feef5132..e1df46697 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -11,10 +11,10 @@
 		<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")}}
 			{{{ 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>
+			<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">{{tx(concat("global:", posts.user.status))}}</span></span>
 			{{{ else }}}
 			<span component="user/locality" class="position-absolute top-100 start-100 lh-1 border border-white border-2 rounded-circle small" title="[[global:remote-user]]">
-				<span class="visually-hidden">[[global:remote-user]]</span>
+				<span class="visually-hidden">{{tx("global:remote-user")}}</span>
 				<i class="fa fa-globe"></i>
 			</span>
 			{{{ end }}}
@@ -36,12 +36,12 @@
 			{{{ end }}}
 
 			<!-- IF posts.user.banned -->
-			<span class="badge bg-danger">[[user:banned]]</span>
+			<span class="badge bg-danger">{{tx("user:banned")}}</span>
 			<!-- ENDIF posts.user.banned -->
 
 			<span class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
 				{{{ if posts.toPid }}}
-				<a component="post/parent" class="btn btn-sm btn-ghost py-0 px-1 text-xs hidden-xs" data-topid="{posts.toPid}" href="{config.relative_path}/post/{encodeURIComponent(posts.toPid)}"><i class="fa fa-reply"></i> @{{{ if posts.parent.user.userslug }}}{posts.parent.user.username}{{{ else }}}[[global:guest]]{{{ end }}}</a>
+				<a component="post/parent" class="btn btn-sm btn-ghost py-0 px-1 text-xs hidden-xs" data-topid="{posts.toPid}" href="{config.relative_path}/post/{encodeURIComponent(posts.toPid)}"><i class="fa fa-reply"></i> @{{{ if posts.parent.user.userslug }}}{posts.parent.user.username}{{{ else }}}{{tx("global:guest")}}{{{ end }}}</a>
 				{{{ end }}}
 
 				<span>
@@ -57,7 +57,7 @@
 				<span>
 					<i component="post/edit-indicator" class="fa fa-pencil-square<!-- IF privileges.posts:history --> pointer<!-- END --> edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
 
-					<span data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last-edited-by, {posts.editor.username}]] <span class="timeago" title="{isoTimeToLocaleString(posts.editedISO, config.userLang)}"></span></span>
+					<span data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">{{tx("global:last-edited-by", txEscape(posts.editor.username))}} <span class="timeago" title="{isoTimeToLocaleString(posts.editedISO, config.userLang)}"></span></span>
 
 					<span class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
 						<a class="permalink text-muted" href="{config.relative_path}/post/{encodeURIComponent(posts.pid)}"><span class="timeago" title="{posts.timestampISO}"></span></a>
@@ -93,7 +93,7 @@
 		</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>
+		<span class="replies-last hidden-xs small">{{tx("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>
 	</a>
@@ -102,12 +102,12 @@
 	<small class="d-flex justify-content-end align-items-center gap-1" component="post/actions">
 		<!-- IMPORT partials/topic/reactions.tpl -->
 		<span class="post-tools">
-			<a component="post/reply" href="#" class="btn btn-sm btn-link user-select-none <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
-			<a component="post/quote" href="#" class="btn btn-sm btn-link user-select-none <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
+			<a component="post/reply" href="#" class="btn btn-sm btn-link user-select-none <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">{{tx("topic:reply")}}</a>
+			<a component="post/quote" href="#" class="btn btn-sm btn-link user-select-none <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">{{tx("topic:quote")}}</a>
 		</span>
 
 		{{{ if ./announces }}}
-		<a component="post/announce-count" href="#" class="btn-ghost-sm" title="[[topic:announcers]]"><i class="fa fa-share-alt text-primary"></i> {./announces}</a>
+		<a component="post/announce-count" href="#" class="btn-ghost-sm" title="{{tx("topic:announcers")}}"><i class="fa fa-share-alt text-primary"></i> {./announces}</a>
 		{{{ end }}}
 
 		<!-- IF !reputation:disabled -->
diff --git a/templates/partials/topic/quickreply.tpl b/templates/partials/topic/quickreply.tpl
index 73a1c89bc..647d9173d 100644
--- a/templates/partials/topic/quickreply.tpl
+++ b/templates/partials/topic/quickreply.tpl
@@ -9,8 +9,8 @@
 		<input type="hidden" name="tid" value="{tid}" />
 		<input type="hidden" name="_csrf" value="{config.csrf_token}" />
 		<div class="quickreply-message position-relative">
-			<textarea rows="4" name="content" component="topic/quickreply/text" class="form-control mousetrap" placeholder="[[modules:composer.textarea.placeholder]]"></textarea>
-			<div class="imagedrop"><div>[[topic:composer.drag-and-drop-images]]</div></div>
+			<textarea rows="4" name="content" component="topic/quickreply/text" class="form-control mousetrap" placeholder="{{tx("modules:composer.textarea.placeholder")}}"></textarea>
+			<div class="imagedrop"><div>{{tx("topic:composer.drag-and-drop-images")}}</div></div>
 		</div>
 		<div>
 			<div class="d-flex justify-content-end gap-2">
@@ -18,8 +18,10 @@
 					<!-- IMPORT partials/category/selector-dropdown-left.tpl -->
 				</div>
 				<button type="button" component="topic/quickreply/upload/button" class="btn btn-ghost btn-sm border"><i class="fa fa-upload"></i></button>
-				<button type="button" component="topic/quickreply/expand" class="btn btn-ghost btn-sm border" title="[[topic:open-composer]]"><i class="fa fa-expand"></i></button>
-				<button type="submit" component="topic/quickreply/button" class="btn btn-sm btn-primary">[[topic:post-quick-{{{ if tid }}}reply{{{ else }}}create{{{ end }}}]]</button>
+				<button type="button" component="topic/quickreply/expand" class="btn btn-ghost btn-sm border" title="{{tx("topic:open-composer")}}"><i class="fa fa-expand"></i></button>
+				<button type="submit" component="topic/quickreply/button" class="btn btn-sm btn-primary">
+					{{{ if tid }}}{{tx("topic:post-quick-reply")}}{{{ else }}}{{tx("topic:post-quick-create")}}{{{ end }}}
+				</button>
 			</div>
 		</div>
 	</form>
diff --git a/templates/partials/topic/reply-button.tpl b/templates/partials/topic/reply-button.tpl
index 36a0d4fcd..769910d90 100644
--- a/templates/partials/topic/reply-button.tpl
+++ b/templates/partials/topic/reply-button.tpl
@@ -1,27 +1,27 @@
 <div component="topic/reply/container" class="btn-group bottom-sheet <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">
-	<a href="{config.relative_path}/compose?tid={tid}" class="btn btn-sm btn-primary" component="topic/reply" data-ajaxify="false" role="button"><i class="fa fa-reply visible-xs-inline"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"> [[topic:reply]]</span></a>
+	<a href="{config.relative_path}/compose?tid={tid}" class="btn btn-sm btn-primary" component="topic/reply" data-ajaxify="false" role="button"><i class="fa fa-reply visible-xs-inline"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"> {{tx("topic:reply")}}</span></a>
 	<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		<span class="caret"></span>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-end p-1" role="menu">
-		<li><a class="dropdown-item rounded-1" href="#" component="topic/reply-as-topic" role="menuitem">[[topic:reply-as-topic]]</a></li>
+		<li><a class="dropdown-item rounded-1" href="#" component="topic/reply-as-topic" role="menuitem">{{tx("topic:reply-as-topic")}}</a></li>
 	</ul>
 </div>
 
 <!-- IF loggedIn -->
 <!-- IF !privileges.topics:reply -->
 <!-- IF locked -->
-<a component="topic/reply/locked" class="btn btn-sm btn-primary" disabled><i class="fa fa-lock"></i> [[topic:locked]]</a>
+<a component="topic/reply/locked" class="btn btn-sm btn-primary" disabled><i class="fa fa-lock"></i> {{tx("topic:locked")}}</a>
 <!-- ENDIF locked -->
 <!-- ENDIF !privileges.topics:reply -->
 
 <!-- IF !locked -->
-<a component="topic/reply/locked" class="btn btn-sm btn-primary hidden" disabled><i class="fa fa-lock"></i> [[topic:locked]]</a>
+<a component="topic/reply/locked" class="btn btn-sm btn-primary hidden" disabled><i class="fa fa-lock"></i> {{tx("topic:locked")}}</a>
 <!-- ENDIF !locked -->
 
 <!-- ELSE -->
 
 <!-- IF !privileges.topics:reply -->
-<a component="topic/reply/guest" href="{config.relative_path}/login" class="btn btn-sm btn-primary">[[topic:guest-login-reply]]</a>
+<a component="topic/reply/guest" href="{config.relative_path}/login" class="btn btn-sm btn-primary">{{tx("topic:guest-login-reply")}}</a>
 <!-- ENDIF !privileges.topics:reply -->
 <!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/topic/selection-tooltip.tpl b/templates/partials/topic/selection-tooltip.tpl
index a34152726..11f34b419 100644
--- a/templates/partials/topic/selection-tooltip.tpl
+++ b/templates/partials/topic/selection-tooltip.tpl
@@ -1,3 +1,3 @@
 <div component="selection/tooltip" class="selection-tooltip-container position-absolute card card-body p-1 rounded-1 mt-2" style="z-index: 1;">
-    <button component="selection/tooltip/quote" class="btn btn-sm btn-primary quote-tooltip-btn">[[topic:quote]]</button>
+    <button component="selection/tooltip/quote" class="btn btn-sm btn-primary quote-tooltip-btn">{{tx("topic:quote")}}</button>
 </div>
\ No newline at end of file
diff --git a/templates/partials/topic/sort.tpl b/templates/partials/topic/sort.tpl
index fa0678512..379267a83 100644
--- a/templates/partials/topic/sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,22 +1,22 @@
-<div title="[[topic:sort-by]]" class="dropdown bottom-sheet hidden-xs" component="thread/sort">
-	<button class="btn btn-sm btn-ghost dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:post-sort-option, {sortOptionLabel}]]">
+<div title="{{tx("topic:sort-by")}}" class="dropdown bottom-sheet hidden-xs" component="thread/sort">
+	<button class="btn btn-sm btn-ghost dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="{{tx("aria:post-sort-option", sortOptionLabel)}}">
 	<i class="fa fa-fw fa-arrow-down-wide-short text-secondary"></i></button>
 	<ul class="dropdown-menu dropdown-menu-end p-1 text-sm" role="menu">
 		<li>
 			<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="#" class="oldest_to_newest" data-sort="oldest_to_newest" role="menuitem">
-				<span class="flex-grow-1">[[topic:oldest-to-newest]]</span>
+				<span class="flex-grow-1">{{tx("topic:oldest-to-newest")}}</span>
 				<i class="flex-shrink-0 fa fa-fw text-secondary"></i>
 			</a>
 		</li>
 		<li>
 			<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="#" class="newest_to_oldest" data-sort="newest_to_oldest" role="menuitem">
-				<span class="flex-grow-1">[[topic:newest-to-oldest]]</span>
+				<span class="flex-grow-1">{{tx("topic:newest-to-oldest")}}</span>
 				<i class="flex-shrink-0 fa fa-fw text-secondary"></i>
 			</a>
 		</li>
 		<li>
 			<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="#" class="most_votes" data-sort="most_votes" role="menuitem">
-				<span class="flex-grow-1">[[topic:most-votes]]</span>
+				<span class="flex-grow-1">{{tx("topic:most-votes")}}</span>
 				<i class="flex-shrink-0 fa fa-fw text-secondary"></i>
 			</a>
 		</li>
diff --git a/templates/partials/topic/stats.tpl b/templates/partials/topic/stats.tpl
index c05a5074e..245b8fc5c 100644
--- a/templates/partials/topic/stats.tpl
+++ b/templates/partials/topic/stats.tpl
@@ -1,30 +1,30 @@
 {{{ if ./crossposts.length }}}
 <span class="badge text-body border border-gray-300 stats text-xs position-relative">
-	<i class="fa-regular fa-fw fa-clone visible-xs-inline" title="[[global:crossposts]]"></i>
+	<i class="fa-regular fa-fw fa-clone visible-xs-inline" title="{{tx("global:crossposts")}}"></i>
 	<span component="topic/crosspost-count" title="{crossposts.length}" class="fw-bold">{humanReadableNumber(crossposts.length)}</span>
-	<span class="hidden-xs text-lowercase fw-normal">[[global:crossposts]]</span>
-	<a href="#" aria-label="[[aria:show-crossposts]]" id="show-crossposts" class="stretched-link"></a>
+	<span class="hidden-xs text-lowercase fw-normal">{{tx("global:crossposts")}}</span>
+	<a href="#" aria-label="{{tx("aria:show-crossposts")}}" id="show-crossposts" class="stretched-link"></a>
 </span>
 {{{ end }}}
 <span class="badge text-body border border-gray-300 stats text-xs">
-	<i class="fa-regular fa-fw fa-message visible-xs-inline" title="[[global:posts]]"></i>
+	<i class="fa-regular fa-fw fa-message visible-xs-inline" title="{{tx("global:posts")}}"></i>
 	<span component="topic/post-count" title="{postcount}" class="fw-bold">{humanReadableNumber(postcount)}</span>
-	<span class="hidden-xs text-lowercase fw-normal">[[global:posts]]</span>
+	<span class="hidden-xs text-lowercase fw-normal">{{tx("global:posts")}}</span>
 </span>
 <span class="badge text-body border border-gray-300 stats text-xs">
-	<i class="fa fa-fw fa-user visible-xs-inline" title="[[global:posters]]"></i>
+	<i class="fa fa-fw fa-user visible-xs-inline" title="{{tx("global:posters")}}"></i>
 	<span title="{postercount}" class="fw-bold">{humanReadableNumber(postercount)}</span>
-	<span class="hidden-xs text-lowercase fw-normal">[[global:posters]]</span>
+	<span class="hidden-xs text-lowercase fw-normal">{{tx("global:posters")}}</span>
 </span>
 <span class="badge text-body border border-gray-300 stats text-xs">
-	<i class="fa fa-fw fa-eye visible-xs-inline" title="[[global:views]]"></i>
+	<i class="fa fa-fw fa-eye visible-xs-inline" title="{{tx("global:views")}}"></i>
 	<span class="fw-bold" title="{viewcount}">{humanReadableNumber(viewcount)}</span>
-	<span class="hidden-xs text-lowercase fw-normal">[[global:views]]</span>
+	<span class="hidden-xs text-lowercase fw-normal">{{tx("global:views")}}</span>
 </span>
 {{{ if ./followercount }}}
 <span class="badge text-body border border-gray-300 stats text-xs">
-	<i class="fa fa-fw fa-bell-o visible-xs-inline" title="[[global:watching]]"></i>
+	<i class="fa fa-fw fa-bell-o visible-xs-inline" title="{{tx("global:watching")}}"></i>
 	<span class="fw-bold" title="{viewcount}">{humanReadableNumber(followercount)}</span>
-	<span class="hidden-xs text-lowercase fw-normal">[[global:watching]]</span>
+	<span class="hidden-xs text-lowercase fw-normal">{{tx("global:watching")}}</span>
 </span>
 {{{ end }}}
\ No newline at end of file
diff --git a/templates/partials/topic/tools.tpl b/templates/partials/topic/tools.tpl
index bee0e2236..dfe8e9837 100644
--- a/templates/partials/topic/tools.tpl
+++ b/templates/partials/topic/tools.tpl
@@ -1,5 +1,5 @@
 {{{ if privileges.view_thread_tools }}}
-<div title="[[topic:thread-tools.title]]" class="dropdown thread-tools bottom-sheet">
+<div title="{{tx("topic:thread-tools.title")}}" class="dropdown thread-tools bottom-sheet">
 	<button class="btn btn-sm btn-ghost dropdown-toggle" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<i class="fa fa-fw fa-gear text-secondary"></i>
 	</button>
diff --git a/templates/partials/topic/watch.tpl b/templates/partials/topic/watch.tpl
index f110677c8..88464a80a 100644
--- a/templates/partials/topic/watch.tpl
+++ b/templates/partials/topic/watch.tpl
@@ -1,9 +1,9 @@
 {{{ if config.loggedIn }}}
 <div class="dropdown bottom-sheet" component="topic/watch"
 data-bs-toggle="tooltip"
-	{{{if isFollowing}}}title="[[topic:watching]]"{{{end}}}
-	{{{if isNotFollowing}}}title="[[topic:not-watching]]"{{{end}}}
-	{{{if isIgnoring}}}title="[[topic:ignoring]]"{{{end}}}
+	{{{if isFollowing}}}title="{{tx("topic:watching")}}"{{{end}}}
+	{{{if isNotFollowing}}}title="{{tx("topic:not-watching")}}"{{{end}}}
+	{{{if isIgnoring}}}title="{{tx("topic:ignoring")}}"{{{end}}}
 >
 	<button class="btn btn-sm btn-ghost dropdown-toggle text-secondary" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 		<span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell-o"></i></span>
@@ -18,9 +18,9 @@ data-bs-toggle="tooltip"
 				<div class="flex-grow-1 d-flex flex-column">
 					<span class="d-flex align-items-center gap-2">
 						<i class="flex-shrink-0 fa fa-fw fa-bell-o text-secondary"></i>
-						<span class="flex-grow-1 fw-semibold">[[topic:watching]]</span>
+						<span class="flex-grow-1 fw-semibold">{{tx("topic:watching")}}</span>
 					</span>
-					<div class="help-text text-secondary text-xs">[[topic:watching.description]]</div>
+					<div class="help-text text-secondary text-xs">{{tx("topic:watching.description")}}</div>
 				</div>
 				<span class="flex-shrink-0"><i component="topic/following/check" class="fa fa-fw {{{ if isFollowing }}}fa-check{{{ end }}}"></i></span>
 			</a>
@@ -31,9 +31,9 @@ data-bs-toggle="tooltip"
 				<div class="flex-grow-1 d-flex flex-column">
 					<span class="d-flex align-items-center gap-2">
 						<i class="flex-shrink-0 fa fa-fw fa-bell-slash-o text-secondary"></i>
-						<span class="flex-grow-1 fw-semibold">[[topic:not-watching]]</span>
+						<span class="flex-grow-1 fw-semibold">{{tx("topic:not-watching")}}</span>
 					</span>
-					<div class="help-text text-secondary text-xs">[[topic:not-watching.description]]</div>
+					<div class="help-text text-secondary text-xs">{{tx("topic:not-watching.description")}}</div>
 				</div>
 				<span class="flex-shrink-0"><i component="topic/not-following/check" class="fa fa-fw {{{ if isNotFollowing }}}fa-check{{{ end }}}"></i></span>
 			</a>
@@ -44,9 +44,9 @@ data-bs-toggle="tooltip"
 				<div class="flex-grow-1 d-flex flex-column">
 					<span class="d-flex align-items-center gap-2">
 						<i class="flex-shrink-0 fa fa-fw fa-eye-slash text-secondary"></i>
-						<span class="flex-grow-1 fw-semibold">[[topic:ignoring]]</span>
+						<span class="flex-grow-1 fw-semibold">{{tx("topic:ignoring")}}</span>
 					</span>
-					<div class="help-text text-secondary text-xs">[[topic:ignoring.description]]</div>
+					<div class="help-text text-secondary text-xs">{{tx("topic:ignoring.description")}}</div>
 				</div>
 				<span class="flex-shrink-0"><i component="topic/ignoring/check" class="fa fa-fw {{{ if isIgnoring }}}fa-check{{{ end }}}"></i></span>
 			</a>
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 0f0be93ed..be9b737e0 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -28,27 +28,27 @@
 				<div component="topic/labels" class="d-flex flex-wrap gap-1 w-100 align-items-center">
 					<span component="topic/watched" class="badge border border-gray-300 text-body {{{ if !./followed }}}hidden{{{ end }}}">
 						<i class="fa fa-bell-o"></i>
-						<span>[[topic:watching]]</span>
+						<span>{{tx("topic:watching")}}</span>
 					</span>
 					<span component="topic/ignored" class="badge border border-gray-300 text-body {{{ if !./ignored }}}hidden{{{ end }}}">
 						<i class="fa fa-eye-slash"></i>
-						<span>[[topic:ignoring]]</span>
+						<span>{{tx("topic:ignoring")}}</span>
 					</span>
 					<span component="topic/scheduled" class="badge border border-gray-300 text-body {{{ if !./scheduled }}}hidden{{{ end }}}">
 						<i class="fa fa-clock-o"></i>
-						<span>[[topic:scheduled]]</span>
+						<span>{{tx("topic:scheduled")}}</span>
 					</span>
 					<span component="topic/pinned" class="badge border border-gray-300 text-body {{{ if (./scheduled || !./pinned) }}}hidden{{{ end }}}">
 						<i class="fa fa-thumb-tack"></i>
-						<span>{{{ if !./pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}</span>
+						<span>{{{ if !./pinExpiry }}}{{tx("topic:pinned")}}{{{ else }}}{{tx("topic:pinned-with-expiry", isoTimeToLocaleString(./pinExpiryISO, config.userLang))}}{{{ end }}}</span>
 					</span>
 					<span component="topic/locked" class="badge border border-gray-300 text-body {{{ if !./locked }}}hidden{{{ end }}}">
 						<i class="fa fa-lock"></i>
-						<span>[[topic:locked]]</span>
+						<span>{{tx("topic:locked")}}</span>
 					</span>
 					<span component="topic/moved" class="badge border border-gray-300 text-body {{{ if !./oldCid }}}hidden{{{ end }}}">
 						<i class="fa fa-arrow-circle-right"></i>
-						<span>[[topic:moved]]</span>
+						<span>{{tx("topic:moved")}}</span>
 					</span>
 					{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 
@@ -80,7 +80,7 @@
 				{{{ end }}}
 			</div>
 			{{{ if ./thumbs.length }}}
-			<a class="topic-thumbs position-relative text-decoration-none flex-shrink-0 d-none d-xl-block" href="{config.relative_path}/topic/{./slug}{{{ if ./bookmark }}}/{./bookmark}{{{ end }}}" aria-label="[[topic:thumb-image]]">
+			<a class="topic-thumbs position-relative text-decoration-none flex-shrink-0 d-none d-xl-block" href="{config.relative_path}/topic/{./slug}{{{ if ./bookmark }}}/{./bookmark}{{{ end }}}" aria-label="{{tx("topic:thumb-image")}}">
 				<img class="topic-thumb rounded-1 bg-light" style="width:auto;max-width: 5.33rem;height: 3.33rem;object-fit: contain;" src="{./thumbs.0.url}" alt=""/>
 				<span data-numthumbs="{./thumbs.length}" class="px-1 position-absolute bottom-0 end-0 badge rounded-1 opacity-75 fw-semibold text-bg-light" style="margin: 0.125rem; z-index: 1;">{./thumbs.length}</span>
 			</a>
@@ -92,18 +92,18 @@
 				{{{ if !reputation:disabled }}}
 				<div class="stats-votes overflow-hidden d-flex flex-column align-items-center">
 					<span class="fs-4" title="{./votes}">{humanReadableNumber(./votes, 0)}</span>
-					<span class="d-none d-xl-flex text-uppercase text-xs">[[global:votes]]</span>
+					<span class="d-none d-xl-flex text-uppercase text-xs">{{tx("global:votes")}}</span>
 					<i class="d-xl-none fa fa-fw text-xs text-muted opacity-75 fa-chevron-up"></i>
 				</div>
 				{{{ end }}}
 				<div class="stats-postcount overflow-hidden d-flex flex-column align-items-center">
 					<span class="fs-4" title="{./postcount}">{humanReadableNumber(./postcount, 0)}</span>
-					<span class="d-none d-xl-flex text-uppercase text-xs">[[global:posts]]</span>
+					<span class="d-none d-xl-flex text-uppercase text-xs">{{tx("global:posts")}}</span>
 					<i class="d-xl-none fa-regular fa-fw text-xs text-muted opacity-75 fa-message"></i>
 				</div>
 				<div class="stats-viewcount overflow-hidden d-flex flex-column align-items-center">
 					<span class="fs-4" title="{./viewcount}">{humanReadableNumber(./viewcount, 0)}</span>
-					<span class="d-none d-xl-flex text-uppercase text-xs">[[global:views]]</span>
+					<span class="d-none d-xl-flex text-uppercase text-xs">{{tx("global:views")}}</span>
 					<i class="d-xl-none fa fa-fw text-xs text-muted opacity-75 fa-eye"></i>
 				</div>
 			</div>
@@ -111,16 +111,16 @@
 				<div class="lastpost border-start border-4 lh-sm h-100 d-flex flex-column gap-1" style="border-color: {./category.bgColor}!important;">
 					{{{ if ./unreplied }}}
 					<div class="ps-2 text-xs">
-						[[category:no-replies]]
+						{{tx("category:no-replies")}}
 					</div>
 					{{{ 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 class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" title="{./teaser.timestampISO}" aria-label="[[global:lastpost]]"></a>
+						<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" title="{./teaser.timestampISO}" aria-label="{{tx("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>
+						<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" aria-label="{{tx("global:lastpost")}}"></a>
 						{{txEscape(./teaser.content)}}
 					</div>
 					{{{ end }}}
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index 79de5b32a..163ae54ad 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -8,7 +8,7 @@
 	<br/>
 	<div class="user-info">
 		<span id="online_anon_count">{anonymousUserCount}</span>
-		<span>[[global:guests]]</span>
+		<span>{{tx("global:guests")}}</span>
 	</div>
 </li>
 <!-- ENDIF anonymousUserCount -->
diff --git a/templates/partials/users_list_menu.tpl b/templates/partials/users_list_menu.tpl
index d63f2ec61..3e65ebcb6 100644
--- a/templates/partials/users_list_menu.tpl
+++ b/templates/partials/users_list_menu.tpl
@@ -1,17 +1,17 @@
 <div component="user/list/menu" class="text-sm d-flex flex-wrap align-items-center gap-2">
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=online">[[global:online]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=online">{{tx("global:online")}}</a>
 
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=sort-posts">[[users:top-posters]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=sort-posts">{{tx("users:top-posters")}}</a>
 
 	{{{ if !reputation:disabled }}}
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=sort-reputation">[[users:most-reputation]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=sort-reputation">{{tx("users:most-reputation")}}</a>
 	{{{ end }}}
 
 	{{{ if isAdminOrGlobalMod }}}
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=flagged">[[users:most-flags]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=flagged">{{tx("users:most-flags")}}</a>
 
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=banned">[[user:banned]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=banned">{{tx("user:banned")}}</a>
 
-	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=muted">[[user:muted]]</a>
+	<a class="btn btn-ghost btn-sm ff-secondary" href="{config.relative_path}/users?section=muted">{{tx("user:muted")}}</a>
 	{{{ end }}}
 </div>
\ No newline at end of file
diff --git a/templates/popular.tpl b/templates/popular.tpl
index e619825d4..04408ebd4 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -10,7 +10,7 @@
 			{{{ if canPost }}}
 			<!-- IMPORT partials/buttons/newTopic.tpl -->
 			{{{ else }}}
-			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">[[category:guest-login-post]]</a>
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">{{tx("category:guest-login-post")}}</a>
 			{{{ end }}}
 		</div>
 		<div class="d-flex gap-1">
@@ -23,7 +23,7 @@
 
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning" id="category-no-topics">[[recent:no-popular-topics]]</div>
+		<div class="alert alert-warning" id="category-no-topics">{{tx("recent:no-popular-topics")}}</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 3e45d65fd..537969c5f 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -10,10 +10,10 @@
 			{{{ if canPost }}}
 			<!-- IMPORT partials/buttons/newTopic.tpl -->
 			{{{ else }}}
-			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">[[category:guest-login-post]]</a>
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">{{tx("category:guest-login-post")}}</a>
 			{{{ end }}}
 			<a href="{config.relative_path}/{selectedFilter.url}{querystring}" 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>
+				<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>{{tx("recent:load-new-posts")}}</div>
 			</a>
 		</div>
 		<div class="d-flex gap-1">
@@ -26,7 +26,7 @@
 
 	<div class="category">
 		<!-- IF !topics.length -->
-		<div class="alert alert-warning" id="category-no-topics">[[recent:no-recent-topics]]</div>
+		<div class="alert alert-warning" id="category-no-topics">{{tx("recent:no-recent-topics")}}</div>
 		<!-- ENDIF !topics.length -->
 
 		<!-- IMPORT partials/topics_list.tpl -->
diff --git a/templates/tag.tpl b/templates/tag.tpl
index d4b2d9370..9618e63a0 100644
--- a/templates/tag.tpl
+++ b/templates/tag.tpl
@@ -10,7 +10,7 @@
 			{{{ if loggedIn }}}
 			<!-- IMPORT partials/buttons/newTopic.tpl -->
 			{{{ else }}}
-			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">[[category:guest-login-post]]</a>
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">{{tx("category:guest-login-post")}}</a>
 			{{{ end }}}
 		</div>
 		<div class="d-flex gap-1">
@@ -22,11 +22,11 @@
 
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning">[[tags:no-tag-topics]]</div>
+		<div class="alert alert-warning">{{tx("tags:no-tag-topics")}}</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->
-		<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
+		<button id="load-more-btn" class="btn btn-primary hide">{{tx("unread:load-more")}}</button>
 		{{{ if config.usePagination }}}
 		<!-- IMPORT partials/paginator.tpl -->
 		{{{ end }}}
diff --git a/templates/tags.tpl b/templates/tags.tpl
index efea59dcf..90c7f7a3c 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -10,7 +10,7 @@
 	<div class="d-flex justify-content-end mb-3">
 		<div class="search">
 			<div class="input-group">
-				<input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" id="tag-search">
+				<input type="text" class="form-control form-control-sm" placeholder="{{tx("global:search")}}" id="tag-search">
 				<button class="btn btn-sm btn-primary" type="button">
 					<i class="fa fa-search"></i>
 				</button>
@@ -23,7 +23,7 @@
 	<hr/>
 
 	{{{ if !tags.length }}}
-	<div class="alert alert-warning">[[tags:no-tags]]</div>
+	<div class="alert alert-warning">{{tx("tags:no-tags")}}</div>
 	{{{ end }}}
 
 	<div class="category row">
diff --git a/templates/top.tpl b/templates/top.tpl
index 0a756edab..9846deda8 100644
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -10,7 +10,7 @@
 			{{{ if canPost }}}
 			<!-- IMPORT partials/buttons/newTopic.tpl -->
 			{{{ else }}}
-			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">[[category:guest-login-post]]</a>
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary btn-sm">{{tx("category:guest-login-post")}}</a>
 			{{{ end }}}
 		</div>
 		<div class="d-flex gap-1">
@@ -23,7 +23,7 @@
 
 	<div class="category">
 		{{{ if !topics.length }}}
-		<div class="alert alert-warning" id="category-no-topics">[[top:no-top-topics]]</div>
+		<div class="alert alert-warning" id="category-no-topics">{{tx("top:no-top-topics")}}</div>
 		{{{ end }}}
 
 		<!-- IMPORT partials/topics_list.tpl -->
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 01082525a..6872144f8 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -19,16 +19,16 @@
 					<div class="topic-info d-flex gap-2 align-items-center flex-wrap">
 						<span component="topic/labels" class="d-flex gap-2 {{{ if (!scheduled && (!pinned && (!locked && (!icons.length && (!oldCid || (oldCid == "-1")))))) }}}hidden{{{ end }}}">
 							<span component="topic/scheduled" class="badge badge border border-gray-300 text-body {{{ if !scheduled }}}hidden{{{ end }}}">
-								<i class="fa fa-clock-o"></i> [[topic:scheduled]]
+								<i class="fa fa-clock-o"></i> {{tx("topic:scheduled")}}
 							</span>
 							<span component="topic/pinned" class="badge badge border border-gray-300 text-body {{{ if (scheduled || !pinned) }}}hidden{{{ end }}}">
-								<i class="fa fa-thumb-tack"></i> {{{ if !pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {isoTimeToLocaleString(./pinExpiryISO, config.userLang)}]]{{{ end }}}
+								<i class="fa fa-thumb-tack"></i> {{{ if !pinExpiry }}}{{tx("topic:pinned")}}{{{ else }}}{{tx("topic:pinned-with-expiry", isoTimeToLocaleString(./pinExpiryISO, config.userLang))}}{{{ end }}}
 							</span>
 							<span component="topic/locked" class="badge badge border border-gray-300 text-body {{{ if !locked }}}hidden{{{ end }}}">
-								<i class="fa fa-lock"></i> [[topic:locked]]
+								<i class="fa fa-lock"></i> {{tx("topic:locked")}}
 							</span>
 							<a component="topic/moved" href="{config.relative_path}/category/{oldCid}" class="badge badge border border-gray-300 text-body text-decoration-none {{{ if !oldCid }}}hidden{{{ end }}}">
-								<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
+								<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}{{tx("topic:moved-from", oldCategory.name)}}{{{ else }}}{{tx("topic:moved")}}{{{ end }}}
 							</a>
 							{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 						</span>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 537712551..584393f96 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -9,7 +9,7 @@
 		<div class="d-flex gap-1">
 			<!-- IMPORT partials/buttons/newTopic.tpl -->
 			<a href="{config.relative_path}/{selectedFilter.url}{querystring}" 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>
+				<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>{{tx("recent:load-new-posts")}}</div>
 			</a>
 		</div>
 
@@ -26,10 +26,10 @@
 	</div>
 
 	<div class="category">
-		<div id="category-no-topics" class="alert alert-warning {{{ if topics.length }}}hidden{{{ end }}}">[[unread:no-unread-topics]]</div>
+		<div id="category-no-topics" class="alert alert-warning {{{ if topics.length }}}hidden{{{ end }}}">{{tx("unread:no-unread-topics")}}</div>
 
 		<!-- IMPORT partials/topics_list.tpl -->
-		<button id="load-more-btn" class="btn btn-primary hide">[[unread:load-more]]</button>
+		<button id="load-more-btn" class="btn btn-primary hide">{{tx("unread:load-more")}}</button>
 		{{{ if config.usePagination }}}
 		<!-- IMPORT partials/paginator.tpl -->
 		{{{ end }}}
diff --git a/templates/users.tpl b/templates/users.tpl
index 1537b6847..58e0040d0 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -10,13 +10,13 @@
 
 		<div class="d-flex gap-2 align-items-center">
 			{{{ if showInviteButton }}}
-			<button component="user/invite" class="btn btn-sm btn-success text-nowrap"><i class="fa fa-users"></i> [[users:invite]]</button>
+			<button component="user/invite" class="btn btn-sm btn-success text-nowrap"><i class="fa fa-users"></i> {{tx("users:invite")}}</button>
 			{{{ end }}}
 
 			{{{ if displayUserSearch }}}
 			<div class="search">
 				<div class="input-group">
-					<input class="form-control form-control-sm" id="search-user" type="text" placeholder="[[global:search]]"/>
+					<input class="form-control form-control-sm" id="search-user" type="text" placeholder="{{tx("global:search")}}"/>
 					<button class="btn btn-sm btn-primary" type="button">
 						<i component="user/search/icon" class="fa fa-search"></i>
 					</button>
diff --git a/templates/world.tpl b/templates/world.tpl
index 91f62b007..6423182c7 100644
--- a/templates/world.tpl
+++ b/templates/world.tpl
@@ -14,11 +14,11 @@
 <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")}}
-		<h1 class="tracking-tight fs-2 fw-semibold mb-0 text-center">[[world:name]]</h1>
+		<h1 class="tracking-tight fs-2 fw-semibold mb-0 text-center">{{tx("world:name")}}</h1>
 	</div>
 	{{{ if ./descriptionParsed }}}
 	<p class="description text-secondary text-sm w-100 {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
-		{{./descriptionParsed}}
+		{{{ if (cid == "-1") }}}{{tx(./descriptionParsed)}}{{{ else }}}{{./descriptionParsed}}{{{ end }}}
 	</p>
 	{{{ end }}}
 </div>
@@ -31,7 +31,7 @@
 					<form class="mb-3" role="search" method="GET" action="{config.relative_path}/search">
 						<input type="hidden" name="in" value="categories" />
 						<div class="input-group bottom-sheet">
-							<input class="form-control form-control-lg" component="category-search" name="term" type="text" autocomplete="off" placeholder="[[world:category-search]]" />
+							<input class="form-control form-control-lg" component="category-search" name="term" type="text" autocomplete="off" placeholder="{{tx("world:category-search")}}" />
 							<button class="btn btn-outline-secondary dropdown-toggle d-md-none" type="button" data-bs-toggle="dropdown">
 								<i class="fa fa-fw fa-list"></i>
 							</button>
@@ -76,20 +76,20 @@
 								<span id="sort-label" class="visible-md-inline visible-lg-inline fw-semibold"></span>
 							</button>
 							<ul class="dropdown-menu" id="sort-options">
-								<li><a class="dropdown-item" href="{config.relative_path}/world">[[world:latest]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?local=1">[[world:latest-local]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?all=1">[[world:latest-all]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=day">[[world:popular-day]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=week">[[world:popular-week]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=month">[[world:popular-month]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=year">[[world:popular-year]]</a></li>
-								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=alltime">[[world:popular-alltime]]</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world">{{tx("world:latest")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?local=1">{{tx("world:latest-local")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?all=1">{{tx("world:latest-all")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=day">{{tx("world:popular-day")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=week">{{tx("world:popular-week")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=month">{{tx("world:popular-month")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=year">{{tx("world:popular-year")}}</a></li>
+								<li><a class="dropdown-item" href="{config.relative_path}/world?sort=popular&term=alltime">{{tx("world:popular-alltime")}}</a></li>
 							</ul>
 						</div>
 						{{{ end }}}
 						<a class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center fw-semibold" id="world-help" href="#">
 							<i class="fa fa-question text-primary"></i>
-							<span class="visible-md-inline visible-lg-inline">[[world:help]]</span>
+							<span class="visible-md-inline visible-lg-inline">{{tx("world:help")}}</span>
 						</a>
 						<!-- IMPORT partials/category/tools-dropdown-left.tpl -->
 					</div>
@@ -100,13 +100,13 @@
 					{{{ if !config.loggedIn }}}
 					<div class="alert alert-info alert-dismissible fade show">
 						<p class="fw-semibold">
-							[[world:onboard.title]]
+							{{tx("world:onboard.title")}}
 						</p>
-						<p>[[world:onboard.what]]</p>
-						<p>[[world:onboard.why]]</p>
-						<p>[[world:onboard.how]]</p>
-						<a href="{config.relative_path}/register" class="fw-semibold btn btn-sm btn-warning">[[global:register]]</a>
-						<a href="{config.relative_path}/login" class="fw-semibold btn btn-sm btn-info">[[global:login]]</a>
+						<p>{{tx("world:onboard.what")}}</p>
+						<p>{{tx("world:onboard.why")}}</p>
+						<p>{{tx("world:onboard.how")}}</p>
+						<a href="{config.relative_path}/register" class="fw-semibold btn btn-sm btn-warning">{{tx("global:register")}}</a>
+						<a href="{config.relative_path}/login" class="fw-semibold btn btn-sm btn-info">{{tx("global:login")}}</a>
 						<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
 					</div>
 					{{{ end }}}