diff --git a/package.json b/package.json
index 47e62f3..4411565 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "2.1.8",
+  "version": "2.1.11",
   "nbbpm": {
     "compatibility": "^0.8.0"
   },
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index d3f4cf2..c5b4875 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -140,5 +140,3 @@
 	<!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl -->
 </div>
 
-<!-- IMPORT partials/variables/account.tpl -->
-<!-- IMPORT partials/variables/account/edit.tpl -->
\ No newline at end of file
diff --git a/templates/account/favourites.tpl b/templates/account/favourites.tpl
index 495cd53..22babdf 100644
--- a/templates/account/favourites.tpl
+++ b/templates/account/favourites.tpl
@@ -16,5 +16,3 @@
 		</div>
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index 1f82f5f..0ba04ed 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -17,5 +17,3 @@
 		</div>
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 8f10217..d099e9c 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -167,6 +167,3 @@
 	<div id="user-action-alert" class="alert alert-success hide"></div>
 
 </div>
-
-<!-- IMPORT partials/variables/account.tpl -->
-<!-- IMPORT partials/variables/account/profile.tpl -->
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index e76ff85..02b441b 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -150,4 +150,3 @@
 	</div>
 </div>
 
-<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index fb80d86..cb48b8e 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -12,5 +12,3 @@
 		<!-- ENDIF config.usePagination -->
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/account/watched.tpl b/templates/account/watched.tpl
index 0504592..374c136 100644
--- a/templates/account/watched.tpl
+++ b/templates/account/watched.tpl
@@ -12,5 +12,3 @@
 		<!-- ENDIF config.usePagination -->
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/account.tpl -->
\ No newline at end of file
diff --git a/templates/category.tpl b/templates/category.tpl
index 1bd6be6..c861836 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -45,4 +45,3 @@
 </noscript>
 <!-- ENDIF !config.usePagination -->
 
-<!-- IMPORT partials/variables/category.tpl -->
\ No newline at end of file
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index d473629..e200d45 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -236,5 +236,3 @@
 		<div widget-area="right"></div>
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/groups/details.tpl -->
\ No newline at end of file
diff --git a/templates/header.tpl b/templates/header.tpl
index f991637..239259e 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -5,7 +5,7 @@
 	<!-- BEGIN metaTags -->
 	{function.buildMetaTag}
 	<!-- END metaTags -->
-	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{css-buster}" />
+	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{config.css-buster}" />
 	<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
 	<!-- BEGIN linkTags -->
 	<link<!-- IF linkTags.link --> link="{linkTags.link}"<!-- ENDIF linkTags.link --><!-- IF linkTags.rel --> rel="{linkTags.rel}"<!-- ENDIF linkTags.rel --><!-- IF linkTags.type --> type="{linkTags.type}"<!-- ENDIF linkTags.type --><!-- IF linkTags.href --> href="{linkTags.href}"<!-- ENDIF linkTags.href --> />
@@ -26,9 +26,9 @@
 			user: JSON.parse('{{userJSON}}')
 		};
 	</script>
-	<script src="{relative_path}/nodebb.min.js?{script-buster}"></script>
+	<script src="{relative_path}/nodebb.min.js?{config.script-buster}"></script>
 	<!-- IMPORT partials/requirejs-config.tpl -->
-	
+
 	<!-- IF useCustomJS -->
 	{{customJS}}
 	<!-- ENDIF useCustomJS -->
@@ -49,7 +49,7 @@
 			<ul class="menu-section-list"></ul>
 		</section>
 
-		<!-- IF loggedIn -->
+		<!-- IF config.loggedIn -->
 		<section class="menu-section" data-section="profile">
 			<h3 class="menu-section-title">[[global:header.profile]]</h3>
 			<ul class="menu-section-list" component="header/usercontrol"></ul>
@@ -70,7 +70,7 @@
 			</h3>
 			<ul class="menu-section-list chat-list"></ul>
 		</section>
-		<!-- ENDIF loggedIn -->
+		<!-- ENDIF config.loggedIn -->
 	</nav>
 
 	<main id="panel">
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 88e75ad..e7cc386 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -9,11 +9,11 @@
 				<a href="<!-- IF brand:logo:url -->{brand:logo:url}<!-- ELSE -->{relative_path}/<!-- ENDIF brand:logo:url -->">
 					<img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo" src="{brand:logo}" />
 				</a>
-				<!-- IF showSiteTitle -->
+				<!-- IF config.showSiteTitle -->
 				<a href="{relative_path}/">
 					<h1 class="navbar-brand forum-title">{title}</h1>
 				</a>
-				<!-- ENDIF showSiteTitle -->
+				<!-- ENDIF config.showSiteTitle -->
 
 				<div component="navbar/title" class="visible-xs">
 					<span></span>
