diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index 2f0364f..244ca29 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -38,7 +38,7 @@
 				<div class="panel-body">
 					<ul>
 						{{{each ips}}}
-						<li>@value</li>
+						<li>{@value}</li>
 						{{{end}}}
 					</ul>
 				</div>
diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index b45f590..80c1997 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -93,7 +93,7 @@
 					<div class="alert alert-success text-center">[[flags:no-notes]]</div>
 					<!-- ENDIF !notes.length -->
 					{{{each notes}}}
-					<div class="media" data-datetime="{../datetime}" data-index="@index">
+					<div class="media" data-datetime="{../datetime}" data-index="{@index}">
 						<div class="media-left">
 							<a href="{config.relative_path}/user/{../user.userslug}">{buildAvatar(notes.user, "md", false, "media-object")}</a>
 						</div>
@@ -175,7 +175,7 @@
 							<ul>
 								{{{each ./fields}}}
 								<li>
-									<span class="label label-primary">[[flags:@key]]</span><!-- IF @value --> &rarr; <span class="label label-default">@value</span><!-- ENDIF @value -->
+									<span class="label label-primary">[[flags:{@key}]]</span><!-- IF @value --> &rarr; <span class="label label-default">{@value}</span><!-- ENDIF @value -->
 								</li>
 								{{{end}}}
 								{{{ each ./meta }}}
diff --git a/templates/partials/breadcrumbs.tpl b/templates/partials/breadcrumbs.tpl
index 56d345b..6c7acd5 100644
--- a/templates/partials/breadcrumbs.tpl
+++ b/templates/partials/breadcrumbs.tpl
@@ -2,7 +2,7 @@
 <ol class="breadcrumb" itemscope="itemscope" itemprop="breadcrumb" itemtype="http://schema.org/BreadcrumbList">
 	{{{each breadcrumbs}}}
 	<li<!-- IF @last --> component="breadcrumb/current"<!-- ENDIF @last --> itemscope="itemscope" itemprop="itemListElement" itemtype="http://schema.org/ListItem" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
-		<meta itemprop="position" content="@index" />
+		<meta itemprop="position" content="{@index}" />
 		<!-- IF !@last --><a href="{breadcrumbs.url}" itemprop="item"><!-- ENDIF !@last -->
 			<span itemprop="name">
 				{breadcrumbs.text}
diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl
index 34056d8..cfd6cc8 100644
--- a/templates/partials/flags/filters.tpl
+++ b/templates/partials/flags/filters.tpl
@@ -65,7 +65,7 @@
 					<select class="form-control" id="filter-cid" name="cid" multiple="true">
 						<option value="">[[flags:filter-cid-all]]</option>
 						{{{each categories}}}
-						<option value="@key">@value</option>
+						<option value="{@key}">{@value}</option>
 						{{{end}}}
 					</select>
 				</div>
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index bdec28f..929d61e 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -33,7 +33,7 @@
 				<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !topics.pinned -->hide<!-- ENDIF !topics.pinned -->" title="[[topic:pinned]]"></i>
 				<i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->" title="[[topic:locked]]"></i>
 				<i component="topic/moved" class="fa fa-arrow-circle-right <!-- IF !topics.oldCid -->hide<!-- ENDIF !topics.oldCid -->" title="[[topic:moved]]"></i>
-				{{{each icons}}}@value{{{end}}}
+				{{{each icons}}}{@value}{{{end}}}
 
 				<!-- IF !topics.noAnchor -->
 				<a href="{config.relative_path}/topic/{topics.slug}<!-- IF topics.bookmark -->/{topics.bookmark}<!-- ENDIF topics.bookmark -->" itemprop="url">{topics.title}</a><br />
diff --git a/templates/registerComplete.tpl b/templates/registerComplete.tpl
index 9705075..eb4e98b 100644
--- a/templates/registerComplete.tpl
+++ b/templates/registerComplete.tpl
@@ -13,7 +13,7 @@
 			</p>
 			<ul>
 				{{{each errors}}}
-				<li>@value</li>
+				<li>{@value}</li>
 				{{{end}}}
 			</ul>
 		</div>
@@ -27,7 +27,7 @@
 		<div class="col-xs-12 col-sm-8 col-sm-offset-2">
 			<div class="panel panel-default">
 				<div class="panel-body">
-					@value
+					{@value}
 				</div>
 			</div>
 		</div>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 1c1230b..cce6cce 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -12,7 +12,7 @@
 						<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
 						<i component="topic/locked" class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
 						<i class="fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="{{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}"></i>
-						{{{each icons}}}@value{{{end}}}
+						{{{each icons}}}{@value}{{{end}}}
 					</span>
 					{title}
 				</span>