diff --git a/src/views/admin/advanced/hooks.tpl b/src/views/admin/advanced/hooks.tpl
index c948c37e3b..b9b2493b88 100644
--- a/src/views/admin/advanced/hooks.tpl
+++ b/src/views/admin/advanced/hooks.tpl
@@ -1,5 +1,5 @@
 <div class="hooks-list panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-	<!-- BEGIN hooks -->
+	{{{ each hooks }}}
 	<div class="panel panel-default">
 		<div class="panel-heading" role="tab">
 		<div class="panel-title">
@@ -11,7 +11,7 @@
 		</div>
 		<div id="{hooks.index}" class="panel-collapse collapse" role="tabpanel">
 		<div class="panel-body clearfix">
-			<!-- BEGIN hooks.methods -->
+			{{{ each hooks.methods }}}
 			<div class="clearfix">
 				<strong>{hooks.methods.id}</strong>
 				Priority: {hooks.methods.priority}
@@ -23,9 +23,9 @@
 			<div class="collapse" id="{hooks.methods.index}">
 				<pre>{hooks.methods.method}</pre>
 			</div>
-			<!-- END hooks.methods -->
+			{{{ end }}}
 		</div>
 		</div>
 	</div>
-	<!-- END hooks -->
+	{{{ end }}}
 </div>
\ No newline at end of file
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl
index 9df8ac01d0..bd226cc39d 100644
--- a/src/views/admin/extend/rewards.tpl
+++ b/src/views/admin/extend/rewards.tpl
@@ -4,23 +4,23 @@
 			<div class="panel-heading">[[admin/extend/rewards:rewards]]</div>
 			<div class="panel-body">
 				<ul id="active">
-					<!-- BEGIN active -->
+					{{{ each active }}}
 					<li data-rid="{active.rid}" data-id="{active.id}">
 						<form class="main inline-block">
 							<div class="well inline-block">
 								<label for="condition">[[admin/extend/rewards:condition-if-users]]</label><br />
 								<select name="condition" data-selected="{active.condition}">
-									<!-- BEGIN conditions -->
+									{{{ each conditions }}}
 									<option value="{conditions.condition}">{conditions.name}</option>
-									<!-- END conditions -->
+									{{{ end }}}
 								</select>
 							</div>
 							<div class="well inline-block">
 								<label for="condition">[[admin/extend/rewards:condition-is]]</label><br />
 								<select name="conditional" data-selected="{active.conditional}">
-									<!-- BEGIN conditionals -->
+									{{{ each  conditionals }}}
 									<option value="{conditionals.conditional}">{conditionals.name}</option>
-									<!-- END conditionals -->
+									{{{ end }}}
 								</select>
 								<input type="text" name="value" value="{active.value}" />
 							</div>
@@ -58,7 +58,7 @@
 						</div>
 						<div class="clearfix"></div>
 					</li>
-					<!-- END active -->
+					{{{ end }}}
 				</ul>
 			</div>
 		</div>
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl
index 2331001c1c..25d03f9829 100644
--- a/src/views/admin/extend/widgets.tpl
+++ b/src/views/admin/extend/widgets.tpl
@@ -1,26 +1,26 @@
 <div id="widgets" class="row">
 	<div class="col-md-8" id="active-widgets">
 		<ul class="nav nav-pills">
-		<!-- BEGIN templates -->
+		{{{ each templates }}}
 			<li class="<!-- IF @first -->active<!-- ENDIF @first -->"><a href="#" data-template="{../template}" data-toggle="pill">{../template}</a></li>
-		<!-- END templates -->
+		{{{ end }}}
 		</ul>
 
 		<div class="row">
 			<div class="col-xs-12">
 				<div class="tab-content">
-				<!-- BEGIN templates -->
+				{{{ each templates }}}
 					<div class="tab-pane <!-- IF @first -->active<!-- ENDIF @first -->" data-template="{../template}">
