diff --git a/templates/account/blocks.tpl b/templates/account/blocks.tpl
index 43dbf48..3ec97a8 100644
--- a/templates/account/blocks.tpl
+++ b/templates/account/blocks.tpl
@@ -17,15 +17,13 @@
 						<label for="user-search">[[users:search]]</label>
 						<input class="form-control" type="text" id="user-search" placeholder="[[users:enter_username]]" />
 						<div class="block-edit">
-							<!-- IF edit -->
-							<!-- BEGIN edit -->
+							{{{ each edit }}}
 							<hr />
 							<button class="btn btn-sm btn-primary pull-right" data-uid="{../uid}" data-action="toggle">[[user:block_toggle]]</button>
 							<div class="pull-left">
 								<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "sm", true)} {../username}</a>
 							</div>
-							<!-- END -->
-							<!-- END -->
+							{{{ end }}}
 						</div>
 					</div>
 				</div>
diff --git a/templates/account/categories.tpl b/templates/account/categories.tpl
index 1e56434..8c91e63 100644
--- a/templates/account/categories.tpl
+++ b/templates/account/categories.tpl
@@ -6,9 +6,9 @@
 
 		<div class="col-lg-12">
 			<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
-				<!-- BEGIN categories -->
+				{{{each categories}}}
 				<!-- IMPORT partials/account/category-item.tpl -->
-				<!-- END categories -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 61218d4..262034b 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -26,9 +26,9 @@
 						<!-- IF canChangePassword -->
 						<a href="{config.relative_path}/user/{userslug}/edit/password" class="list-group-item">[[user:change_password]]</a>
 						<!-- ENDIF canChangePassword -->
-						<!-- BEGIN editButtons -->
+						{{{each editButtons}}}
 						<a href="{config.relative_path}{editButtons.link}" class="list-group-item">{editButtons.text}</a>
-						<!-- END editButtons -->
+						{{{end}}}
 					</ul>
 
 					<!-- IF config.requireEmailConfirmation -->
@@ -87,11 +87,11 @@
 
 								<select class="form-control" id="groupTitle" data-property="groupTitle" <!-- IF allowMultipleBadges --> multiple<!-- ENDIF allowMultipleBadges -->>
 									<option value="">[[user:no-group-title]]</option>
-									<!-- BEGIN groups -->
+									{{{each groups}}}
 									<!-- IF groups.userTitleEnabled -->
 									<option value="{groups.name}" <!-- IF groups.selected -->selected<!-- ENDIF groups.selected -->>{groups.userTitle}</option>
 									<!-- ENDIF groups.userTitleEnabled -->
-									<!-- END groups -->
+									{{{end}}}
 								</select>
 							</div>
 						</div>
@@ -132,7 +132,7 @@
 			<div class="col-md-5 col-sm-4">
 				<label class="control-label">[[user:sso.title]]</label>
 				<div class="list-group">
-					<!-- BEGIN sso -->
+					{{{each sso}}}
 					<div class="list-group-item">
 						<!-- IF ../deauthUrl -->
 						<a class="btn btn-default btn-xs pull-right" href="{../deauthUrl}">[[user:sso.dissociate]]</a>
@@ -143,7 +143,7 @@
 							{../name}
 						</a>
 					</div>
-					<!-- END sso -->
+					{{{end}}}
 				</div>
 			</div>
 			<!-- ENDIF sso.length -->
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index 0b1a9de..2f0364f 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -6,7 +6,7 @@
 		<div class="col-xs-12 col-md-12">
 			<h4>[[global:sessions]]</h4>
 			<ul class="list-group" component="user/sessions">
-				<!-- BEGIN sessions -->
+				{{{each sessions}}}
 				<li class="list-group-item" data-uuid="{../uuid}">
 					<div class="pull-right">
 						<!-- IF isSelfOrAdminOrGlobalModerator -->
@@ -23,7 +23,7 @@
 						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
 					</ul>
 				</li>
-				<!-- END sessions -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
@@ -37,9 +37,9 @@
 				</div>
 				<div class="panel-body">
 					<ul>
-						<!-- BEGIN ips -->
+						{{{each ips}}}
 						<li>@value</li>
-						<!-- END ips -->
+						{{{end}}}
 					</ul>
 				</div>
 			</div>
@@ -50,12 +50,12 @@
 				</div>
 				<div class="panel-body">
 					<ul class="list-group">
-						<!-- BEGIN usernames -->
+						{{{each usernames}}}
 						<li class="list-group-item">
 							{../value}
 							<small class="pull-right"><span class="timeago" title="{../timestampISO}"></span></small>
 						</li>
-						<!-- END usernames -->
+						{{{end}}}
 					</ul>
 				</div>
 			</div>
@@ -66,12 +66,12 @@
 				</div>
 				<div class="panel-body">
 					<ul class="list-group">
-						<!-- BEGIN emails -->
+						{{{each emails}}}
 						<li class="list-group-item">
 							{../value}
 							<small class="pull-right"><span class="timeago" title="{../timestampISO}"></span></small>
 						</li>
-						<!-- END emails -->
+						{{{end}}}
 					</ul>
 				</div>
 			</div>
@@ -84,14 +84,14 @@
 				<div class="panel-body">
 					<!-- IF history.flags.length -->
 					<ul class="recent-flags">
-						<!-- BEGIN history.flags -->
+						{{{each history.flags}}}
 						<li>
 							<p>
 								<a class="title" href="{config.relative_path}/post/{../pid}">{../title}</a><br />
 								<span class="timestamp">Flagged <span class="timeago" title="{../timestampISO}"></span> ({../timestampReadable})</span>
 							</p>
 						</li>
-						<!-- END history.flags -->
+						{{{end}}}
 					</ul>
 					<!-- ELSE -->
 					<div class="alert alert-success">[[user:info.no-flags]]</div>
@@ -119,7 +119,7 @@
 				<div class="panel-body">
 					<!-- IF history.bans.length -->
 					<ul class="ban-history">
-						<!-- BEGIN history.bans -->
+						{{{each history.bans}}}
 						<li>
 							<p>
 								<a href="{config.relative_path}/user/{history.bans.user.userslug}">{buildAvatar(history.bans.user, "sm", true)}</a>
@@ -135,7 +135,7 @@
 								<span class="reason"><strong>[[user:info.banned-reason-label]]</strong>: {../reason}</span>
 							</p>
 						</li>
-						<!-- END history.bans -->
+						{{{end}}}
 					</ul>
 					<!-- ELSE -->
 					<div class="alert alert-success">[[user:info.no-ban-history]]</div>
@@ -153,7 +153,7 @@
 					<button class="btn btn-sm pull-right btn-success" component="account/save-moderation-note">[[user:info.moderation-note.add]]</button>
 					<br/>
 					<div component="account/moderation-note/list">
-						<!-- BEGIN moderationNotes -->
+						{{{each moderationNotes}}}
 						<hr/>
 
 						<div class="clearfix">
@@ -173,7 +173,7 @@
 								</div>
 							</div>
 						</div>
-						<!-- END moderationNotes -->
+						{{{end}}}
 					</div>
 					<!-- IMPORT partials/paginator.tpl -->
 				</div>
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 477f442..3233df2 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -18,11 +18,11 @@
 
 		<!-- IF selectedGroup.length -->
 		<div class="text-center">
-		<!-- BEGIN selectedGroup -->
+		{{{each selectedGroup}}}
 		<!-- IF selectedGroup.slug -->
 			<a href="{config.relative_path}/groups/{selectedGroup.slug}"><small class="label group-label inline-block" style="background-color: {selectedGroup.labelColor};"><!-- IF selectedGroup.icon --><i class="fa {selectedGroup.icon}"></i> <!-- ENDIF selectedGroup.icon -->{selectedGroup.userTitle}</small></a>
 		<!-- ENDIF selectedGroup.slug -->
-		<!-- END selectedGroup -->
+		{{{end}}}
 		</div>
 		<br/>
 		<!-- ENDIF selectedGroup.length -->
@@ -113,9 +113,9 @@
 	<!-- IF groups.length -->
 	<div class="row">
 		<div class="col-xs-12 hidden">