@@ -22,7 +22,7 @@
 
 			<div id="nav-dropdown" class="hidden-xs">
 				<!-- IF !maintenanceHeader -->
-				<!-- IF loggedIn -->
+				<!-- IF config.loggedIn -->
 
 				<ul id="logged-in-menu" class="nav navbar-nav navbar-right">
 					<li id="user_label" class="dropdown">
@@ -81,7 +81,7 @@
 						</ul>
 					</li>
 
-					<!-- IF !disableChat -->
+					<!-- IF !config.disableChat -->
 					<li class="chats dropdown">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="[[global:header.chats]]" id="chat_dropdown" component="chat/dropdown">
 							<i component="chat/icon" class="fa fa-comment-o fa-fw"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
@@ -97,18 +97,18 @@
 							<li class="notif-dropdown-link"><a href="{relative_path}/chats">[[modules:chat.see_all]]</a></li>
 						</ul>
 					</li>
-					<!-- ENDIF !disableChat -->
+					<!-- ENDIF !config.disableChat -->
 				</ul>
 				<!-- ELSE -->
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
-					<!-- IF allowRegistration -->
+					<!-- IF config.allowRegistration -->
 					<li>
 						<a href="{relative_path}/register">
 							<i class="fa fa-pencil visible-xs-inline"></i>
 							<span>[[global:register]]</span>
 						</a>
 					</li>
-					<!-- ENDIF allowRegistration -->
+					<!-- ENDIF config.allowRegistration -->
 					<li>
 						<a href="{relative_path}/login">
 							<i class="fa fa-sign-in visible-xs-inline"></i>
@@ -116,8 +116,8 @@
 						</a>
 					</li>
 				</ul>
-				<!-- ENDIF loggedIn -->
-				<!-- IF searchEnabled -->
+				<!-- ENDIF config.loggedIn -->
+				<!-- IF config.searchEnabled -->
 				<ul class="nav navbar-nav navbar-right">
 					<li>
 						<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
@@ -136,7 +136,7 @@
 						</a>
 					</li>
 				</ul>
-				<!-- ENDIF searchEnabled -->
+				<!-- ENDIF config.searchEnabled -->
 
 				<ul class="nav navbar-nav navbar-right hidden-xs">
 					<li>
diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
index 08ba3ce..6265781 100644
--- a/templates/partials/modals/change_picture_modal.tpl
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
+	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="change-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel">[[user:change_picture]]</h3>
+					<h3 id="change-picture">[[user:change_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<div id="gravatar-box">
diff --git a/templates/partials/modals/upload_picture_from_url_modal.tpl b/templates/partials/modals/upload_picture_from_url_modal.tpl
index 240d709..b8d1222 100644
--- a/templates/partials/modals/upload_picture_from_url_modal.tpl
+++ b/templates/partials/modals/upload_picture_from_url_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture From Url" aria-hidden="true">
+	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture-url" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3>[[user:upload_picture]]</h3>
+					<h3 id="upload-picture-url">[[user:upload_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<input id="uploadFromUrl" class="form-control" type="text"/>
diff --git a/templates/partials/modals/upload_picture_modal.tpl b/templates/partials/modals/upload_picture_modal.tpl
index a325ac1..f29a886 100644
--- a/templates/partials/modals/upload_picture_modal.tpl
+++ b/templates/partials/modals/upload_picture_modal.tpl
@@ -1,9 +1,9 @@
-	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture" aria-hidden="true">
+	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel">[[user:upload_picture]]</h3>
+					<h3 id="upload-picture">[[user:upload_picture]]</h3>
 				</div>
 				<div class="modal-body">
 					<form id="uploadForm" action="" method="post" enctype="multipart/form-data">
diff --git a/templates/reset_code.tpl b/templates/reset_code.tpl
index 0fa84b7..9d7839f 100644
--- a/templates/reset_code.tpl
+++ b/templates/reset_code.tpl
@@ -30,7 +30,6 @@
 		</div>
 	</form>
 </div>
-<!-- IMPORT partials/variables/reset_code.tpl -->
 <!-- ELSE -->
 <div class="panel panel-default panel-danger">
 	<div class="panel-heading">
diff --git a/templates/tag.tpl b/templates/tag.tpl
index 49693d0..e233a62 100644
--- a/templates/tag.tpl
+++ b/templates/tag.tpl
@@ -12,5 +12,3 @@
 		<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
 	</div>
 </div>
-
-<!-- IMPORT partials/variables/tag.tpl -->
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index f40eb38..5386506 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -62,5 +62,3 @@
 	<!-- IMPORT partials/paginator.tpl -->
 </noscript>
 <!-- ENDIF !config.usePagination -->
-
-<!-- IMPORT partials/variables/topic.tpl -->
\ No newline at end of file