-					<!-- BEGIN areas -->
+					{{{ each templates.areas }}}
 						<div class="area" data-template="{templates.template}" data-location="{../location}">
 							<h4>{../name} <small>{templates.template} / {../location}</small></h4>
 							<div class="well widget-area">
 
 							</div>
 						</div>
-					<!-- END areas -->
+					{{{ end }}}
 					</div>
-				<!-- END templates -->
+				{{{ end }}}
 				</div>
 			</div>
 		</div>
diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index 4db42dc6e4..9e0ac321c1 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -38,11 +38,11 @@
 
 	<br/>
 
-	<!-- BEGIN categories -->
+	{{{ each categories }}}
 	<div class="categories category-wrapper category-depth-{categories.depth}">
 	<h4><!-- IF categories.icon --><i class="fa {categories.icon}"></i> <!-- ENDIF categories.icon -->[[admin/manage/admins-mods:moderators-of-category, {categories.name}]]{{{if categories.disabled}}}<span class="badge badge-primary">[[admin/manage/admins-mods:disabled]]</span>{{{end}}}</h4>
 	<div class="moderator-area" data-cid="{categories.cid}">
-		<!-- BEGIN categories.moderators -->
+		{{{ each categories.moderators }}}
 			<div class="user-card pull-left" data-uid="{categories.moderators.uid}">
 				<!-- IF categories.moderators.picture -->
 				<img class="avatar avatar-sm" src="{categories.moderators.picture}" />
@@ -52,7 +52,7 @@
 				<a href="{config.relative_path}/user/{categories.moderators.userslug}">{categories.moderators.username}</a>
 				<i class="remove-user-icon fa fa-times" role="button"></i>
 			</div>
-		<!-- END categories.moderators -->
+		{{{ end }}}
 	</div>
 
 	<div data-cid="{categories.cid}" class="no-moderator-warning <!-- IF categories.moderators.length -->hidden<!-- ENDIF categories.moderators.length -->">[[admin/manage/admins-mods:no-moderators]]</div>
@@ -60,5 +60,5 @@
 	<input data-cid="{categories.cid}" class="form-control moderator-search" placeholder="[[admin/manage/admins-mods:add-moderator]]" />
 	</div>
 	<br/>
-	<!-- END categories -->
+	{{{ end }}}
 </div>
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index d82c40c3bc..d4effc8c5d 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -24,7 +24,7 @@
 						</tr>
 					</thead>
 					<tbody>
-						<!-- BEGIN users -->
+						{{{ each users }}}
 						<tr data-username="{users.usernameEscaped}">
 							<td>
 								<!-- IF users.usernameSpam -->
@@ -55,7 +55,7 @@
 								<!-- ENDIF users.spamChecked -->
 								<!-- ENDIF users.ipSpam -->
 								{users.ip}
-								<!-- BEGIN users.ipMatch -->
+								{{{ each users.ipMatch }}}
 								<br>
 								<!-- IF users.ipMatch.picture -->
 								<img src="{users.ipMatch.picture}" class="user-img"/>
@@ -63,29 +63,29 @@
 								<div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
 								<!-- ENDIF users.ipMatch.picture -->
 								<a href="{config.relative_path}/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
-								<!-- END users.ipMatch -->
+								{{{ end }}}
 							</td>
 							<td class="hidden-xs">
 								<span class="timeago" title="{users.timestampISO}"></span>
 							</td>
 
-							<!-- BEGIN users.customRows -->
+							{{{ each users.customRows }}}
 							<td class="hidden-xs">{users.customRows.value}</td>
-							<!-- END users.customRows -->
+							{{{ end }}}
 
 							<td>
 								<div class="btn-group pull-right">
 									<button class="btn btn-success btn-xs" data-action="accept"><i class="fa fa-check"></i></button>
 									<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-times"></i></button>
-									<!-- BEGIN users.customActions -->
+									{{{ each users.customActions }}}
 									<button id="{users.customActions.id}" title="{users.customActions.title}" class="btn btn-xs {users.customActions.class}">
 										<i class="fa {users.customActions.icon}"></i>
 									</button>