-			<!-- BEGIN groups -->
+			{{{each groups}}}
 			<a href="{config.relative_path}/groups/{groups.slug}"><span class="label group-label inline-block" style="background-color: {groups.labelColor};"><!-- IF groups.icon --><i class="fa {groups.icon}"></i> <!-- ENDIF groups.icon -->{groups.userTitle}</span></a>
-			<!-- END groups -->
+			{{{end}}}
 		</div>
 	</div>
 	<!-- ENDIF groups.length -->
@@ -127,9 +127,9 @@
 				<h3 class="panel-title">[[global:recentips]]</h3>
 			</div>
 			<div class="panel-body">
-			<!-- BEGIN ips -->
+			{{{each ips}}}
 				<div>{ips}</div>
-			<!-- END ips -->
+			{{{end}}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/account/sessions.tpl b/templates/account/sessions.tpl
index 33ac3b9..4f250e8 100644
--- a/templates/account/sessions.tpl
+++ b/templates/account/sessions.tpl
@@ -7,7 +7,7 @@
 			<p class="lead">[[user:sessions.description]]</p>
 			<hr />
 			<ul class="list-group" component="user/sessions">
-				<!-- BEGIN sessions -->
+				{{{each sessions}}}
 				<li class="list-group-item" data-uuid="{../uuid}">
 					<div class="pull-right">
 						<!-- IF isSelfOrAdminOrGlobalModerator -->
@@ -24,7 +24,7 @@
 						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
 					</ul>
 				</li>
-				<!-- END sessions -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 9aa2dfa..82f38dd 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -7,9 +7,9 @@
 			<h4>[[user:select-skin]]</h4>
 			<div class="well">
 				<select class="form-control" id="bootswatchSkin" data-property="bootswatchSkin">
-					<!-- BEGIN bootswatchSkinOptions -->
+					{{{each bootswatchSkinOptions}}}
 					<option value="{bootswatchSkinOptions.value}" <!-- IF bootswatchSkinOptions.selected -->selected<!-- ENDIF bootswatchSkinOptions.selected -->>{bootswatchSkinOptions.name}</option>
-					<!-- END bootswatchSkinOptions -->
+					{{{end}}}
 				</select>
 			</div>
 			<!-- ENDIF !disableCustomUserSkins -->
@@ -21,9 +21,9 @@
 					<label for="dailyDigestFreq">[[user:homepage]]</label>
 					<select class="form-control" data-property="homePageRoute">
 						<option value="none">None</option>
-						<!-- BEGIN homePageRoutes -->
+						{{{each homePageRoutes}}}
 						<option value="{homePageRoutes.route}" <!-- IF homePageRoutes.selected -->selected="1"<!-- ENDIF homePageRoutes.selected -->>{homePageRoutes.name}</option>
-						<!-- END homePageRoutes -->
+						{{{end}}}
 					</select>
 					<p class="help-block">[[user:homepage_description]]</p>
 				</div>
@@ -101,21 +101,21 @@
 				<div class="form-group">
 					<label for="dailyDigestFreq">[[user:digest_label]]</label>
 					<select class="form-control" id="dailyDigestFreq" data-property="dailyDigestFreq" autocomplete="off">
-						<!-- BEGIN dailyDigestFreqOptions -->
+						{{{each dailyDigestFreqOptions}}}
 						<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected="1"<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
-						<!-- END dailyDigestFreqOptions -->
+						{{{end}}}
 					</select>
 					<p class="help-block">[[user:digest_description]]</p>
 				</div>
 			</div>
 			<!-- ENDIF !disableEmailSubscriptions -->
 
-			<!-- BEGIN customSettings -->
+			{{{each customSettings}}}
 			<h4>{customSettings.title}</h4>
 			<div class="well">
 				{customSettings.content}
 			</div>
-			<!-- END customSettings -->
+			{{{end}}}
 
 		</div>
 
@@ -125,9 +125,9 @@
 				<div class="row">
 					<div class="form-group col-lg-12">
 						<select data-property="userLang" class="form-control">
-							<!-- BEGIN languages -->
+							{{{each languages}}}
 							<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
-							<!-- END languages -->
+							{{{end}}}
 						</select>
 					</div>
 				</div>
@@ -137,9 +137,9 @@
 				<div class="row">
 					<div class="form-group col-lg-12">
 						<select data-property="acpLang" class="form-control">
-							<!-- BEGIN acpLanguages -->
+							{{{each acpLanguages}}}
 							<option value="{acpLanguages.code}" <!-- IF acpLanguages.selected -->selected<!-- ENDIF acpLanguages.selected -->>{acpLanguages.name} ({acpLanguages.code})</option>
-							<!-- END acpLanguages -->
+							{{{end}}}
 						</select>
 					</div>
 				</div>
@@ -173,7 +173,7 @@
 			<h4>[[user:notifications_and_sounds]]</h4>
 			<div class="well">
 
-				<!-- BEGIN notificationSettings -->
+				{{{each notificationSettings}}}
 				<div class="row">
 					<div class="form-group col-xs-7">
 						<label>{notificationSettings.label}</label>
@@ -187,17 +187,17 @@
 						</select>
 					</div>
 				</div>
-				<!-- END notificationSettings -->
+				{{{end}}}
 
 				<label for="upvote-notif-freq">[[user:upvote-notif-freq]]</label>
 				<div class="row">
 					<div class="form-group col-xs-9">
 						<select class="form-control" id="upvote-notif-freq" name="upvote-notif-freq" data-property="upvoteNotifFreq">
-							<!-- BEGIN upvoteNotifFreq -->
+							{{{each upvoteNotifFreq}}}
 							<option value="{upvoteNotifFreq.name}" <!-- IF upvoteNotifFreq.selected -->selected<!-- ENDIF upvoteNotifFreq.selected -->>
 								[[user:upvote-notif-freq.{upvoteNotifFreq.name}]]
 							</option>
-							<!-- END upvoteNotifFreq -->
+							{{{end}}}
 						</select>
 					</div>
 				</div>
@@ -207,9 +207,9 @@
 					<div class="form-group col-xs-9">
 						<select class="form-control" id="notification" name="notification" data-property="notificationSound">
 							<option value="">[[user:no-sound]]</option>
-							<!-- BEGIN notificationSound -->
+							{{{each notificationSound}}}
 							<option value="{notificationSound.name}" <!-- IF notificationSound.selected -->selected<!-- ENDIF notificationSound.selected -->>{notificationSound.name}</option>
-							<!-- END notificationSound -->
+							{{{end}}}
 						</select>
 					</div>
 					<div class="btn-group col-xs-3">
@@ -223,9 +223,9 @@
 					<div class="form-group col-xs-9">
 						<select class="form-control" id="chat-incoming" name="chat-incoming" data-property="incomingChatSound">
 							<option value="">[[user:no-sound]]</option>
-							<!-- BEGIN incomingChatSound -->
+							{{{each incomingChatSound}}}
 							<option value="{incomingChatSound.name}" <!-- IF incomingChatSound.selected -->selected<!-- ENDIF incomingChatSound.selected -->>{incomingChatSound.name}</option>
-							<!-- END incomingChatSound -->
+							{{{end}}}
 						</select>
 					</div>
 					<div class="btn-group col-xs-3">
@@ -238,9 +238,9 @@
 					<div class="form-group col-xs-9">
 						<select class="form-control" id="chat-outgoing" name="chat-outgoing" data-property="outgoingChatSound">
 							<option value="">[[user:no-sound]]</option>
-							<!-- BEGIN outgoingChatSound -->
+							{{{each outgoingChatSound}}}
 							<option value="{outgoingChatSound.name}" <!-- IF outgoingChatSound.selected -->selected<!-- ENDIF outgoingChatSound.selected -->>{outgoingChatSound.name}</option>
-							<!-- END outgoingChatSound -->
+							{{{end}}}
 						</select>
 					</div>
 					<div class="btn-group col-xs-3">
diff --git a/templates/account/uploads.tpl b/templates/account/uploads.tpl
index 414edff..46d5317 100644
--- a/templates/account/uploads.tpl
+++ b/templates/account/uploads.tpl
@@ -22,7 +22,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <!-- BEGIN uploads -->
+                    {{{each uploads}}}
                     <tr data-name="{uploads.name}">
                         <td>
                             <a href="{config.relative_path}{uploads.url}">{uploads.url}</a>
@@ -33,7 +33,7 @@
                             </div>
                         </td>
                     </tr>
-                    <!-- END uploads -->
+                    {{{end}}}
                 </tbody>
             </table>
 
diff --git a/templates/categories.tpl b/templates/categories.tpl
index 7da0123..e8e26ea 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -1,26 +1,26 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="row">
 	<div class="<!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 		<h1 class="categories-title">[[pages:categories]]</h1>
 		<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
-			<!-- BEGIN categories -->
+			{{{each categories}}}
 			<!-- IMPORT partials/categories/item.tpl -->
-			<!-- END categories -->
+			{{{end}}}
 		</ul>
 	</div>
 	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
-		<!-- BEGIN widgets.sidebar -->
+		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
-		<!-- END widgets.sidebar -->
+		{{{end}}}
 	</div>
 </div>
 <div widget-area="footer">
-	<!-- BEGIN widgets.footer -->
+	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
-	<!-- END widgets.footer -->
+	{{{end}}}
 </div>
diff --git a/templates/category.tpl b/templates/category.tpl
index 42cb946..0f6370f 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="row">
 	<div class="category <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
@@ -50,15 +50,15 @@
 		<!-- ENDIF config.usePagination -->
 	</div>
 	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
-		<!-- BEGIN widgets.sidebar -->
+		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
-		<!-- END widgets.sidebar -->
+		{{{end}}}
 	</div>
 </div>
 <div widget-area="footer">
-	<!-- BEGIN widgets.footer -->
+	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
-	<!-- END widgets.footer -->
+	{{{end}}}
 </div>
 
 <!-- IF !config.usePagination -->
diff --git a/templates/chat.tpl b/templates/chat.tpl
index e5632f9..f7bf47a 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -11,11 +11,11 @@
 					<ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
 						<!-- IF users.length -->
 						<li class="dropdown-header">[[modules:chat.in-room]]</li>
-						<!-- BEGIN users -->
+						{{{each users}}}
 						<li>
 							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
 						</li>
-						<!-- END -->
+						{{{end}}}
 						<li role="separator" class="divider"></li>
 						<!-- END -->
 						<li class="dropdown-header">[[modules:chat.options]]</li>
diff --git a/templates/chats.tpl b/templates/chats.tpl
index e67b778..01906cf 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -5,9 +5,9 @@
 			<ul component="chat/search/list" class="dropdown-menu"></ul>
 		</div>
 		<ul component="chat/recent" class="chats-list" data-nextstart="{nextStart}">
-			<!-- BEGIN rooms -->
+			{{{each rooms}}}
 			<!-- IMPORT partials/chats/recent_room.tpl -->
-			<!-- END rooms -->
+			{{{end}}}
 		</ul>
 	</div>
 	<div component="chat/main-wrapper">
diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index 88a6500..5044a52 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -81,9 +81,9 @@
 						<label for="assignee">[[flags:assignee]]</label>
 						<select class="form-control" id="assignee" name="assignee" disabled>
 							<option value="">[[flags:no-assignee]]</option>
-							<!-- BEGIN assignees -->
+							{{{each assignees}}}
 							<option value="{../uid}">{../username}</option>
-							<!-- END assignees -->
+							{{{end}}}
 						</select>
 					</div>
 					<button type="button" class="btn btn-block btn-primary" data-action="update">[[flags:update]]</button>
@@ -103,7 +103,7 @@
 					<!-- IF !notes.length -->
 					<div class="alert alert-success text-center">[[flags:no-notes]]</div>
 					<!-- ENDIF !notes.length -->
-					<!-- BEGIN notes -->
+					{{{each notes}}}
 					<div class="media">
 						<div class="media-left">
 							<a href="{config.relative_path}/user/{../user.userslug}">{buildAvatar(notes.user, "md", false, "media-object")}</a>
@@ -116,7 +116,7 @@
 							{../content}
 						</div>
 					</div>
-					<!-- END notes -->
+					{{{end}}}
 				</div>
 			</div>
 			<div class="col-sm-6 col-md-4">
@@ -146,7 +146,7 @@
 					<!-- IF !history.length -->
 					<div class="alert alert-success text-center">[[flags:no-history]]</div>
 					<!-- ENDIF !history.length -->
-					<!-- BEGIN history -->
+					{{{each history}}}
 					<div class="media">
 						<div class="media-left">
 							<a href="{config.relative_path}/user/{../user.userslug}">{buildAvatar(history.user, "md", false, "media-object")}</a>
@@ -157,15 +157,15 @@
 								<small><span class="timeago" title="{../datetimeISO}"></span></small>
 							</h4>
 							<ul>
-								<!-- BEGIN fields -->
+								{{{each fields}}}
 								<li>
 									<span class="label label-primary">[[flags:@key]]</span><!-- IF @value --> &rarr; <span class="label label-default">@value</span><!-- ENDIF @value -->
 								</li>
-								<!-- END fields -->
+								{{{end}}}
 							</ul>
 						</div>
 					</div>
-					<!-- END history -->
+					{{{end}}}
 				</div>
 			</div>
 		</div>
diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl
index 2cc7338..6730c1c 100644
--- a/templates/flags/list.tpl
+++ b/templates/flags/list.tpl
@@ -42,7 +42,7 @@
 					</td>
 				</tr>
 				<!-- ENDIF !flags.length -->
-				<!-- BEGIN flags -->
+				{{{each flags}}}
 				<tr data-flag-id="{../flagId}">
 					<td><span class="label label-{../labelClass}">[[flags:state-{../state}]]</span></td>
 					<td>
@@ -56,7 +56,7 @@
 					</td>
 					<td><span class="timeago" title="{../datetimeISO}"></span></td>
 				</tr>
-				<!-- END flags -->
+				{{{end}}}
 			</tbody>
 		</table>
 
diff --git a/templates/footer.tpl b/templates/footer.tpl
index c9585cc..1630523 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -20,9 +20,9 @@
 
 	<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
 
-	<!-- BEGIN scripts -->
+	{{{each scripts}}}
 	<script defer type="text/javascript" src="{scripts.src}"></script>
-	<!-- END scripts -->
+	{{{end}}}
 
 	<script>
 		window.addEventListener('load', function () {
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 85ee201..55f9569 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -70,7 +70,7 @@
 					<!-- IF !group.pending.length -->
 					<div class="alert alert-info">[[groups:pending.none]]</div>
 					<!-- ENDIF !group.pending.length -->
-					<!-- BEGIN group.pending -->
+					{{{each group.pending}}}
 					<tr data-uid="{group.pending.uid}">
 						<td>
 							<a href="{config.relative_path}/user/{group.pending.userslug}">{buildAvatar(group.pending, "sm", true)}</a>
@@ -90,7 +90,7 @@
 							</div>
 						</td>
 					</tr>
-					<!-- END group.pending -->
+					{{{end}}}
 				</table>
 			</div>
 		</div>
@@ -118,7 +118,7 @@
 					<!-- IF !group.invited.length -->
 					<div class="alert alert-info">[[groups:invited.none]]</div>
 					<!-- ENDIF !group.invited.length -->
-					<!-- BEGIN group.invited -->
+					{{{each group.invited}}}
 					<tr data-uid="{group.invited.uid}">
 						<td>
 							<a href="{config.relative_path}/user/{group.invited.userslug}">{buildAvatar(group.invited, "sm", true)}</a>
@@ -137,7 +137,7 @@
 							</div>
 						</td>
 					</tr>
-					<!-- END group.invited -->
+					{{{end}}}
 				</table>
 			</div>
 		</div>
@@ -228,9 +228,9 @@
 		</div>
 		<!-- ENDIF group.isOwner -->
 		<div widget-area="left">
-			<!-- BEGIN widgets.left -->
+			{{{each widgets.left}}}
 			{{widgets.left.html}}
-			<!-- END widgets.left -->
+			{{{end}}}
 		</div>
 	</div>
 	<div class="col-lg-8 col-xs-12">
@@ -241,9 +241,9 @@
 			<!-- IMPORT partials/posts_list.tpl -->
 		</div>
 		<div widget-area="right">
-			<!-- BEGIN widgets.right -->
+			{{{each widgets.right}}}
 			{{widgets.right.html}}
-			<!-- END widgets.right -->
+			{{{end}}}
 		</div>
 	</div>
 </div>
diff --git a/templates/groups/list.tpl b/templates/groups/list.tpl
index 99372b1..9c2f26a 100644
--- a/templates/groups/list.tpl
+++ b/templates/groups/list.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="groups list">
 	<div class="row">
diff --git a/templates/header.tpl b/templates/header.tpl
index 7f3372e..660894b 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -2,9 +2,9 @@
 <html lang="{function.localeToHTML, userLang, defaultLang}" <!-- IF languageDirection -->data-dir="{languageDirection}" style="direction: {languageDirection};" <!-- ENDIF languageDirection --> >
 <head>
 	<title>{browserTitle}</title>
-	<!-- BEGIN metaTags -->{function.buildMetaTag}<!-- END metaTags -->
+	{{{each metaTags}}}{function.buildMetaTag}{{{end}}}
 	<link rel="stylesheet" type="text/css" href="{relative_path}/assets/client<!-- IF bootswatchSkin -->-{bootswatchSkin}<!-- END -->.css?{config.cache-buster}" />
-	<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->
+	{{{each linkTags}}}{function.buildLinkTag}{{{end}}}
 
 	<script>
 		var RELATIVE_PATH = "{relative_path}";
diff --git a/templates/login.tpl b/templates/login.tpl
index 3793d42..e3bd734 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -56,9 +56,9 @@
 		<div class="alt-login-block">
 			<h4>[[login:alternative_logins]]</h4>
 			<ul class="alt-logins">
-				<!-- BEGIN authentication -->
+				{{{each authentication}}}
 				<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></a></li>
-				<!-- END authentication -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/notifications.tpl b/templates/notifications.tpl
index d0e78c7..4caecdd 100644
--- a/templates/notifications.tpl
+++ b/templates/notifications.tpl
@@ -19,7 +19,7 @@
 				<!-- IF selectedFilter -->{selectedFilter.name}<!-- ENDIF selectedFilter --> <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN filters -->
+				{{{each filters}}}
 				<!-- IF filters.separator -->
 				<li role="separator" class="divider"></li>
 				<!-- ELSE -->
@@ -27,7 +27,7 @@
 					<a role="menu-item" href="{config.relative_path}/notifications?filter={filters.filter}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i> {filters.name}</a>
 				</li>
 				<!-- ENDIF filters.separator -->
-				<!-- END filters -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
@@ -39,7 +39,7 @@
 	</div>
 
 	<ul class="notifications-list" data-nextstart="{nextStart}">
-	<!-- BEGIN notifications -->
+	{{{each notifications}}}
 		<li data-nid="{notifications.nid}" class="{notifications.readClass}" component="notifications/item">
 			<!-- IF notifications.image -->
 			<!-- IF notifications.from -->
@@ -56,7 +56,7 @@
 				<span class="timeago" title="{notifications.datetimeISO}"></span>
 			</p>
 		</li>
-	<!-- END notifications -->
+	{{{end}}}
 	</ul>
 	<!-- IMPORT partials/paginator.tpl -->
 </div>
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index 5d6ec09..8275475 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -76,11 +76,11 @@
 		<li><a href="{config.relative_path}/user/{userslug}/uploads">[[global:uploads]]</a></li>
 		<!-- ENDIF showHidden -->
 
-		<!-- BEGIN profile_links -->
+		{{{each profile_links}}}
 		<!-- IF @first -->
 		<li class="divider"></li>
 		<!-- ENDIF @first -->
 		<li id="{profile_links.id}" class="plugin-link <!-- IF profile_links.public -->public<!-- ELSE -->private<!-- ENDIF profile_links.public -->"><a href="{config.relative_path}/user/{userslug}/{profile_links.route}"><!-- IF ../icon --><i class="fa fa-fw {profile_links.icon}"></i> <!-- END -->{profile_links.name}</a></li>
-		<!-- END profile_links -->
+		{{{end}}}
 	</ul>
 </div>
diff --git a/templates/partials/breadcrumbs.tpl b/templates/partials/breadcrumbs.tpl
index 8ad352c..be23c5f 100644
--- a/templates/partials/breadcrumbs.tpl
+++ b/templates/partials/breadcrumbs.tpl
@@ -1,6 +1,6 @@
 <!-- IF breadcrumbs.length -->
 <ol class="breadcrumb">
-	<!-- BEGIN breadcrumbs -->
+	{{{each breadcrumbs}}}
 	<li<!-- IF @last --> component="breadcrumb/current"<!-- ENDIF @last --> itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
 		<!-- IF !@last --><a href="{breadcrumbs.url}" itemprop="url"><!-- ENDIF !@last -->
 			<span itemprop="title">
@@ -12,6 +12,6 @@
 			</span>
 		<!-- IF !@last --></a><!-- ENDIF !@last -->
 	</li>
-	<!-- END breadcrumbs -->
+	{{{end}}}
 </ol>
 <!-- ENDIF breadcrumbs.length -->
\ No newline at end of file
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index 764e63f..0072201 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -1,5 +1,5 @@
 <div class="card" style="border-color: {../bgColor}">
-	<!-- BEGIN posts -->
+	{{{each ./posts}}}
 	<!-- IF @first -->
 	<div component="category/posts">
 		<p>
@@ -13,7 +13,7 @@
 		</div>
 	</div>
 	<!-- ENDIF @first -->
-	<!-- END posts -->
+	{{{end}}}
 
 	<!-- IF !../posts.length -->
 	<div component="category/posts">
diff --git a/templates/partials/category-filter.tpl b/templates/partials/category-filter.tpl
index 096d9f5..ef541d8 100644
--- a/templates/partials/category-filter.tpl
+++ b/templates/partials/category-filter.tpl
@@ -10,10 +10,10 @@
         <li role="presentation" class="category">
             <a role="menu-item" href="{config.relative_path}/{allCategoriesUrl}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
         </li>
-        <!-- BEGIN categories -->
+        {{{each categories}}}
         <li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}" data-name="{categories.name}">
             <a role="menu-item" href="#"><i component="category/select/icon" class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
         </li>
-        <!-- END categories -->
+        {{{end}}}
     </ul>
 </div>
\ No newline at end of file
diff --git a/templates/partials/category-selector.tpl b/templates/partials/category-selector.tpl
index ba95ca9..aa41af6 100644
--- a/templates/partials/category-selector.tpl
+++ b/templates/partials/category-selector.tpl
@@ -10,10 +10,10 @@
 		<li component="category/no-matches" role="presentation" class="category hidden">
 			<a role="menu-item">[[search:no-matches]]</a>
 		</li>
-		<!-- BEGIN categories -->
+		{{{each categories}}}
 		<li role="presentation" class="category <!-- IF categories.disabledClass -->disabled<!-- ENDIF categories.disabledClass -->" data-cid="{categories.cid}" data-name="{categories.name}" data-parent-cid="{categories.parentCid}">
 			<a role="menu-item">{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i style="color: {categories.color};" class="fa fa-stack-1x fa-fw {categories.icon}"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
 		</li>
-		<!-- END categories -->
+		{{{end}}}
 	</ul>
 </div>
\ No newline at end of file
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 6dcbb4b..01cec9e 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -2,8 +2,8 @@
 	<!-- IF children.length --><p>[[category:subcategories]]</p><!-- ENDIF children.length -->
 
 	<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
-		<!-- BEGIN children -->
+		{{{each children}}}
 		<!-- IMPORT partials/categories/item.tpl -->
-		<!-- END children -->
+		{{{end}}}
 	</ul>
 </div>
\ No newline at end of file
diff --git a/templates/partials/category/tags.tpl b/templates/partials/category/tags.tpl
index f1e153f..32db360 100644
--- a/templates/partials/category/tags.tpl
+++ b/templates/partials/category/tags.tpl
@@ -1,5 +1,5 @@
 <!-- IF topics.tags.length -->
-	<!-- BEGIN tags -->
+	{{{each tags}}}
 		<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag-item" data-tag="{topics.tags.value}" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.value}</span><span class="tag-topic-count human-readable-number" title="{topics.tags.score}">{topics.tags.score}</span></a>
-	<!-- END tags -->
+	{{{end}}}
 <!-- ENDIF topics.tags.length -->
\ No newline at end of file
diff --git a/templates/partials/category/tools.tpl b/templates/partials/category/tools.tpl
index 7052f22..3b32b95 100644
--- a/templates/partials/category/tools.tpl
+++ b/templates/partials/category/tools.tpl
@@ -69,11 +69,11 @@
 			</a>
 		</li>
 
-		<!-- BEGIN thread_tools -->
+		{{{each thread_tools}}}
 		<li>
 			<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
 		</li>
-		<!-- END thread_tools -->
+		{{{end}}}
 	</ul>
 </div>
 <!-- ENDIF privileges.editable -->
\ No newline at end of file
diff --git a/templates/partials/chats/dropdown.tpl b/templates/partials/chats/dropdown.tpl
index 01e2e47..184ef7f 100644
--- a/templates/partials/chats/dropdown.tpl
+++ b/templates/partials/chats/dropdown.tpl
@@ -1,5 +1,5 @@
 <!-- IF rooms.length -->
-<!-- BEGIN rooms -->
+{{{each rooms}}}
 <li class="<!-- IF ../unread -->unread<!-- ENDIF ../unread -->" data-roomid="{rooms.roomId}">
 	<strong class="room-name">
 		<!-- IF !rooms.lastUser.uid -->
@@ -9,26 +9,26 @@
 		<!-- ENDIF !rooms.lastUser.uid -->
 	</strong>
 	<div class="avatar-placeholder"></div>
-	<!-- BEGIN rooms.users -->
+	{{{each rooms.users}}}
 	<!-- IF @first -->
 	<div class="main-avatar">
 		<!-- IMPORT partials/chats/user.tpl -->
 	</div>
 	<!-- ENDIF @first -->
-	<!-- END rooms.users -->
+	{{{end}}}
 
 	<ul class="members">
-		<!-- BEGIN rooms.users -->
+		{{{each rooms.users}}}
 		<li>
 			<!-- IMPORT partials/chats/user.tpl -->
 		</li>
-		<!-- END rooms.users -->
+		{{{end}}}
 	</ul>
 
 	<span class="teaser-content">{rooms.teaser.content}</span>
 	<span class="teaser-timestamp timeago pull-right" title="{rooms.teaser.timestampISO}"></span>
 </li>
-<!-- END rooms -->
+{{{end}}}
 <!-- ELSE -->
 <li class="no_active"><a href="#">[[modules:chat.no_active]]</a></li>
 <!-- ENDIF rooms.length -->
\ No newline at end of file
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
index e0c8043..66b4134 100644
--- a/templates/partials/chats/message-window.tpl
+++ b/templates/partials/chats/message-window.tpl
@@ -9,11 +9,11 @@
 			<ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
 				<!-- IF users.length -->
 				<li class="dropdown-header">[[modules:chat.in-room]]</li>
-				<!-- BEGIN users -->
+				{{{each users}}}
 				<li>
 					<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
 				</li>
-				<!-- END -->
+				{{{end}}}
 				<li role="separator" class="divider"></li>
 				<!-- END -->
 				<li class="dropdown-header">[[modules:chat.options]]</li>
@@ -30,9 +30,9 @@
 		</div>
 		<span class="members">
 			[[modules:chat.chatting_with]]:
-			<!-- BEGIN users -->
+			{{{each users}}}
 			<a href="{config.relative_path}/uid/{../uid}">{../username}</a><!-- IF !@last -->,<!-- END -->
-			<!-- END -->
+			{{{end}}}
 		</span>
 	</div>
 	<ul class="chat-content">
diff --git a/templates/partials/chats/messages.tpl b/templates/partials/chats/messages.tpl
index e49fa75..74e9449 100644
--- a/templates/partials/chats/messages.tpl
+++ b/templates/partials/chats/messages.tpl
@@ -1,3 +1,3 @@
-<!-- BEGIN messages -->
+{{{each messages}}}
 <!-- IMPORT partials/chats/message.tpl -->
-<!-- END messages -->
\ No newline at end of file
+{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/chats/recent_room.tpl b/templates/partials/chats/recent_room.tpl
index 9fb6e69..52b31ed 100644
--- a/templates/partials/chats/recent_room.tpl
+++ b/templates/partials/chats/recent_room.tpl
@@ -7,19 +7,19 @@
 		<!-- ENDIF !rooms.lastUser.uid -->
 	</strong>
 	<div class="avatar-placeholder"></div>
-	<!-- BEGIN rooms.users -->
+	{{{each rooms.users}}}
 	<!-- IF @first -->
 	<div class="main-avatar">
 		<!-- IMPORT partials/chats/user.tpl -->
 	</div>
 	<!-- ENDIF @first -->
-	<!-- END rooms.users -->
+	{{{end}}}
 
 	<ul class="members">
-		<!-- BEGIN rooms.users -->
+		{{{each rooms.users}}}
 		<li>
 			<!-- IMPORT partials/chats/user.tpl -->
 		</li>
-		<!-- END rooms.users -->
+		{{{end}}}
 	</ul>
 </li>
\ No newline at end of file
diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl
index 69ff728..f6694f6 100644
--- a/templates/partials/flags/filters.tpl
+++ b/templates/partials/flags/filters.tpl
@@ -44,9 +44,9 @@
 				<label for="filter-cid">[[flags:filter-cid]]</label>
 				<select class="form-control" id="filter-cid" name="cid" multiple="true">
 					<option value="">[[flags:filter-cid-all]]</option>
-					<!-- BEGIN categories -->
+					{{{each categories}}}
 					<option value="@key">@value</option>
-					<!-- END categories -->
+					{{{end}}}
 				</select>
 			</div>
 
diff --git a/templates/partials/groups/list.tpl b/templates/partials/groups/list.tpl
index 3397350..ba8534f 100644
--- a/templates/partials/groups/list.tpl
+++ b/templates/partials/groups/list.tpl
@@ -1,4 +1,4 @@
-	<!-- BEGIN groups -->
+	{{{each groups}}}
 	<div class="col-lg-4 col-md-6 col-sm-12" component="groups/summary" data-slug="{groups.slug}">
 		<div class="panel panel-default">
 			<a href="{config.relative_path}/groups/{groups.slug}" class="panel-heading list-cover" style="<!-- IF groups.cover:thumb:url -->background-image: url({groups.cover:thumb:url});<!-- ENDIF groups.cover:thumb:url -->">
@@ -6,11 +6,11 @@
 			</a>
 			<div class="panel-body">
 				<ul class="members">
-					<!-- BEGIN members -->
+					{{{each members}}}
 					<li>
 						<a href="{config.relative_path}/user/{groups.members.userslug}">{buildAvatar(groups.members, "sm", true)}</a>
 					</li>
-					<!-- END members -->
+					{{{end}}}
 					<!-- IF groups.truncated -->
 					<li class="truncated"><i class="fa fa-ellipsis-h"></i></li>
 					<!-- ENDIF groups.truncated -->
@@ -18,4 +18,4 @@
 			</div>
 		</div>
 	</div>
-	<!-- END groups -->
\ No newline at end of file
+	{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/groups/memberlist.tpl b/templates/partials/groups/memberlist.tpl
index 49a177a..826886e 100644
--- a/templates/partials/groups/memberlist.tpl
+++ b/templates/partials/groups/memberlist.tpl
@@ -14,7 +14,7 @@
 
 <table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
 	<tbody>
-	<!-- BEGIN group.members -->
+	{{{each group.members}}}
 	<tr data-uid="{group.members.uid}">
 		<td>
 			<a href="{config.relative_path}/user/{group.members.userslug}">{buildAvatar(group.members, "sm", true)}</a>
@@ -35,6 +35,6 @@
 			<!-- ENDIF group.isOwner -->
 		</td>
 	</tr>
-	<!-- END group.members -->
+	{{{end}}}
 	</tbody>
 </table>
\ No newline at end of file
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 63f0866..f2708f5 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -218,7 +218,7 @@
 				</ul>
 
 				<ul id="main-nav" class="nav navbar-nav">
-					<!-- BEGIN navigation -->
+					{{{each navigation}}}
 					<!-- IF function.displayMenuItem, @index -->
 					<li class="{navigation.class}">
 						<a class="navigation-link" href="{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
@@ -232,7 +232,7 @@
 						</a>
 					</li>
 					<!-- ENDIF function.displayMenuItem -->
-					<!-- END navigation -->
+					{{{end}}}
 				</ul>
 
 				<!-- ELSE -->
diff --git a/templates/partials/merge_topics_modal.tpl b/templates/partials/merge_topics_modal.tpl
index 4e47406..132a0de 100644
--- a/templates/partials/merge_topics_modal.tpl
+++ b/templates/partials/merge_topics_modal.tpl
@@ -6,12 +6,12 @@
 		<p>
 			[[topic:merge_topics_instruction]]<br />
 			<div class="topics-section">
-				<!-- BEGIN topics -->
+				{{{each topics}}}
 				<!-- IF @index -->
 				<i class="fa fa-chevron-up"></i><br/>
 				<!-- ENDIF @index -->
 				<span>{topics.title}</span><br/>
-				<!-- END topics -->
+				{{{end}}}
 			</div>
 		</p>
 	</div>
diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
index 1a17077..6eb3302 100644
--- a/templates/partials/modals/change_picture_modal.tpl
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -13,7 +13,7 @@
 					<h4 class="media-heading">[[user:default_picture]]</h4>
 				</div>
 			</button>
-			<!-- BEGIN pictures -->
+			{{{each pictures}}}
 			<button type="button" class="list-group-item" data-type="{pictures.type}">
 				<div class="media-left">
 					<img class="media-object" src="{pictures.url}" title="{pictures.text}" />
@@ -22,7 +22,7 @@
 					<h4 class="media-heading">{pictures.text}</h4>
 				</div>
 			</button>
-			<!-- END pictures -->
+			{{{end}}}
 		</div>
 	</div>
 	<div class="col-xs-6 col-sm-4 col-md-6">
diff --git a/templates/partials/modals/manage_room_users.tpl b/templates/partials/modals/manage_room_users.tpl
index dcccc96..ec94b7a 100644
--- a/templates/partials/modals/manage_room_users.tpl
+++ b/templates/partials/modals/manage_room_users.tpl
@@ -1,7 +1,7 @@
-<!-- BEGIN users -->
+{{{each users}}}
 <li class="list-group-item">
 	<!-- IF ../canKick --><button class="pull-right btn btn-xs btn-link" data-action="kick" data-uid="{../uid}">[[modules:chat.kick]]</button><!-- END -->
 	{buildAvatar(users, "sm", true)}
 	<span>{../username} <!-- IF ../isOwner --><i class="fa fa-star text-warning" title="[[modules:chat.owner]]"></i><!-- END --></span>
 </li>
-<!-- END -->
\ No newline at end of file
+{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/modals/post_history.tpl b/templates/partials/modals/post_history.tpl
index fd696ec..b0bbee0 100644
--- a/templates/partials/modals/post_history.tpl
+++ b/templates/partials/modals/post_history.tpl
@@ -8,13 +8,13 @@
 <!-- IF numDiffs -->
 <div class="form-group">
 	<select class="form-control">
-		<!-- BEGIN diffs -->
+		{{{each diffs}}}
 		<option value="{../timestamp}">
 			{../pretty}
 			<!-- IF @first -->([[topic:diffs.current-revision]])<!-- END -->
 			<!-- IF @last -->([[topic:diffs.original-revision]])<!-- END -->
 		</option>
-		<!-- END -->
+		{{{end}}}
 	</select>
 
 	<hr />
diff --git a/templates/partials/modals/votes_modal.tpl b/templates/partials/modals/votes_modal.tpl
index 8dc0b3d..576ace8 100644
--- a/templates/partials/modals/votes_modal.tpl
+++ b/templates/partials/modals/votes_modal.tpl
@@ -1,10 +1,10 @@
 <h3>[[global:upvoters]] <small>({upvoteCount})</small></h3>
-<!-- BEGIN upvoters -->
+{{{each upvoters}}}
 <a href="{config.relative_path}/user/{upvoters.userslug}">{buildAvatar(upvoters, "sm", false)}</a>
-<!-- END upvoters -->
+{{{end}}}
 <!-- IF showDownvotes -->
 <h3>[[global:downvoters]] <small>({downvoteCount})</small></h3>
-<!-- BEGIN downvoters -->
+{{{each downvoters}}}
 <a href="{config.relative_path}/user/{downvoters.userslug}">{buildAvatar(downvoters, "sm", false)}</a>
-<!-- END downvoters -->
+{{{end}}}
 <!-- ENDIF showDownvotes -->
diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
index 5264f98..3ba78e2 100644
--- a/templates/partials/notifications_list.tpl
+++ b/templates/partials/notifications_list.tpl
@@ -3,7 +3,7 @@
 <li class="no-notifs"><a href="#">[[notifications:no_notifs]]</a></li>
 <!-- ENDIF !notifications.length -->
 
-<!-- BEGIN notifications -->
+{{{each notifications}}}
 <li class="{notifications.readClass}" data-nid="{notifications.nid}" data-path="{config.relative_path}{notifications.path}" <!-- IF notifications.pid --> data-pid="{notifications.pid}"<!-- ENDIF notifications.pid --><!-- IF notifications.tid --> data-tid="{notifications.tid}"<!-- ENDIF notifications.tid -->>
 	<!-- IF notifications.image -->
 	<!-- IF notifications.from -->
@@ -20,4 +20,4 @@
 	</a>
 	<div class="clear"></div>
 </li>
-<!-- END notifications -->
+{{{end}}}
diff --git a/templates/partials/paginator.tpl b/templates/partials/paginator.tpl
index aa90144..50e7452 100644
--- a/templates/partials/paginator.tpl
+++ b/templates/partials/paginator.tpl
@@ -4,7 +4,7 @@
 			<a href="?{pagination.prev.qs}" data-page="{pagination.prev.page}"><i class="fa fa-chevron-left"></i> </a>
 		</li>
 
-		<!-- BEGIN pagination.pages -->
+		{{{each pagination.pages}}}
 			<!-- IF pagination.pages.separator -->
 			<li component="pagination/select-page" class="page select-page">
 				<a href="#"><i class="fa fa-ellipsis-h"></i></a>
@@ -14,7 +14,7 @@
 				<a href="?{pagination.pages.qs}" data-page="{pagination.pages.page}">{pagination.pages.page}</a>
 			</li>
 			<!-- ENDIF pagination.pages.separator -->
-		<!-- END pagination.pages -->
+		{{{end}}}
 
 		<li class="next pull-right<!-- IF !pagination.next.active --> disabled<!-- ENDIF !pagination.next.active -->">
 			<a href="?{pagination.next.qs}" data-page="{pagination.next.page}"> <i class="fa fa-chevron-right"></i></a>
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index e245162..524eb5f 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,10 +1,10 @@
 <div class="clearfix">
 	<div class="tags pull-left">
-		<!-- BEGIN tags -->
+		{{{each tags}}}
 		<a href="{config.relative_path}/tags/{tags.value}">
 		<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
 		<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
-		<!-- END tags -->
+		{{{end}}}
 	</div>
 
 	<!-- IMPORT partials/topic/browsing-users.tpl -->
diff --git a/templates/partials/posts_list.tpl b/templates/partials/posts_list.tpl
index 1c15e14..75e82db 100644
--- a/templates/partials/posts_list.tpl
+++ b/templates/partials/posts_list.tpl
@@ -1,6 +1,6 @@
 <ul component="posts" class="posts-list" data-nextstart="{nextStart}">
 
-	<!-- BEGIN posts -->
+	{{{each posts}}}
 	<li component="post" class="posts-list-item row<!-- IF posts.deleted --> deleted<!-- ELSE --><!-- IF posts.topic.deleted --> deleted<!-- ENDIF posts.topic.deleted --><!-- ENDIF posts.deleted -->" data-pid="{posts.pid}" data-uid="{posts.uid}">
 		<div class="col-lg-11 col-sm-10 col-xs-9 post-body">
 			<a class="topic-title" href="{config.relative_path}/post/{posts.pid}">
@@ -23,7 +23,7 @@
 			</div>
 		</div>
 	</li>
-	<!-- END posts -->
+	{{{end}}}
 </ul>
 <div component="posts/loading" class="loading-indicator text-center hidden">
 	<i class="fa fa-refresh fa-spin"></i>
diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index f52472c..2c92bee 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -1,4 +1,4 @@
-<!-- BEGIN posts -->
+{{{each posts}}}
 <li>
 	<a href="{config.relative_path}/post/{posts.pid}">
 		{buildAvatar(posts.user, "sm", true)}
@@ -16,7 +16,7 @@
 <!-- IF !@last -->
 <li role="separator" class="divider"></li>
 <!-- ENDIF -->
-<!-- END posts -->
+{{{end}}}
 <!-- IF multiplePages -->
 <li class="text-center">
 	<a href="{url}">
diff --git a/templates/partials/tags_list.tpl b/templates/partials/tags_list.tpl
index 569ee69..1c6b6e3 100644
--- a/templates/partials/tags_list.tpl
+++ b/templates/partials/tags_list.tpl
@@ -1,5 +1,5 @@
-<!-- BEGIN tags -->
+{{{each tags}}}
 <h3 class="pull-left tag-container">
 	<a href="{config.relative_path}/tags/{tags.value}" data-value="{tags.value}"><span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span><span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
 </h3>
-<!-- END tags -->
\ No newline at end of file
+{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/topic/badge.tpl b/templates/partials/topic/badge.tpl
index 5290506..930a9a4 100644
--- a/templates/partials/topic/badge.tpl
+++ b/templates/partials/topic/badge.tpl
@@ -1,5 +1,5 @@
-<!-- BEGIN posts.user.selectedGroups -->
+{{{each posts.user.selectedGroups}}}
 <!-- IF posts.user.selectedGroups.slug -->
 <a href="{config.relative_path}/groups/{posts.user.selectedGroups.slug}"><small class="label group-label inline-block" style="color:{posts.user.selectedGroups.textColor};background-color: {posts.user.selectedGroups.labelColor};"><!-- IF posts.user.selectedGroups.icon --><i class="fa {posts.user.selectedGroups.icon}"></i> <!-- ENDIF posts.user.selectedGroups.icon -->{posts.user.selectedGroups.userTitle}</small></a>
 <!-- ENDIF posts.user.selectedGroups.slug -->
-<!-- END posts.user.selectedGroups -->
\ No newline at end of file
+{{{end}}}
\ No newline at end of file
diff --git a/templates/partials/topic/browsing-users.tpl b/templates/partials/topic/browsing-users.tpl
index 2c35336..25fd74c 100644
--- a/templates/partials/topic/browsing-users.tpl
+++ b/templates/partials/topic/browsing-users.tpl
@@ -1,5 +1,5 @@
 <div component="topic/browsing-users">
-	<!-- BEGIN browsingUsers -->
+	{{{each browsingUsers}}}
 	<div class="pull-left">
 		<a href="<!-- IF browsingUsers.userslug -->{config.relative_path}/user/{browsingUsers.userslug}<!-- ELSE -->#<!-- ENDIF browsingUsers.userslug -->">
 			<!-- IF browsingUsers.picture -->
@@ -9,5 +9,5 @@
 			<!-- ENDIF browsingUsers.picture -->
 		</a>
 	</div>
-	<!-- END browsingUsers -->
+	{{{end}}}
 </div>
\ No newline at end of file
diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 8ee6ae6..9247dba 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -55,13 +55,13 @@
 <!-- ENDIF posts.ip -->
 <!-- ENDIF posts.display_moderator_tools -->
 
-<!-- BEGIN posts.tools -->
+{{{each posts.tools}}}
 <li role="presentation">
 	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
 		<span class="menu-icon"><i class="fa fa-fw {posts.tools.icon}"></i></span> {{posts.tools.html}}
 	</a>
 </li>
-<!-- END posts.tools -->
+{{{end}}}
 <!-- IF posts.toolsVisible -->
 <li role="presentation" class="divider"></li>
 <!-- ENDIF posts.toolsVisible -->
@@ -84,11 +84,11 @@
 <li role="presentation" class="divider"></li>
 <li role="presentation" class="dropdown-header">[[topic:share_this_post]]</li>
 <!-- ENDIF postSharing.length -->
-<!-- BEGIN postSharing -->
+{{{each postSharing}}}
 	<li role="presentation">
 		<a role="menuitem" component="share/{postSharing.id}" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-fw {postSharing.class}"></i></span> {postSharing.name}</a>
 	</li>
-<!-- END postSharing -->
+{{{end}}}
 
 <!-- IF posts.display_flag_tools -->
 <li role="presentation" class="divider"></li>
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index fed513d..46f1540 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -31,9 +31,9 @@
 			<span>
 				<!-- IF posts.user.custom_profile_info.length -->
 				&#124;
-				<!-- BEGIN posts.user.custom_profile_info -->
+				{{{each posts.user.custom_profile_info}}}
 				{posts.user.custom_profile_info.content}
-				<!-- END posts.user.custom_profile_info -->
+				{{{end}}}
 				<!-- ENDIF posts.user.custom_profile_info.length -->
 			</span>
 		</span>
@@ -81,9 +81,9 @@
 	<!-- IF !hideReplies -->
 	<a component="post/reply-count" href="#" class="threaded-replies no-select <!-- IF !posts.replies.count -->hidden<!-- ENDIF !posts.replies.count -->">
 		<span component="post/reply-count/avatars" class="avatars <!-- IF posts.replies.hasMore -->hasMore<!-- ENDIF posts.replies.hasMore -->">
-			<!-- BEGIN posts.replies.users -->
+			{{{each posts.replies.users}}}
 			{buildAvatar(posts.replies.users, "xs", true, "")}
-			<!-- END posts.replies.users -->
+			{{{end}}}
 		</span>
 
 		<span class="replies-count" component="post/reply-count/text" data-replies="{posts.replies.count}">{posts.replies.text}</span>
diff --git a/templates/partials/topic/topic-menu-list.tpl b/templates/partials/topic/topic-menu-list.tpl
index 585e074..80723e4 100644
--- a/templates/partials/topic/topic-menu-list.tpl
+++ b/templates/partials/topic/topic-menu-list.tpl
@@ -20,7 +20,7 @@
 <li><a component="topic/delete/posts" href="#"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete-posts]]</a></li>
 <!-- ENDIF privileges.isAdminOrMod -->
 
-<!-- BEGIN thread_tools -->
+{{{each thread_tools}}}
 <li><a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a></li>
-<!-- END thread_tools -->
+{{{end}}}
 <!-- ENDIF privileges.deletable -->
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 38da154..7d38ca3 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -1,6 +1,6 @@
 <ul component="category" class="topic-list" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}" data-set="{set}">
 	<meta itemprop="itemListOrder" content="descending">
-	<!-- BEGIN topics -->
+	{{{each topics}}}
 	<li component="category/topic" class="row clearfix category-item {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
 		<meta itemprop="name" content="{function.stripTags, title}">
 
@@ -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>
-				<!-- BEGIN icons -->@value<!-- END icons -->
+				{{{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 />
@@ -49,9 +49,9 @@
 
 				<!-- IF topics.tags.length -->
 				<span class="tag-list hidden-xs">
-					<!-- BEGIN tags -->
+					{{{each tags}}}
 					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.valueEscaped}</span></a>
-					<!-- END tags -->
+					{{{end}}}
 					<small>&bull;</small>
 				</span>
 				<!-- ENDIF topics.tags.length -->
@@ -111,5 +111,5 @@
 			</div>
 		</div>
 	</li>
-	<!-- END topics -->
+	{{{end}}}
 </ul>
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index c838577..aae0357 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -1,4 +1,4 @@
-<!-- BEGIN users -->
+{{{each users}}}
 <li class="users-box registered-user" data-uid="{users.uid}">
 	<a href="{config.relative_path}/user/{users.userslug}">{buildAvatar(users, "80", true)}</a>
 	<br/>
@@ -37,4 +37,4 @@
 		<!-- ENDIF section_flagged -->
 	</div>
 </li>
-<!-- END users -->
\ No newline at end of file
+{{{end}}}
\ No newline at end of file
diff --git a/templates/popular.tpl b/templates/popular.tpl
index 0aa846b..cac06e2 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="popular">
 	<div class="btn-toolbar">
@@ -21,11 +21,11 @@
 			{selectedFilter.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN filters -->
+				{{{each filters}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{filters.url}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
 				</li>
-				<!-- END filters -->
+				{{{end}}}
 			</ul>
 		</div>
 
@@ -34,11 +34,11 @@
 			{selectedTerm.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN terms -->
+				{{{each terms}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{terms.url}"><i class="fa fa-fw <!-- IF terms.selected -->fa-check<!-- ENDIF terms.selected -->"></i>{terms.name}</a>
 				</li>
-				<!-- END terms -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/recent.tpl b/templates/recent.tpl
index b3857e9..73cc565 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="recent">
 	<div class="btn-toolbar">
@@ -24,11 +24,11 @@
 			{selectedFilter.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN filters -->
+				{{{each filters}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{filters.url}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
 				</li>
-				<!-- END filters -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/register.tpl b/templates/register.tpl
index 84b289a..646d550 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -40,14 +40,14 @@
 					</div>
 				</div>
 
-				<!-- BEGIN regFormEntry -->
+				{{{each regFormEntry}}}
 				<div class="form-group">
 					<label for="register-{regFormEntry.styleName}" class="col-lg-4 control-label">{regFormEntry.label}</label>
 					<div id="register-{regFormEntry.styleName}" class="col-lg-8">
 						{{regFormEntry.html}}
 					</div>
 				</div>
-				<!-- END regFormEntry -->
+				{{{end}}}
 
 				<div class="form-group">
 					<div class="col-lg-offset-4 col-lg-8">
@@ -67,9 +67,9 @@
 		<div class="alt-register-block">
 			<h4>[[register:alternative_registration]]</h4>
 			<ul class="alt-logins">
-				<!-- BEGIN authentication -->
+				{{{each authentication}}}
 				<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></i></a></li>
-				<!-- END authentication -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/registerComplete.tpl b/templates/registerComplete.tpl
index 02f4ef5..9705075 100644
--- a/templates/registerComplete.tpl
+++ b/templates/registerComplete.tpl
@@ -12,9 +12,9 @@
 				[[register:interstitial.errors-found]]
 			</p>
 			<ul>
-				<!-- BEGIN errors -->
+				{{{each errors}}}
 				<li>@value</li>
-				<!-- END errors -->
+				{{{end}}}
 			</ul>
 		</div>
 		<!-- ENDIF errors.length -->
@@ -22,7 +22,7 @@
 </div>
 
 <form role="form" method="post" action="{config.relative_path}/register/complete/?_csrf={config.csrf_token}" enctype="multipart/form-data">
-	<!-- BEGIN sections -->
+	{{{each sections}}}
 	<div class="row">
 		<div class="col-xs-12 col-sm-8 col-sm-offset-2">
 			<div class="panel panel-default">
@@ -32,7 +32,7 @@
 			</div>
 		</div>
 	</div>
-	<!-- END sections -->
+	{{{end}}}
 
 	<div class="row">
 		<div class="col-xs-12 col-sm-8 col-sm-offset-2">
diff --git a/templates/search.tpl b/templates/search.tpl
index 5c8b591..680679a 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -44,9 +44,9 @@
 								<div class="col-md-6">
 									<label>[[search:in-categories]]</label>
 									<select multiple class="form-control" id="posted-in-categories" size="{categoriesCount}">
-										<!-- BEGIN categories -->
+										{{{each categories}}}
 										<option value="{categories.value}">{categories.text}</option>
-										<!-- END categories -->
+										{{{end}}}
 									</select>
 									<input type="checkbox" id="search-children"> [[search:search-child-categories]]
 								</div>
@@ -172,7 +172,7 @@
 			<!-- ENDIF search_query -->
 			<!-- ENDIF matchCount -->
 
-			<!-- BEGIN posts -->
+			{{{each posts}}}
 			<div class="topic-row panel panel-default clearfix">
 				<div class="panel-body">
 
@@ -194,7 +194,7 @@
 					</small>
 				</div>
 			</div>
-			<!-- END posts -->
+			{{{end}}}
 
 			<!-- IF users.length -->
 			<ul id="users-container" class="users-container">
diff --git a/templates/tags.tpl b/templates/tags.tpl
index 09f769e..fc203fb 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="tags">
 	<!-- IF displayTagSearch -->
diff --git a/templates/top.tpl b/templates/top.tpl
index a3c2b2d..3bd6aef 100644
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="top">
 	<div class="btn-toolbar">
@@ -21,11 +21,11 @@
 			{selectedFilter.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN filters -->
+				{{{each filters}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{filters.url}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
 				</li>
-				<!-- END filters -->
+				{{{end}}}
 			</ul>
 		</div>
 
@@ -34,11 +34,11 @@
 			{selectedTerm.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN terms -->
+				{{{each terms}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{terms.url}"><i class="fa fa-fw <!-- IF terms.selected -->fa-check<!-- ENDIF terms.selected -->"></i>{terms.name}</a>
 				</li>
-				<!-- END terms -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 86cc59a..d965082 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="row">
 	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
@@ -12,7 +12,7 @@
 			<i class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
 			<i class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
 			<i class="pull-left fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="[[topic:moved]]"></i>
-			<!-- BEGIN icons -->@value<!-- END icons -->
+			{{{each icons}}}@value{{{end}}}
 
 			<span class="topic-title" component="topic/title">{title}</span>
 		</h1>
@@ -34,7 +34,7 @@
 		<hr class="visible-xs" />
 
 		<ul component="topic" class="posts" data-tid="{tid}" data-cid="{cid}">
-			<!-- BEGIN posts -->
+			{{{each posts}}}
 				<li component="post" class="<!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
 					<a component="post/anchor" data-index="{posts.index}" id="{posts.index}"></a>
 
@@ -46,7 +46,7 @@
 					<div class="post-bar-placeholder"></div>
 					<!-- ENDIF !posts.index -->
 				</li>
-			<!-- END posts -->
+			{{{end}}}
 		</ul>
 
 		<!-- IF config.enableQuickReply -->
@@ -77,15 +77,15 @@
 		</div>
 	</div>
 	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
-		<!-- BEGIN widgets.sidebar -->
+		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
-		<!-- END widgets.sidebar -->
+		{{{end}}}
 	</div>
 </div>
 <div widget-area="footer">
-	<!-- BEGIN widgets.footer -->
+	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
-	<!-- END widgets.footer -->
+	{{{end}}}
 </div>
 
 <!-- IF !config.usePagination -->
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 1e8a8e7..501ece0 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="unread">
 	<div class="btn-toolbar">
@@ -26,11 +26,11 @@
 					<a id="markAllRead" role="menuitem" tabindex="-1" href="#">[[unread:all]]</a>
 				</li>
 				<li class="divider"></li>
-				<!-- BEGIN categories -->
+				{{{each categories}}}
 				<li role="presentation" class="category" data-cid="{categories.cid}">
 					<a role="menu-item" href="#">{categories.level}<!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
 				</li>
-				<!-- END categories -->
+				{{{end}}}
 			</ul>
 		</div>
 
@@ -41,11 +41,11 @@
 			{selectedFilter.name} <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu" role="menu">
-				<!-- BEGIN filters -->
+				{{{each filters}}}
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{filters.url}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
 				</li>
-				<!-- END filters -->
+				{{{end}}}
 			</ul>
 		</div>
 	</div>
diff --git a/templates/users.tpl b/templates/users.tpl
index 1ba61ef..449e357 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 <div widget-area="header">
-	<!-- BEGIN widgets.header -->
+	{{{each widgets.header}}}
 	{{widgets.header.html}}
-	<!-- END widgets.header -->
+	{{{end}}}
 </div>
 <div class="users">
 	<div class="row">