diff --git a/less/account.less b/less/account.less
index 4bece14..3aab0a3 100644
--- a/less/account.less
+++ b/less/account.less
@@ -148,6 +148,7 @@
 
 			h4 {
 				font-size: 13px;
+				text-align: left;
 
 				@media (max-width: @screen-xs-max) {
 					font-size: 11px;
@@ -170,6 +171,7 @@
 
 		.account-stats {
 			display: inline-block;
+			text-align: center;
 
 			.stat {
 				text-align: center;
diff --git a/less/groups.less b/less/groups.less
index 06eec72..60fcc7a 100644
--- a/less/groups.less
+++ b/less/groups.less
@@ -195,6 +195,7 @@
 	.card-body.card-padding {
 		@media (min-width: @screen-md-min) {
 			padding: 18px;
+			min-height: 68px;
 		}
 	}
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 5e3ac81..5ddd2db 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-material",
-  "version": "2.12.9",
+  "version": "2.13.1",
   "nbbpm": {
-    "compatibility": "^1.12.0"
+    "compatibility": "^1.17.0"
   },
   "description": "Material Design theme for NodeBB",
   "main": "theme.less",
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index b0a2e4d..6309ea9 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -45,9 +45,9 @@
 				</div>
 				<div class="card-body card-padding">
 					<ul>
-						<!-- BEGIN ips -->
-						<li>@value</li>
-						<!-- END ips -->
+						{{{each ips}}}
+						<li>{ips}</li>
+						{{{end}}}
 					</ul>
 				</div>
 			</div>
diff --git a/templates/categories.tpl b/templates/categories.tpl
index 318f812..4cefb7a 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -1,6 +1,6 @@
 <!-- IF !config.categoriesAsList -->
 <div class="categories row <!-- IF !config.removeCategoriesAnimation --> display-animation<!-- ENDIF !config.removeCategoriesAnimation -->">
-	<!-- BEGIN categories -->
+	{{{ each categories }}}
 	<div component="categories/category" data-cid="{categories.cid}" class="<!-- IF categories.class -->{categories.class}<!-- ELSE -->col-md-3 col-sm-6 col-xs-12<!-- ENDIF categories.class -->">
 		<div class="category-card" style="{function.generateCategoryBackground}">
 			<!-- IF categories.link -->
@@ -26,7 +26,7 @@
 				</div>
 			</a>
 			<div class="category-card-footer">
-				<!-- BEGIN posts -->
+				{{{each posts}}}
 				<!-- IF @first -->
 				<div component="category/posts">
 					<div class="pull-left hidden-xs user-avatar">
@@ -43,11 +43,11 @@
 					</div>
 				</div>
 				<!-- ENDIF @first -->
-				<!-- END posts -->
+				{{{end}}}
 			</div>
 		</div>
 	</div>
-	<!-- END categories -->
+	{{{ end }}}
 </div>
 <!-- ENDIF !config.categoriesAsList -->
 
@@ -56,7 +56,7 @@
 	<div class="card">
 		<div class="listview lv-bordered lv-lg">
 			<div class="lv-body">
-				<!-- BEGIN categories -->
+				{{{ each categories }}}
 				<div class="lv-item media row clearfix" component="categories/category" data-cid="{categories.cid}">
 					<div class="col-xs-12 col-sm-8 col-md-7">
 						<div class="icon pull-left" style="{function.generateCategoryBackground}">
@@ -89,7 +89,7 @@
 						</div>
 					</div>
 					<div class="col-md-3 hidden-xs last-post">
-						<!-- BEGIN posts -->
+						{{{ each posts }}}
 						<!-- IF @first -->
 						<div component="category/posts">
 							<div class="pull-left hidden-xs user-avatar">
@@ -109,10 +109,10 @@
 							</div>
 						</div>
 						<!-- ENDIF @first -->
-						<!-- END posts -->
+						{{{ end }}}
 					</div>
 					<!-- IF config.listSubcategories -->
-						<!-- BEGIN categories.children -->
+						{{{ each categories.children }}}
 						<div class="subcategories lv-item media row">
 							<div class="col-xs-12 col-sm-8 col-md-7 sub-category">
 								<div class="icon pull-left" style="{function.generateCategoryBackground}">
@@ -145,7 +145,7 @@
 								</div>
 							</div>
 							<div class="col-md-3 hidden-xs last-post">
-								<!-- BEGIN posts -->
+								{{{ each posts }}}
 								<!-- IF @first -->
 								<div component="category/posts">
 									<div class="pull-left hidden-xs user-avatar">
@@ -165,13 +165,13 @@
 									</div>
 								</div>
 								<!-- ENDIF @first -->
-								<!-- END posts -->
+								{{{ end }}}
 							</div>
 						</div>
-						<!-- END categories.children -->
+						{{{ end }}}
 					<!-- ENDIF config.listSubcategories -->
 				</div>
-				<!-- END categories -->
+				{{{ end }}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/footer.tpl b/templates/footer.tpl
index c5ab5bf..5140900 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -17,24 +17,10 @@
 		</div>
 		<!-- ENDIF !isSpider -->
 
-		<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
-
-		<!-- BEGIN scripts -->
-		<script defer type="text/javascript" src="{scripts.src}"></script>
-		<!-- END scripts -->
-
-		<script>
-			window.addEventListener('load', function () {
-				require(['forum/footer']);
-
-				<!-- IF useCustomJS -->
-				{{customJS}}
-				<!-- ENDIF useCustomJS -->
-			});
-		</script>
-
 		<div class="hide">
 			<!-- IMPORT 500-embed.tpl -->
 		</div>
+
+		<!-- IMPORT partials/footer/js.tpl -->
 	</body>
 </html>
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl
index 99ec0d3..9bed039 100644
--- a/templates/partials/account/header.tpl
+++ b/templates/partials/account/header.tpl
@@ -24,7 +24,6 @@
 			<h4 class="username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></h4>
 		</div>
 
-		<!-- IF template.account/profile -->
 		<div class="account-stats">
 			<!-- IF !reputation:disabled -->
 			<div class="stat">
@@ -59,16 +58,13 @@
 		<!-- IF !config.disableChat -->
 		<a component="account/chat" href="#" class="btn btn-primary btn-sm"><i class="fa fa-fw fa-comment-o"></i> [[user:chat]]</a>
 		<!-- ENDIF !config.disableChat -->
-		<a id="follow-btn" component="account/follow" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
-		<a id="unfollow-btn" component="account/unfollow" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
+		
+		<a id="follow-btn" component="account/follow" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->"><i class="fa fa-fw fa-heart-o"></i> [[user:follow]]</a>
+		<a id="unfollow-btn" component="account/unfollow" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->"><i class="fa fa-fw fa-heart"></i> [[user:unfollow]]</a>
 		<!-- ENDIF !banned -->
 		<!-- ENDIF !isSelf -->
 		<!-- ENDIF loggedIn -->
 
-		<!-- ELSE -->
-		<hr/>
-		<!-- ENDIF template.account/profile -->
-
 		<!-- IMPORT partials/account/menu.tpl -->
 	</div>
 </div>
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 0313115..d512cfa 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -80,7 +80,7 @@
 				</div>
 			</a>
 			<div class="category-card-footer">
-				<!-- BEGIN posts -->
+				{{{each posts}}}
 				<div component="category/posts">
 					<div class="pull-left hidden-xs user-avatar">
 						<a href="{config.relative_path}/user/{children.posts.user.userslug}">
@@ -95,7 +95,7 @@
 						<a href="{config.relative_path}/topic/{children.posts.topic.slug}">{children.posts.topic.title}</a>
 					</div>
 				</div>
-				<!-- END posts -->
+				{{{end}}}
 			</div>
 		</div>
 	</div>
diff --git a/templates/partials/groups/list.tpl b/templates/partials/groups/list.tpl
index 546948f..3edabb4 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" data-slug="{groups.slug}">
 	<div class="card">
 		<div class="card-header ch-alt">
@@ -7,7 +7,7 @@
 		<a href="{config.relative_path}/groups/{groups.slug}" class="card-body group-cover list-cover" style="<!-- IF groups.cover:thumb:url -->background-image: url({groups.cover:thumb:url});<!-- ENDIF groups.cover:thumb:url -->"></a>
 		<div class="card-body card-padding">
 			<ul class="members">
-				<!-- BEGIN groups.members -->
+				{{{ each groups.members }}}
 				<li>
 					<a href="{config.relative_path}/user/{groups.members.userslug}">
 						<!-- IF groups.members.picture -->
@@ -17,7 +17,7 @@
 						<!-- ENDIF groups.members.picture -->
 					</a>
 				</li>
-				<!-- END groups.members -->
+				{{{ end }}}
 				<!-- IF groups.truncated -->
 				<li class="truncated"><i class="fa fa-ellipsis-h"></i></li>
 				<!-- ENDIF groups.truncated -->
@@ -28,4 +28,4 @@
 		</div>
 	</div>
 </div>
-<!-- END groups -->
\ No newline at end of file
+{{{ end }}}
\ No newline at end of file
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 655670c..fdd5d09 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,10 +1,10 @@
 <div class="tags hidden-xs">
-	<!-- BEGIN tags -->
+	{{{each tags}}}
 	<div class="pull-left tag-container">
 		<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.value}</span><span class="tag-topic-count">{tags.score}</span></a>
 	</div>
-	<!-- END tags -->
+	{{{end}}}
 </div>
 
 <ul class="postbar-actions pull-right">
diff --git a/templates/partials/tags_list.tpl b/templates/partials/tags_list.tpl
index 98cfdff..b12e049 100644
--- a/templates/partials/tags_list.tpl
+++ b/templates/partials/tags_list.tpl
@@ -1,5 +1,5 @@
-<!-- BEGIN tags -->
+{{{each tags}}}
 <div 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.value}</span><span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
 </div>
-<!-- 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 4e128fb..12aef8f 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}" class="hidden-xs"><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/topics_list.tpl b/templates/partials/topics_list.tpl
index 2ccf71f..45ddb8c 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -1,6 +1,6 @@
 <div class="lv-body" component="category" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
 	<meta itemprop="itemListOrder" content="descending">
-	<!-- BEGIN topics -->
+	{{{each topics}}}
 	<div component="category/topic" class="lv-item media row clearfix category-item {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
 		<meta itemprop="name" content="{function.stripTags, title}">
 		<!-- IF showSelect -->
@@ -59,13 +59,13 @@
 
 			<div class="lv-attrs hidden-xs">
 				<!-- IF topics.tags.length -->
-				<!-- BEGIN tags -->
+				{{{each tags}}}
 				<div class="pull-left tag-container">
 					<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>
 				</div>
-				<!-- END tags -->
+				{{{end}}}
 				<!-- ENDIF topics.tags.length -->
 			</div>
 
@@ -96,5 +96,5 @@
 			</div>
 		</div>
 	</div>
-	<!-- END topics -->
+	{{{end}}}
 </div>
\ No newline at end of file