-									<!-- END users.customActions -->
+									{{{ end }}}
 								</div>
 							</td>
 						</tr>
-						<!-- END users -->
+						{{{ end }}}
 					</tbody>
 				</table>
 			</div>
@@ -110,8 +110,8 @@
 						</tr>
 					</thead>
 					<tbody>
-						<!-- BEGIN invites -->
-						<!-- BEGIN invites.invitations -->
+						{{{ each invites }}}
+						{{{ each invites.invitations }}}
 						<tr data-invitation-mail="{invites.invitations.email}"
 								data-invited-by="{invites.username}">
 							<td class ="invited-by"><!-- IF @first -->{invites.username}<!-- ENDIF @first --></td>
@@ -122,8 +122,8 @@
 								</div>
 							</td>
 						</tr>
-						<!-- END invites.invitations -->
-						<!-- END invites -->
+						{{{ end }}}
+						{{{ end }}}
 					</tbody>
 				</table>
 			</div>
diff --git a/src/views/admin/manage/uploads.tpl b/src/views/admin/manage/uploads.tpl
index 9751504b50..bec935d1af 100644
--- a/src/views/admin/manage/uploads.tpl
+++ b/src/views/admin/manage/uploads.tpl
@@ -30,9 +30,9 @@
 
 				<!-- IF showPids -->
 				<td class="col-md-3 text-right">
-					<!-- BEGIN ../inPids -->
-					<a target="_blank" href="{config.relative_path}/post/@value"><span class="label label-default">@value</span></a>
-					<!-- END -->
+					{{{ each ../inPids }}}
+					<a target="_blank" href="{config.relative_path}/post/{@value}"><span class="label label-default">{@value}</span></a>
+					{{{ end }}}
 					<!-- IF !../inPids.length -->
 					<span class="label label-danger">[[admin/manage/uploads:orphaned]]</span>
 					<!-- END -->
diff --git a/src/views/admin/partials/blacklist-validate.tpl b/src/views/admin/partials/blacklist-validate.tpl
index 36c747aa9c..3d4aba6225 100644
--- a/src/views/admin/partials/blacklist-validate.tpl
+++ b/src/views/admin/partials/blacklist-validate.tpl
@@ -8,7 +8,7 @@
 </p>
 <ul>
 	<!-- BEGIN invalid -->
-	<li><code>@value</code></li>
+	<li><code>{@value}</code></li>
 	<!-- END invalid -->
 </ul>
 <!-- ENDIF invalid.length -->
\ No newline at end of file
diff --git a/src/views/admin/partials/installed_plugin_item.tpl b/src/views/admin/partials/installed_plugin_item.tpl
index d0855aa8b3..c3465d6585 100644
--- a/src/views/admin/partials/installed_plugin_item.tpl
+++ b/src/views/admin/partials/installed_plugin_item.tpl
@@ -1,5 +1,5 @@
 					<!-- IF !../error -->
-					<li id="{../id}" data-plugin-index="@index" data-plugin-id="{../id}" data-version="{../version}" class="clearfix <!-- IF ../active -->active<!-- ENDIF ../active -->">
+					<li id="{../id}" data-plugin-index="{@index}" data-plugin-id="{../id}" data-version="{../version}" class="clearfix <!-- IF ../active -->active<!-- ENDIF ../active -->">
 						<div class="pull-right controls">
 							{{{ if ../installed }}}
 								<!-- IF ../isTheme -->
diff --git a/src/views/admin/partials/manage_user_groups.tpl b/src/views/admin/partials/manage_user_groups.tpl
index 6136f8c44c..a7599f9675 100644
--- a/src/views/admin/partials/manage_user_groups.tpl
+++ b/src/views/admin/partials/manage_user_groups.tpl
@@ -1,13 +1,13 @@
-<!-- BEGIN users -->
+{{{ each users }}}
 <div data-uid="{users.uid}">
     <h5>{users.username}</h5>
     <div class="group-area">
-        <!-- BEGIN users.groups -->
+        {{{ each users.groups }}}
         <div class="group-card pull-left" data-group-name="{users.groups.nameEscaped}">
             <a href="{config.relative_path}/admin/manage/groups/{users.groups.nameEncoded}"><span class="label label-default" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};"><!-- IF users.groups.icon --><i class="fa {users.groups.icon}"></i> <!-- ENDIF users.groups.icon -->{users.groups.displayName} <i class="remove-group-icon fa fa-times" role="button"></i></span></a>
         </div>
-        <!-- END users.groups -->
+        {{{ end }}}
     </div>
     <input data-uid="{users.uid}" class="form-control group-search" placeholder="[[admin/manage/users:add-group]]" />
 </div>
-<!-- END users -->
\ No newline at end of file
+{{{ end }}}
\ No newline at end of file
diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl
index 1d3c59d597..df1d2ce84d 100644
--- a/src/views/admin/settings/email.tpl
+++ b/src/views/admin/settings/email.tpl
@@ -54,9 +54,9 @@
 					<option value="nodebb-custom-smtp" style="font-weight: bold">[[admin/settings/email:smtp-transport.service-custom]]</option>
 					<option style="font-size: 10px" disabled>&nbsp;</option>
 
-					<!-- BEGIN services -->
-					<option value="@value">@value</option>
-					<!-- END services -->
+					{{{ each services }}}
+					<option value="{@value}">{@value}</option>
+					{{{ end }}}
 				</select>
 				<p class="help-block">
 					[[admin/settings/email:smtp-transport.service-help]]
diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl
index 47d4e609e1..a8694c310c 100644
--- a/src/views/admin/settings/navigation.tpl
+++ b/src/views/admin/settings/navigation.tpl
@@ -15,7 +15,7 @@
 		<hr/>
 
 		<ul id="enabled">
-			<!-- BEGIN enabled -->
+			{{{ each enabled }}}
 			<li data-index="{enabled.index}" class="well <!-- IF !enabled.selected -->hidden<!-- ENDIF !enabled.selected -->">
 				<form>
 					<div class="row">
@@ -76,9 +76,9 @@
 					<strong>[[admin/settings/navigation:groups]]</strong>
 					<div>
 						<select name="groups" class="form-control" size="10" multiple>
-							<!-- BEGIN enabled.groups -->
+							{{{ each enabled.groups }}}
 							<option value="{enabled.groups.displayName}"<!-- IF enabled.groups.selected --> selected<!-- ENDIF enabled.groups.selected -->>{enabled.groups.displayName}</option>
-							<!-- END enabled.groups -->
+							{{{ end }}}
 						</select>
 					</div>
 
@@ -98,7 +98,7 @@
 					<input type="hidden" name="enabled" value="{enabled.enabled}" />
 				</form>
 			</li>
-			<!-- END enabled -->
+			{{{ end }}}
 		</ul>
 	</div>
 
@@ -115,9 +115,9 @@
 							<strong>[[admin/settings/navigation:custom-route]]</strong>
 						</p>
 					</li>
-					<!-- BEGIN available -->
-					<li data-id="@index" class="clearfix">
-						<div data-id="@index" class="drag-item alert <!-- IF available.core -->alert-warning<!-- ELSE -->alert-info<!-- ENDIF available.core --> pull-left">
+					{{{ each available }}}
+					<li data-id="{@index}" class="clearfix">
+						<div data-id="{@index}" class="drag-item alert <!-- IF available.core -->alert-warning<!-- ELSE -->alert-info<!-- ENDIF available.core --> pull-left">
 							<i class="fa fa-fw <!-- IF available.iconClass -->{available.iconClass}<!-- ELSE -->fa-navicon<!-- ENDIF available.iconClass -->"></i>
 						</div>
 						<p>
@@ -125,7 +125,7 @@
 							<!-- IF available.core --> [[admin/settings/navigation:core]] <!-- ELSE --> [[admin/settings/navigation:plugin]] <!-- ENDIF available.core -->
 						</p>
 					</li>
-					<!-- END available -->
+					{{{ end }}}
 				</ul>
 			</div>
 		</div>