diff --git a/less/buttons.less b/less/buttons.less
index bd232c5..b3dec7f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -6,7 +6,6 @@
     -webkit-transition-duration: 300ms;
     transition-duration: 300ms;
     border: 0;
-    text-transform: uppercase;
     border-radius: 2px;
 
     &:not(.btn-link):not(.btn-float):not(.command-edit):not(.command-delete):not(.selectpicker) {
diff --git a/less/menu.less b/less/menu.less
index 3b71494..e78a0e3 100644
--- a/less/menu.less
+++ b/less/menu.less
@@ -332,6 +332,12 @@
 			}
 		}
 	}
+
+	li {
+		.btn-link {
+			color: @body-color;
+		}
+	}
 }
 
 [component="user/logout"] {
diff --git a/less/sidebar.less b/less/sidebar.less
index 05e4f63..cf60d82 100644
--- a/less/sidebar.less
+++ b/less/sidebar.less
@@ -31,6 +31,7 @@
 	background: @sidebar-bg-color;
 	box-shadow: 0 0 10px rgba(51, 51, 51, .38);
 	top: 65px;
+	left: 0;
 	height: ~"calc(100% - 5px)";
 	-webkit-transform: translate3d(-250px,0,0);
 	transform: translate3d(-250px,0,0);
diff --git a/less/skins.less b/less/skins.less
index ebd243a..e331f76 100644
--- a/less/skins.less
+++ b/less/skins.less
@@ -86,6 +86,11 @@ body {
         #user-control-list {
         	li>a {
         		color: @body-color-dark;
+			}
+			li {
+				.btn-link {
+					color: @body-color-dark;
+				}
         	}
         }
 
diff --git a/less/style.less b/less/style.less
index cda4277..8d43964 100644
--- a/less/style.less
+++ b/less/style.less
@@ -112,4 +112,10 @@ body #content {
 
 .bootbox {
 	z-index: 100001;
+}
+
+[component="category/dropdown"] {
+	.fa-stack {
+		font-size: 65%;
+	}
 }
\ No newline at end of file
diff --git a/lib/theme.js b/lib/theme.js
index 71d3f5e..73ff2a0 100644
--- a/lib/theme.js
+++ b/lib/theme.js
@@ -34,7 +34,7 @@ theme.getConfig = function (config, callback) {
 		config.selectedSkin = themeMaterialSkin || settings.skinOption || 'default';
 		config.bootswatchSkin = 'default';
 
-		callback(false, config);
+		callback(null, config);
 	});
 };
 
diff --git a/package.json b/package.json
index 7337193..494068d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb-theme-material",
   "version": "2.12.6",
   "nbbpm": {
-    "compatibility": "^1.11.0"
+    "compatibility": "^1.12.0"
   },
   "description": "Material Design theme for NodeBB",
   "main": "theme.less",
diff --git a/templates/account/consent.tpl b/templates/account/consent.tpl
index 0fb674e..17c95a7 100644
--- a/templates/account/consent.tpl
+++ b/templates/account/consent.tpl
@@ -11,7 +11,6 @@
 		</div>
 	</div>
 
-
 	<div class="row">
 		<div class="col-sm-6">
 			<!-- IF gdpr_consent -->
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 913ae79..81006b0 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -90,8 +90,8 @@
 						</div>
 
 						<div class="form-group fg-line">
-			            	<div class="select">
-				            	<label for="grouptitle">[[user:grouptitle]]</label>
+			        <div class="select">
+				        <label for="grouptitle">[[user:grouptitle]]</label>
 								<select class="form-control" id="groupTitle" data-property="groupTitle" <!-- IF allowMultipleBadges --> multiple<!-- ENDIF allowMutlipleBadges -->>
 									<option value="">[[user:no-group-title]]</option>
 									<!-- BEGIN groups -->
diff --git a/templates/account/edit/email.tpl b/templates/account/edit/email.tpl
index 2336185..09b33bd 100644
--- a/templates/account/edit/email.tpl
+++ b/templates/account/edit/email.tpl
@@ -28,7 +28,7 @@
 
 					<br/>
 					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
+						<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</button>
 					</div>
 				</form>
 			</div>
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
index 31f8a70..8eaaad8 100644
--- a/templates/account/edit/password.tpl
+++ b/templates/account/edit/password.tpl
@@ -38,7 +38,7 @@
 					</div>
 					<br/>
 					<div class="form-actions">
-						<a id="changePasswordBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+						<button id="changePasswordBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</button>
 					</div>
 				</form>
 			</div>
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
index 2fd51b7..faaf591 100644
--- a/templates/account/edit/username.tpl
+++ b/templates/account/edit/username.tpl
@@ -28,7 +28,7 @@
 
 					<br/>
 					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
+						<button id="submitBtn" class="btn btn-primary btn-block"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</button>
 					</div>
 				</form>
 			</div>
diff --git a/templates/account/info.tpl b/templates/account/info.tpl
index 95d01a7..c7a256e 100644
--- a/templates/account/info.tpl
+++ b/templates/account/info.tpl
@@ -7,11 +7,11 @@
 	<div class="row">
 		<div class="col-xs-12">
 			<div class="card">
-	        	<div class="card-header ch-alt">
-	        		[[global:sessions]]
-	        	</div>
-	        	<div class="card-body card-padding">
-	        		<ul class="list-group" component="user/sessions">
+				<div class="card-header ch-alt">
+					[[global:sessions]]
+				</div>
+				<div class="card-body card-padding">
+					<ul class="list-group" component="user/sessions">
 						<!-- BEGIN sessions -->
 						<li class="list-group-item" data-uuid="{../uuid}">
 							<div class="pull-right">
@@ -31,8 +31,8 @@
 						</li>
 						<!-- END sessions -->
 					</ul>
-	        	</div>
-	        </div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<!-- ENDIF sessions.length -->
@@ -118,6 +118,13 @@
 						<!-- BEGIN history.bans -->
 						<li>
 							<p>
+								<a href="{config.relative_path}/user/{history.bans.user.userslug}">
+									<!-- IF history.bans.user.picture -->
+									<img title="{history.bans.user.username}" class="avatar avatar-sm avatar-rounded" src="{history.bans.user.picture}" />
+									<!-- ELSE -->
+									<span title="{history.bans.user.username}" class="avatar avatar-sm avatar-rounded user-icon" style="background-color: {history.bans.user.icon:bgColor};">{history.bans.user.icon:text}</span>
+									<!-- ENDIF history.bans.user.picture -->
+								</a>
 								<span class="timestamp timeago" title="{../timestampISO}"></span> &mdash; {../timestampReadable}<br />
 								<!-- IF ../until -->
 								<span class="expiry">[[user:info.banned-until, {../untilReadable}]]</span><br />
diff --git a/templates/account/sessions.tpl b/templates/account/sessions.tpl
new file mode 100644
index 0000000..c0d3558
--- /dev/null
+++ b/templates/account/sessions.tpl
@@ -0,0 +1,36 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="account">
+	<!-- IMPORT partials/account/header.tpl -->
+
+	<!-- IF sessions.length -->
+	<div class="card">
+    <div class="card-header ch-alt">
+	    [[global:sessions]]
+	  </div>
+    <div class="card-body card-padding">
+      <p>[[user:sessions.description]]</p>
+      <ul class="list-group" component="user/sessions">
+        <!-- BEGIN sessions -->
+        <li class="list-group-item" data-uuid="{../uuid}">
+          <div class="pull-right">
+						<!-- IF isSelfOrAdminOrGlobalModerator -->
+						<!-- IF !../current -->
+						<button class="btn btn-xs btn-default" type="button" data-action="revokeSession">Revoke Session</button>
+						<!-- ENDIF !../current -->
+						<!-- ENDIF isSelfOrAdminOrGlobalModerator -->
+						{function.userAgentIcons}
+						<i class="fa fa-circle text-<!-- IF ../current -->success<!-- ELSE -->muted<!-- ENDIF ../current -->"></i>
+					</div>
+					{../browser} {../version} on {../platform}<br />
+					<small class="timeago text-muted" title="{../datetimeISO}"></small>
+					<ul>
+						<li><strong>[[global:ip_address]]</strong>: {../ip}</li>
+					</ul>
+        </li>
+        <!-- END sessions -->
+      </ul>
+    </div>
+	</div>
+	<!-- ENDIF sessions.length -->
+</div> 
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 5a0908c..49ffaf5 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -6,13 +6,13 @@
 
 			<!-- IF allowUserHomePage -->
 			<div class="card">
-	            <div class="card-header">
-	            	[[user:select-homepage]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="form-group fg-line">
-		            	<div class="select">
-			            	<label for="dailyDigestFreq">[[user:homepage]]</label>
+	      <div class="card-header">
+	        [[user:select-homepage]]
+	      </div>
+	      <div class="card-body card-padding">
+	        <div class="form-group fg-line">
+		        <div class="select">
+			        <label for="dailyDigestFreq">[[user:homepage]]</label>
 							<select class="form-control" id="homePageRoute" data-property="homePageRoute">
 								<option value="none">None</option>
 								<!-- BEGIN homePageRoutes -->
@@ -30,92 +30,86 @@
 						</div>
 						<small>[[user:custom_route_help]]</small>
 					</div>
-	            </div>
-	        </div>
+	      </div>
+	    </div>
 			<!-- ENDIF allowUserHomePage -->
 
 			<div class="card">
-	            <div class="card-header">
-	            	[[user:browsing]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="openOutgoingLinksInNewTab" <!-- IF settings.openOutgoingLinksInNewTab -->checked<!-- ENDIF settings.openOutgoingLinksInNewTab -->>
-	                        <i class="input-helper"></i>
-	                        [[user:open_links_in_new_tab]]
-	                    </label>
-	                </div>
-	                <!-- IF inTopicSearchAvailable -->
-	                <div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="topicSearchEnabled" <!-- IF settings.topicSearchEnabled -->checked<!-- ENDIF settings.topicSearchEnabled -->>
-	                        <i class="input-helper"></i>
-	                        [[user:enable_topic_searching]]
-	                    </label>
-	                </div>
-	                <small class="help-block">[[user:topic_search_help]]</small>
-	                <!-- ENDIF inTopicSearchAvailable -->
-	                <div class="checkbox">
-	                	<label>
-	                        <input type="checkbox" data-property="scrollToMyPost" <!-- IF settings.scrollToMyPost -->checked<!-- ENDIF settings.scrollToMyPost -->>
-	                        <i class="input-helper"></i>
-	                        [[user:scroll_to_my_post]]
-	                    </label>
-	                </div>
-	                <div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="delayImageLoading" <!-- IF settings.delayImageLoading -->checked<!-- ENDIF settings.delayImageLoading -->>
-	                        <i class="input-helper"></i>
-	                        [[user:delay_image_loading]]
-	                    </label>
-	                </div>
-	                <small class="help-block">[[user:image_load_delay_help]]</small>
-	            </div>
+	      <div class="card-header">
+	        [[user:browsing]]
+	      </div>
+	      <div class="card-body card-padding">
+	        <div class="checkbox">
+	          <label>
+							<input type="checkbox" data-property="openOutgoingLinksInNewTab" <!-- IF settings.openOutgoingLinksInNewTab -->checked<!-- ENDIF settings.openOutgoingLinksInNewTab -->>
+							<i class="input-helper"></i>
+							[[user:open_links_in_new_tab]]
+						</label>
 	        </div>
-
-	        <div class="card">
-	            <div class="card-header">
-	            	[[global:privacy]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<!-- IF !hideEmail -->
-	            	<div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->>
-	                        <i class="input-helper"></i>
-	                        [[user:show_email]]
-	                    </label>
-	                </div>
-	                <!-- ENDIF !hideEmail -->
-	                <!-- IF !hideFullname -->
-	                <div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->>
-	                        <i class="input-helper"></i>
-	                        [[user:show_fullname]]
-	                    </label>
-	                </div>
-	                <!-- ENDIF !hideFullname -->
-	                <div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="restrictChat" <!-- IF settings.restrictChat -->checked<!-- ENDIF settings.restrictChat -->>
-	                        <i class="input-helper"></i>
-	                        [[user:restrict_chats]]
-	                    </label>
-	                </div>
-	            </div>
+	        <!-- IF inTopicSearchAvailable -->
+	        <div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="topicSearchEnabled" <!-- IF settings.topicSearchEnabled -->checked<!-- ENDIF settings.topicSearchEnabled -->>
+							<i class="input-helper"></i>
+							[[user:enable_topic_searching]]
+						</label>
 	        </div>
+	        <small class="help-block">[[user:topic_search_help]]</small>
+	        <!-- ENDIF inTopicSearchAvailable -->
+	        <div class="checkbox">
+	          <label>
+	            <input type="checkbox" data-property="scrollToMyPost" <!-- IF settings.scrollToMyPost -->checked<!-- ENDIF settings.scrollToMyPost -->>
+	            <i class="input-helper"></i>
+	            [[user:scroll_to_my_post]]
+	          </label>
+	        </div>
+	      </div>
+	    </div>
+
+	    <div class="card">
+				<div class="card-header">
+					[[global:privacy]]
+				</div>
+				<div class="card-body card-padding">
+					<!-- IF !hideEmail -->
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->>
+							<i class="input-helper"></i>
+							[[user:show_email]]
+						</label>
+					</div>
+	        <!-- ENDIF !hideEmail -->
+					<!-- IF !hideFullname -->
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->>
+							<i class="input-helper"></i>
+							[[user:show_fullname]]
+						</label>
+					</div>
+					<!-- ENDIF !hideFullname -->
+					<!-- IF !config.disableChat -->
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="restrictChat" <!-- IF settings.restrictChat -->checked<!-- ENDIF settings.restrictChat -->>
+							<i class="input-helper"></i>
+							[[user:restrict_chats]]
+						</label>
+					</div>
+					<!-- ENDIF !config.disableChat -->
+	      </div>
+	    </div>
 
-	        <!-- IF !disableEmailSubscriptions -->
+	    <!-- IF !disableEmailSubscriptions -->
 			<div class="card">
-	            <div class="card-header">
-	            	[[global:email]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="form-group fg-line">
-		            	<div class="select">
-			            	<label for="dailyDigestFreq">[[user:digest_label]]</label>
+				<div class="card-header">
+					[[global:email]]
+				</div>
+				<div class="card-body card-padding">
+					<div class="form-group fg-line">
+						<div class="select">
+							<label for="dailyDigestFreq">[[user:digest_label]]</label>
 							<select class="form-control" id="dailyDigestFreq" data-property="dailyDigestFreq">
 								<!-- BEGIN dailyDigestFreqOptions -->
 								<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
@@ -124,73 +118,82 @@
 						</div>
 					</div>
 					<small>[[user:digest_description]]</small>
-	            </div>
-	        </div>
-	        <!-- ENDIF !disableEmailSubscriptions -->
+	      </div>
+	    </div>
+	    <!-- ENDIF !disableEmailSubscriptions -->
 
-	        <div class="card">
-	            <div class="card-header">
-	            	[[topic:watch]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="followTopicsOnCreate" <!-- IF settings.followTopicsOnCreate -->checked <!-- ENDIF settings.followTopicsOnCreate -->>
-	                        <i class="input-helper"></i>
-	                        [[user:follow_topics_you_create]]
-	                    </label>
-	                </div>
-	                <div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->>
-	                        <i class="input-helper"></i>
-	                        [[user:follow_topics_you_reply_to]]
-	                    </label>
-	                </div>
-	            </div>
-	        </div>
+	    <div class="card">
+				<div class="card-header">
+					[[topic:watch]]
+				</div>
+	      <div class="card-body card-padding">
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="followTopicsOnCreate" <!-- IF settings.followTopicsOnCreate -->checked <!-- ENDIF settings.followTopicsOnCreate -->>
+							<i class="input-helper"></i>
+							[[user:follow_topics_you_create]]
+						</label>
+					</div>
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->>
+							<i class="input-helper"></i>
+							[[user:follow_topics_you_reply_to]]
+						</label>
+					</div>
+					<div class="form-group fg-line">
+				    <div class="select">
+							<label>[[user:default-category-watch-state]]</label>
+							<select class="form-control" data-property="categoryWatchState">
+								<option value="watching" <!-- IF categoryWatchState.watching -->selected<!-- ENDIF categoryWatchState.watching -->>[[category:watching]]</option>
+								<option value="notwatching" <!-- IF categoryWatchState.notwatching -->selected<!-- ENDIF categoryWatchState.notwatching -->>[[category:not-watching]]</option>
+								<option value="ignoring" <!-- IF categoryWatchState.ignoring -->selected<!-- ENDIF categoryWatchState.ignoring -->>[[category:ignoring]]</option>
+							</select>
+						</div>
+					</div>
+	      </div>
+	    </div>
 
-	        <div class="card">
-	            <div class="card-header">
-	            	[[global:pagination]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="checkbox">
-	                    <label>
-	                        <input type="checkbox" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->>
-	                        <i class="input-helper"></i>
-	                        [[user:paginate_description]]
-	                    </label>
-	                </div>
+	    <div class="card">
+				<div class="card-header">
+					[[global:pagination]]
+				</div>
+	      <div class="card-body card-padding">
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->>
+							<i class="input-helper"></i>
+							[[user:paginate_description]]
+						</label>
+					</div>
 
 					<div class="form-group">
-                        <div class="fg-line">
-                        	<label>[[user:topics_per_page]] ([[user:max_items_per_page, {maxTopicsPerPage}]])</label>
-                            <input type="text" class="form-control" data-property="topicsPerPage" value="{settings.topicsPerPage}">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="fg-line">
-                        	<label>[[user:posts_per_page]] ([[user:max_items_per_page, {maxPostsPerPage}]])</label>
-                            <input type="text" class="form-control" data-property="postsPerPage" value="{settings.postsPerPage}">
-                        </div>
-                    </div>
+						<div class="fg-line">
+							<label>[[user:topics_per_page]] ([[user:max_items_per_page, {maxTopicsPerPage}]])</label>
+							<input type="text" class="form-control" data-property="topicsPerPage" value="{settings.topicsPerPage}">
+						</div>
+          </div>
 
-	            </div>
-	        </div>
+					<div class="form-group">
+						<div class="fg-line">
+							<label>[[user:posts_per_page]] ([[user:max_items_per_page, {maxPostsPerPage}]])</label>
+							<input type="text" class="form-control" data-property="postsPerPage" value="{settings.postsPerPage}">
+						</div>
+					</div>
+	      </div>
+	    </div>
 
-	        <div class="card">
-	            <div class="card-header">
-	            	[[user:notifications_and_sounds]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<!-- BEGIN notificationSettings -->
-	            	<div class="row">
-	            		<div class="col-xs-12">
-	            			<div class="form-group fg-line">
-				            	<div class="select">
-				            		<label for="notification">{notificationSettings.label}</label>
+			<div class="card">
+				<div class="card-header">
+					[[user:notifications_and_sounds]]
+				</div>
+				<div class="card-body card-padding">
+					<!-- BEGIN notificationSettings -->
+					<div class="row">
+						<div class="col-xs-12">
+							<div class="form-group fg-line">
+								<div class="select">
+									<label for="notification">{notificationSettings.label}</label>
 									<select class="form-control" data-property="{notificationSettings.name}">
 										<option value="none" <!-- IF notificationSettings.none -->selected<!-- ENDIF notificationSettings.none -->>[[notifications:none]]</option>
 										<option value="notification" <!-- IF notificationSettings.notification -->selected<!-- ENDIF notificationSettings.notification -->>[[notifications:notification_only]]</option>
@@ -199,15 +202,15 @@
 									</select>
 								</div>
 							</div>
-	            		</div>
-	            	</div>
-	            	<!-- END notificationSettings -->
+	          </div>
+	        </div>
+	        <!-- END notificationSettings -->
 
 					<div class="row">
-	            		<div class="col-xs-12">
-	            			<div class="form-group fg-line">
-				            	<div class="select">
-				            		<label for="upvote-notif-freq">[[user:upvote-notif-freq]]</label>
+						<div class="col-xs-12">
+							<div class="form-group fg-line">
+								<div class="select">
+									<label for="upvote-notif-freq">[[user:upvote-notif-freq]]</label>
 									<select class="form-control" id="upvote-notif-freq" name="upvote-notif-freq" data-property="upvoteNotifFreq">
 										<!-- BEGIN upvoteNotifFreq -->
 										<option value="{upvoteNotifFreq.name}" <!-- IF upvoteNotifFreq.selected -->selected<!-- ENDIF upvoteNotifFreq.selected -->>
@@ -217,14 +220,14 @@
 									</select>
 								</div>
 							</div>
-	            		</div>
-	            	</div>
+	          </div>
+	        </div>
 
-	            	<div class="row">
-	            		<div class="col-xs-10">
-			            	<div class="form-group fg-line">
-				            	<div class="select">
-				            		<label for="notification">[[user:notification-sound]]</label>
+	        <div class="row">
+						<div class="col-xs-10">
+							<div class="form-group fg-line">
+								<div class="select">
+									<label for="notification">[[user:notification-sound]]</label>
 									<select class="form-control" id="notification" name="notification" data-property="notificationSound">
 										<option value="">[[user:no-sound]]</option>
 										<!-- BEGIN notificationSound -->
@@ -238,12 +241,13 @@
 							<button type="button" class="btn btn-sm btn-primary" data-action="play"><span class="hidden-xs">[[global:play]] </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
-
+					
+					<!-- IF !config.disableChat -->
 					<div class="row">
-	            		<div class="col-xs-10">
-			            	<div class="form-group fg-line">
-				            	<div class="select">
-				            		<label for="chat-incoming">[[user:incoming-message-sound]]</label>
+						<div class="col-xs-10">
+							<div class="form-group fg-line">
+								<div class="select">
+									<label for="chat-incoming">[[user:incoming-message-sound]]</label>
 									<select class="form-control" id="chat-incoming" name="chat-incoming" data-property="incomingChatSound">
 										<option value="">[[user:no-sound]]</option>
 										<!-- BEGIN incomingChatSound -->
@@ -257,12 +261,13 @@
 							<button type="button" class="btn btn-sm btn-primary" data-action="play"><span class="hidden-xs">[[global:play]] </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
+					<!-- ENDIF !config.disableChat -->
 
 					<div class="row">
-	            		<div class="col-xs-10">
-			            	<div class="form-group fg-line">
-				            	<div class="select">
-				            		<label for="chat-outgoing">[[user:outgoing-message-sound]]</label>
+						<div class="col-xs-10">
+							<div class="form-group fg-line">
+								<div class="select">
+									<label for="chat-outgoing">[[user:outgoing-message-sound]]</label>
 									<select class="form-control" id="chat-outgoing" name="chat-outgoing" data-property="outgoingChatSound">
 										<option value="">[[user:no-sound]]</option>
 										<!-- BEGIN outgoingChatSound -->
@@ -276,16 +281,16 @@
 							<button type="button" class="btn btn-sm btn-primary" data-action="play"><span class="hidden-xs">[[global:play]] </span><i class="fa fa-play"></i></button>
 						</div>
 					</div>
-	            </div>
-	        </div>
+	      </div>
+	    </div>
 
 			<div class="card">
-	            <div class="card-header">
-	            	[[global:language]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="form-group fg-line">
-		            	<div class="select">
+				<div class="card-header">
+					[[global:language]]
+				</div>
+				<div class="card-body card-padding">
+					<div class="form-group fg-line">
+						<div class="select">
 							<select data-property="userLang" class="form-control">
 								<!-- BEGIN languages -->
 								<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
@@ -293,18 +298,18 @@
 							</select>
 						</div>
 					</div>
-	            </div>
-	        </div>
+	      </div>
+	    </div>
 
-	        <!-- IF isAdmin -->
-	        <!-- IF isSelf -->
-	        <div class="card">
-	            <div class="card-header">
-	            	[[user:acp_language]]
-	            </div>
-	            <div class="card-body card-padding">
-	            	<div class="form-group fg-line">
-		            	<div class="select">
+			<!-- IF isAdmin -->
+			<!-- IF isSelf -->
+			<div class="card">
+				<div class="card-header">
+					[[user:acp_language]]
+				</div>
+				<div class="card-body card-padding">
+					<div class="form-group fg-line">
+						<div class="select">
 							<select data-property="acpLang" class="form-control">
 								<!-- BEGIN acpLanguages -->
 								<option value="{acpLanguages.code}" <!-- IF acpLanguages.selected -->selected<!-- ENDIF acpLanguages.selected -->>{acpLanguages.name} ({acpLanguages.code})</option>
@@ -312,10 +317,10 @@
 							</select>
 						</div>
 					</div>
-	            </div>
-	        </div>
-	        <!-- ENDIF isSelf -->
-	        <!-- ENDIF isAdmin -->
+				</div>
+			</div>
+			<!-- ENDIF isSelf -->
+			<!-- ENDIF isAdmin -->
 
 			<!-- BEGIN customSettings -->
 			<div class="card">
diff --git a/templates/account/uploads.tpl b/templates/account/uploads.tpl
index 7917911..05d911a 100644
--- a/templates/account/uploads.tpl
+++ b/templates/account/uploads.tpl
@@ -2,51 +2,49 @@
 <div class="account">
 	<!-- IMPORT partials/account/header.tpl -->
 	<div class="row">
-	    <div class="col-md-12">
+	  <div class="col-md-12">
 			<div class="card">
-			    <div class="card-header ch-alt">
+				<div class="card-header ch-alt">
 					<h4>{title}</h4>
 				</div>
 				<div class="card-body card-padding">
+					<!-- IF privateUploads -->
+					<div class="alert alert-info text-center">[[uploads:private-uploads-info]]</div>
+					<!-- ELSE -->
+					<div class="alert alert-info text-center">[[uploads:public-uploads-info]]</div>
+					<!-- ENDIF privateUploads -->
 
-                    <!-- IF privateUploads -->
-                    <div class="alert alert-info text-center">[[uploads:private-uploads-info]]</div>
-                    <!-- ELSE -->
-                    <div class="alert alert-info text-center">[[uploads:public-uploads-info]]</div>
-                    <!-- ENDIF privateUploads -->
-
-            		<!-- IF !uploads.length -->
-            		<div class="alert alert-warning text-center">[[uploads:no-uploads-found]]</div>
-            		<!-- ELSE -->
-            		<div class="col-xs-12">
-                        <table class="table table-striped">
-                            <thead>
-                                <tr>
-                                    <th></th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <!-- BEGIN uploads -->
-                                <tr data-name="{uploads.name}">
-                                    <td>
-                                        <a href="{config.relative_path}{uploads.url}">{uploads.url}</a>
-                                    </td>
-                                    <td>
-                                        <div class="btn-group ">
-                                            <button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-trash"></i></button>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <!-- END uploads -->
-                            </tbody>
-                        </table>
-
-            			<!-- IMPORT partials/paginator.tpl -->
-            		</div>
-            		<!-- ENDIF !uploads.length -->
-            	</div>
-	        </div>
+					<!-- IF !uploads.length -->
+					<div class="alert alert-warning text-center">[[uploads:no-uploads-found]]</div>
+					<!-- ELSE -->
+					<div class="col-xs-12">
+            <table class="table table-striped">
+							<thead>
+								<tr>
+									<th></th>
+									<th></th>
+								</tr>
+							</thead>
+							<tbody>
+								<!-- BEGIN uploads -->
+								<tr data-name="{uploads.name}">
+									<td>
+										<a href="{config.relative_path}{uploads.url}">{uploads.url}</a>
+									</td>
+									<td>
+										<div class="btn-group ">
+											<button class="btn btn-danger btn-xs" data-action="delete"><i class="fa fa-trash"></i></button>
+										</div>
+									</td>
+								</tr>
+								<!-- END uploads -->
+							</tbody>
+            </table>
+            <!-- IMPORT partials/paginator.tpl -->
+          </div>
+          <!-- ENDIF !uploads.length -->
+        </div>
 	    </div>
+	  </div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/admin/plugins/material.tpl b/templates/admin/plugins/material.tpl
index 22cd6bb..1a8bf8e 100644
--- a/templates/admin/plugins/material.tpl
+++ b/templates/admin/plugins/material.tpl
@@ -51,5 +51,5 @@
 </div>
 	
 <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-    <i class="material-icons">save</i>
+  <i class="material-icons">save</i>
 </button>
\ No newline at end of file
diff --git a/templates/categories.tpl b/templates/categories.tpl
index 0100e64..deeb73c 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -10,18 +10,18 @@
 			<!-- ENDIF categories.link -->
 				<div class="category-card-body">
 					<ul class="category-counts pull-right">
-	                    <li>
-	                        <i class="fa fa-book"></i><span class="human-readable-number" title="{categories.totalTopicCount}"></span>
-	                    </li>
-	                    <li>
-	                        <i class="fa fa-pencil"></i><span class="human-readable-number" title="{categories.totalPostCount}"></span>
-	                    </li>
-	                </ul>
-					<h4>
-						{categories.name} <!-- IF categories.icon -->
-								<i class="fa {categories.icon} fa-fw"></i>
-								<!-- ENDIF categories.icon -->
-					</h4>
+						<li>
+							<i class="fa fa-book"></i><span class="human-readable-number" title="{categories.totalTopicCount}"></span>
+						</li>
+						<li>
+							<i class="fa fa-pencil"></i><span class="human-readable-number" title="{categories.totalPostCount}"></span>
+						</li>
+					</ul>
+						<h4>
+							{categories.name} <!-- IF categories.icon -->
+							<i class="fa {categories.icon} fa-fw"></i>
+							<!-- ENDIF categories.icon -->
+						</h4>
 					<div class="category-description">{categories.descriptionParsed}</div>
 				</div>
 			</a>
@@ -30,13 +30,13 @@
 				<!-- IF @first -->
 				<div component="category/posts">
 					<div class="pull-left hidden-xs user-avatar">
-				    	<a href="{config.relative_path}/user/{categories.posts.user.userslug}">
-				        	<!-- IF categories.posts.user.picture -->
-		                    <img class="user-avatar" src="{categories.posts.user.picture}" alt="{categories.posts.user.username}" title="{categories.posts.user.username}"/>
-		                    <!-- ELSE -->
-		                    <div class="user-icon" title="{categories.posts.user.username}" style="background-color: {categories.posts.user.icon:bgColor};">{categories.posts.user.icon:text}</div>
-		                    <!-- ENDIF categories.posts.user.picture -->
-				    	</a>
+						<a href="{config.relative_path}/user/{categories.posts.user.userslug}">
+							<!-- IF categories.posts.user.picture -->
+							<img class="user-avatar" src="{categories.posts.user.picture}" alt="{categories.posts.user.username}" title="{categories.posts.user.username}"/>
+							<!-- ELSE -->
+							<div class="user-icon" title="{categories.posts.user.username}" style="background-color: {categories.posts.user.icon:bgColor};">{categories.posts.user.icon:text}</div>
+							<!-- ENDIF categories.posts.user.picture -->
+						</a>
 					</div>
 					<div class="topic-title">
 						<a href="{config.relative_path}/topic/{categories.posts.topic.slug}/{categories.posts.index}">{categories.posts.topic.title}</a>
@@ -60,20 +60,21 @@
 				<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}">
-				        	<i class="fa fa-fw {categories.icon}"></i>
-				    	</div>
-				    	<div class="media-body">
-				    		<div class="lv-title category-title">
-				    			<!-- IF categories.link -->
+				      <i class="fa fa-fw {categories.icon}"></i>
+				    </div>
+						<div class="media-body">
+							<div class="lv-title category-title">
+								<!-- IF categories.link -->
 								<a href="{categories.link}" itemprop="url" target="_blank">
 								<!-- ELSE -->
 								<a href="{config.relative_path}/category/{categories.slug}" itemprop="url">
 								<!-- ENDIF categories.link -->
-								{categories.name}
-								</a><br />
+									{categories.name}
+								</a>
+								<br />
 								<small class="lv-small">{categories.descriptionParsed}</small>
-				    		</div>
-				    	</div>
+							</div>
+						</div>
 					</div>
 					<div class="col-md-1 hidden-xs hidden-sm">
 						<div class="stat">
@@ -92,13 +93,13 @@
 						<!-- IF @first -->
 						<div component="category/posts">
 							<div class="pull-left hidden-xs user-avatar">
-						    	<a href="{config.relative_path}/user/{categories.posts.user.userslug}">
-						        	<!-- IF categories.posts.user.picture -->
-				                    <img src="{categories.posts.user.picture}" alt="{categories.posts.user.username}"/>
-				                    <!-- ELSE -->
-				                    <div class="user-icon" style="background-color: {categories.posts.user.icon:bgColor};">{categories.posts.user.icon:text}</div>
-				                    <!-- ENDIF categories.posts.user.picture -->
-						    	</a>
+								<a href="{config.relative_path}/user/{categories.posts.user.userslug}">
+									<!-- IF categories.posts.user.picture -->
+									<img src="{categories.posts.user.picture}" alt="{categories.posts.user.username}"/>
+									<!-- ELSE -->
+									<div class="user-icon" style="background-color: {categories.posts.user.icon:bgColor};">{categories.posts.user.icon:text}</div>
+									<!-- ENDIF categories.posts.user.picture -->
+								</a>
 							</div>
 							<div class="media-body">
 								<div class="topic-title">
@@ -115,20 +116,21 @@
 						<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}">
-						        	<i class="fa fa-fw {categories.icon}"></i>
-						    	</div>
-						    	<div class="media-body">
-						    		<div class="lv-title category-title">
-						    			<!-- IF categories.children.link -->
+						      <i class="fa fa-fw {categories.icon}"></i>
+						    </div>
+								<div class="media-body">
+									<div class="lv-title category-title">
+										<!-- IF categories.children.link -->
 										<a href="{categories.children.link}" itemprop="url" target="_blank">
 										<!-- ELSE -->
 										<a href="{config.relative_path}/category/{categories.children.slug}" itemprop="url">
 										<!-- ENDIF categories.children.link -->
-										{categories.children.name}
-										</a><br />
+											{categories.children.name}
+										</a>
+										<br />
 										<small class="lv-small">{categories.children.descriptionParsed}</small>
-						    		</div>
-						    	</div>
+									</div>
+								</div>
 							</div>
 							<div class="col-md-1 hidden-xs hidden-sm">
 								<div class="stat">
@@ -147,13 +149,13 @@
 								<!-- IF @first -->
 								<div component="category/posts">
 									<div class="pull-left hidden-xs user-avatar">
-								    	<a href="{config.relative_path}/user/{categories.children.posts.user.userslug}">
-								        	<!-- IF categories.children.posts.user.picture -->
-						                    <img src="{categories.children.posts.user.picture}" alt="{categories.children.posts.user.username}"/>
-						                    <!-- ELSE -->
-						                    <div class="user-icon" style="background-color: {categories.children.posts.user.icon:bgColor};">{categories.children.posts.user.icon:text}</div>
-						                    <!-- ENDIF categories.children.posts.user.picture -->
-								    	</a>
+										<a href="{config.relative_path}/user/{categories.children.posts.user.userslug}">
+											<!-- IF categories.children.posts.user.picture -->
+											<img src="{categories.children.posts.user.picture}" alt="{categories.children.posts.user.username}"/>
+											<!-- ELSE -->
+											<div class="user-icon" style="background-color: {categories.children.posts.user.icon:bgColor};">{categories.children.posts.user.icon:text}</div>
+											<!-- ENDIF categories.children.posts.user.picture -->
+										</a>
 									</div>
 									<div class="media-body">
 										<div class="topic-title">
diff --git a/templates/category.tpl b/templates/category.tpl
index 620cb0f..1f6b636 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -14,6 +14,11 @@
 						<a href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 						<!-- ENDIF !loggedIn -->
 					<!-- ENDIF privileges.topics:create -->
+
+					<a href="{url}">
+						<div class="alert alert-warning hide" id="new-topics-alert"></div>
+					</a>
+
 					<ul class="lv-actions actions" component="category/controls">
 						<!-- IMPORT partials/category/watch.tpl -->
 						<!-- IMPORT partials/category/tools.tpl -->
@@ -29,10 +34,6 @@
 			<!-- ENDIF privileges.topics:create -->
 			<!-- ENDIF !topics.length -->
 
-			<a href="{url}">
-				<div class="alert alert-warning hide" id="new-topics-alert"></div>
-			</a>
-
 			<!-- IMPORT partials/topics_list.tpl -->
 		</div>
 	</div>
@@ -41,7 +42,6 @@
 	<!-- ENDIF config.usePagination -->
 </div>
 
-<!-- IMPORT partials/move_thread_modal.tpl -->
 <!-- IF !config.usePagination -->
 <noscript>
 	<!-- IMPORT partials/paginator.tpl -->
diff --git a/templates/chats.tpl b/templates/chats.tpl
index eef1033..1d15d07 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -1,44 +1,43 @@
 <div class="chats chats-full">
-    <!-- IMPORT partials/breadcrumbs.tpl -->
-    <div class="card chat-card" id="messages-main">
-        <div component="chat/nav-wrapper" data-loaded="<!-- IF roomId -->1<!-- ELSE -->0<!-- END -->" class="ms-menu">
-            <div class="listview lv-message hidden-xs">
-                <div class="lv-header-alt clearfix">
-                    <div class="new-chat pull-left" title="New Chat">
-                        <i class="fa fa-comments-o"></i>
-                    </div>
-                </div>
-            </div>
-            <ul component="chat/recent" class="listview lv-user chats-list">
-                <!-- BEGIN rooms -->
-                <!-- IMPORT partials/chats/recent_room.tpl -->
-                <!-- END rooms -->
-            </ul>
-        </div>
-         <div class="chat-search-menu">
-            <div class="listview lv-message">
-                <div class="lv-header-alt clearfix">
-                    <div id="chat-search-menu-trigger">
-                        <div class="line-wrap">
-                            <div class="line top"></div>
-                            <div class="line center"></div>
-                            <div class="line bottom"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-     			<div class="fg-line">
-     				<input class="form-control" component="chat/search" type="text" placeholder="[[users:enter_username]]"/>
-     			</div>
+  <!-- IMPORT partials/breadcrumbs.tpl -->
+  <div class="card chat-card" id="messages-main">
+		<div component="chat/nav-wrapper" data-loaded="<!-- IF roomId -->1<!-- ELSE -->0<!-- END -->" class="ms-menu">
+			<div class="listview lv-message hidden-xs">
+				<div class="lv-header-alt clearfix">
+					<div class="new-chat pull-left" title="New Chat">
+						<i class="fa fa-comments-o"></i>
+					</div>
+				</div>
+			</div>
+			<ul component="chat/recent" class="listview lv-user chats-list">
+				<!-- BEGIN rooms -->
+				<!-- IMPORT partials/chats/recent_room.tpl -->
+				<!-- END rooms -->
+			</ul>
+		</div>
+    <div class="chat-search-menu">
+			<div class="listview lv-message">
+				<div class="lv-header-alt clearfix">
+					<div id="chat-search-menu-trigger">
+						<div class="line-wrap">
+							<div class="line top"></div>
+							<div class="line center"></div>
+							<div class="line bottom"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+      <div class="form-group">
+     		<div class="fg-line">
+     			<input class="form-control" component="chat/search" type="text" placeholder="[[users:enter_username]]"/>
      		</div>
-            <ul component="chat/search/list" class="chat-search-list">
-
-    		</ul>
-    	</div>
-
-        <div class="ms-body expanded-chat" component="chat/main-wrapper">
-            <!-- IMPORT partials/chats/message-window.tpl -->
-        </div>
+     	</div>
+      <ul component="chat/search/list" class="chat-search-list">
+    	</ul>
     </div>
+
+		<div class="ms-body expanded-chat" component="chat/main-wrapper">
+			<!-- IMPORT partials/chats/message-window.tpl -->
+		</div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/templates/footer.tpl b/templates/footer.tpl
index 1c05e00..abf54db 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,44 +1,44 @@
-	</div><!-- /.container#content -->
-
-	<div class="hide">
-	<!-- IMPORT 500-embed.tpl -->
-	</div>
-
-	<!-- IF !isSpider -->
-	<div class="topic-search hidden">
-		<div class="btn-group">
-			<button type="button" class="btn btn-default count"></button>
-			<button type="button" class="btn btn-default prev"><i class="fa fa-fw fa-angle-up"></i></button>
-			<button type="button" class="btn btn-default next"><i class="fa fa-fw fa-angle-down"></i></button>
+		</div><!-- /.container#content -->
+
+		<div class="hide">
+		<!-- IMPORT 500-embed.tpl -->
+		</div>
+
+		<!-- IF !isSpider -->
+		<div class="topic-search hidden">
+			<div class="btn-group">
+				<button type="button" class="btn btn-default count"></button>
+				<button type="button" class="btn btn-default prev"><i class="fa fa-fw fa-angle-up"></i></button>
+				<button type="button" class="btn btn-default next"><i class="fa fa-fw fa-angle-down"></i></button>
+			</div>
 		</div>
-	</div>
 
-	<div component="toaster/tray" class="alert-window">
-		<div id="reconnect-alert" class="alert alert-dismissable alert-warning clearfix hide" component="toaster/toast">
-			<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-			<p>[[global:reconnecting-message, {config.siteTitle}]]</p>
+		<div component="toaster/tray" class="alert-window">
+			<div id="reconnect-alert" class="alert alert-dismissable alert-warning clearfix hide" component="toaster/toast">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+				<p>[[global:reconnecting-message, {config.siteTitle}]]</p>
+			</div>
 		</div>
-	</div>
-	<!-- ENDIF !isSpider -->
+		<!-- ENDIF !isSpider -->
 
-	<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+		<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 -->
+		<!-- BEGIN scripts -->
+		<script defer type="text/javascript" src="{scripts.src}"></script>
+		<!-- END scripts -->
 
-	<script>
-		window.addEventListener('load', function () {
-			require(['forum/footer']);
+		<script>
+			window.addEventListener('load', function () {
+				require(['forum/footer']);
 
-			<!-- IF useCustomJS -->
-			{{customJS}}
-			<!-- ENDIF useCustomJS -->
-		});
-	</script>
+				<!-- IF useCustomJS -->
+				{{customJS}}
+				<!-- ENDIF useCustomJS -->
+			});
+		</script>
 
-	<div class="hide">
-	<!-- IMPORT 500-embed.tpl -->
-	</div>
-</body>
+		<div class="hide">
+			<!-- IMPORT 500-embed.tpl -->
+		</div>
+	</body>
 </html>
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 127ca85..3c0e0d5 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -227,11 +227,13 @@
 					</div>
 					<div class="form-group user-title-option">
 						<label>[[groups:details.badge_preview]]</label><br />
-						<span class="label<!-- IF !group.userTitleEnabled --> hide<!-- ENDIF !group.userTitleEnabled -->" style="background-color: {group.labelColor}"><i class="fa<!-- IF group.icon --> {group.icon}<!-- ENDIF group.icon --> icon"></i> <!-- IF group.userTitle -->{group.userTitle}<!-- ELSE -->{group.displayName}<!-- ENDIF group.userTitle --></span>
+						<span class="label<!-- IF !group.userTitleEnabled --> hide<!-- ENDIF !group.userTitleEnabled -->" style="color: {group.textColor}; background-color: {group.labelColor}"><i class="fa<!-- IF group.icon --> {group.icon}<!-- ENDIF group.icon --> icon"></i> <!-- IF group.userTitle -->{group.userTitle}<!-- ELSE -->{group.displayName}<!-- ENDIF group.userTitle --></span>
 
 						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="icon-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_icon]]</button>
-						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button>
+						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="label-color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_label_colour]]</button>
+						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="text-color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_text_colour]]</button>
 						<input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
+						<input type="hidden" name="textColor" value="<!-- IF group.textColor -->{group.textColor}<!-- ENDIF group.textColor -->" />
 						<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
 						<div id="icons" class="hidden">
 							<div class="icon-container">
@@ -262,19 +264,19 @@
 					<!-- ENDIF !allowPrivateGroups -->
 					<small class="help-block">[[groups:details.private_help]]</small>
 					<div class="checkbox">
-	                    <label>
-	                        <input name="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->>
-	                        <i class="input-helper"></i>
-	                        [[groups:details.disableJoinRequests]]
-	                    </label>
-	                </div>
+						<label>
+							<input name="disableJoinRequests" type="checkbox"<!-- IF group.disableJoinRequests --> checked<!-- ENDIF group.disableJoinRequests -->>
+							<i class="input-helper"></i>
+							[[groups:details.disableJoinRequests]]
+						</label>
+					</div>
 					<div class="checkbox">
-	                    <label>
-	                        <input name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->>
-	                        <i class="input-helper"></i>
-	                        [[groups:details.hidden]]
-	                    </label>
-	                </div>
+						<label>
+							<input name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->>
+							<i class="input-helper"></i>
+							[[groups:details.hidden]]
+						</label>
+					</div>
 					<small class="help-block">[[groups:details.hidden_help]]</small>
 
 					<button class="btn btn-link btn-xs pull-right" type="button" data-action="delete">[[groups:details.delete_group]]</button>
diff --git a/templates/header.tpl b/templates/header.tpl
index 734410c..e7754cd 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -2,11 +2,7 @@
 <html lang="{function.localeToHTML, userLang, defaultLang}" <!-- IF languageDirection -->data-dir="{languageDirection}" style="direction: {languageDirection};" <!-- ENDIF languageDirection -->>
 <head>
 	<title>{browserTitle}</title>
-	<!-- BEGIN metaTags -->
-	<!-- IF metaTags.content -->
-	{function.buildMetaTag}
-	<!-- ENDIF metaTags.content -->
-	<!-- END metaTags -->
+	<!-- BEGIN metaTags -->{function.buildMetaTag}<!-- END metaTags -->
 	<link rel="stylesheet" type="text/css" href="{relative_path}/assets/client.css?{config.cache-buster}" />
 	<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->
 
@@ -28,7 +24,16 @@
 </head>
 
 <body class="{bodyClass} theme-{config.selectedSkin}">
-    <!-- IMPORT partials/menu.tpl -->
+		<div id="header-menu">
+			<div class="material-load-bar">
+					<div class="material-bar"></div>
+					<div class="material-bar"></div>
+					<div class="material-bar"></div>
+			</div>
+			<div class="container">
+				<!-- IMPORT partials/menu.tpl -->
+			</div>
+		</div>
 
 	<div class="container" id="content">
 	<!-- IMPORT partials/noscript/warning.tpl -->
\ No newline at end of file
diff --git a/templates/login.tpl b/templates/login.tpl
index f9bb64e..52b8e9f 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,51 +1,53 @@
 <div class="login">
-    <form class="form-horizontal" method="post" target="login" id="login-form">
-        <div class="login-block">
-            <div class="alert alert-danger" id="login-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
-                <button type="button" class="close" data-dismiss="alert">&times;</button>
-                [[login:failed_login_attempt]]
-                <p>{error}</p>
-            </div>
-            <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
-                <div class="fg-line">
-                    <input class="form-control" type="text" name="username" id="username" placeholder="{allowLoginWith}" autocorrect="off" autocapitalize="off" value="{username}" />
-                </div>
-            </div>
+	<form class="form-horizontal" method="post" target="login" id="login-form">
+		<div class="login-block">
+			<div class="alert alert-danger" id="login-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
+				<button type="button" class="close" data-dismiss="alert">&times;</button>
+				[[login:failed_login_attempt]]
+				<p>{error}</p>
+			</div>
+			<div class="input-group">
+				<span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
+				<div class="fg-line">
+					<input class="form-control" type="text" name="username" id="username" placeholder="{allowLoginWith}" autocorrect="off" autocapitalize="off" value="{username}" />
+				</div>
+			</div>
 
-            <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
-                <div class="fg-line">
-                    <input class="form-control" type="password" name="password" id="password" placeholder="[[user:password]]" />
-                </div>
-            </div>
+			<div class="input-group">
+				<span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
+				<div class="fg-line">
+					<input class="form-control" type="password" name="password" id="password" placeholder="[[user:password]]" />
+				</div>
+			</div>
 
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" name="remember" id="remember" checked>
-                    <i class="input-helper"></i>
-                    [[login:remember_me]]
-                </label>
-            </div>
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" name="remember" id="remember" checked>
+					<i class="input-helper"></i>
+					[[login:remember_me]]
+				</label>
+			</div>
 
-            <button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[global:login]]</button>
+			<button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[global:login]]</button>
 
-            <div class="login-options">
-                <!-- IF allowRegistration -->
-                <span>[[login:dont_have_account]] <a href="{config.relative_path}/register">[[register:register]]</a></span>
-                <!-- ENDIF allowRegistration -->
-                &nbsp; <a id="reset-link" href="{config.relative_path}/reset">[[login:forgot_password]]</a>
-            </div>
+			<div class="login-options">
+				<!-- IF allowRegistration -->
+				<span>[[login:dont_have_account]] <a href="{config.relative_path}/register">[[register:register]]</a></span>
+				<!-- ENDIF allowRegistration -->
+				<!-- IF allowPasswordReset -->
+				&nbsp; <a id="reset-link" href="{config.relative_path}/reset">[[login:forgot_password]]</a>
+				<!-- ENDIF allowPasswordReset -->
+			</div>
 
-        </div>
-    </form>
-    <!-- IF alternate_logins -->
-    <div class="login-options">
-        <ul class="alternate-auth">
-        <!-- BEGIN authentication -->
-        <li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-2x"></i></a></li>
-        <!-- END authentication -->
-        </ul>
-    </div>
-    <!-- ENDIF alternate_logins -->
+		</div>
+	</form>
+	<!-- IF alternate_logins -->
+	<div class="login-options">
+			<ul class="alternate-auth">
+			<!-- BEGIN authentication -->
+			<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-2x"></i></a></li>
+			<!-- END authentication -->
+			</ul>
+	</div>
+	<!-- ENDIF alternate_logins -->
 </div>
\ No newline at end of file
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl
index 3a18eec..5b9ca7f 100644
--- a/templates/partials/account/header.tpl
+++ b/templates/partials/account/header.tpl
@@ -1,6 +1,7 @@
 <div class="card user-profile-view" data-uid="{uid}">
 	<div class="card-body cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
 		<!-- IF allowCoverPicture -->
+		<!-- IF canEdit -->
 		<div class="controls">
 			<span class="upload"><i class="fa fa-fw fa-3x fa-upload"></i></span>
 			<span class="resize"><i class="fa fa-fw fa-3x fa-arrows"></i></span>
@@ -8,22 +9,22 @@
 		</div>
 		<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
 		<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
+		<!-- ENDIF canEdit -->
 		<!-- ENDIF allowCoverPicture -->
 	</div>
 
 	<div class="card-footer">
 		<div class="profile-pic">
-	        <div class="user-icon profile-header-img" style="<!-- IF picture -->background-image: url({picture});  background-size: cover; background-repeat: no-repeat; background-position: center center;<!-- ELSE -->background-color: {icon:bgColor};<!-- ENDIF picture -->"><!-- IF !picture -->{icon:text}<!-- ENDIF !picture -->
-	        </div>
-	        <span component="user/status" class="status {status}" title="[[global:{status}]]"></span>
-        </div>
+	    <div class="user-icon profile-header-img" style="<!-- IF picture -->background-image: url({picture});  background-size: cover; background-repeat: no-repeat; background-position: center center;<!-- ELSE -->background-color: {icon:bgColor};<!-- ENDIF picture -->"><!-- IF !picture -->{icon:text}<!-- ENDIF !picture --></div>
+	    <span component="user/status" class="status {status}" title="[[global:{status}]]"></span>
+    </div>
 
-        <div class="user-info">
-	        <h3 class="fullname"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></h3>
+    <div class="user-info">
+	    <h3 class="fullname"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></h3>
 			<h4 class="username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></h4>
 		</div>
 
-        <!-- IF template.account/profile -->
+    <!-- IF template.account/profile -->
 		<div class="account-stats">
 			<!-- IF !reputation:disabled -->
 			<div class="stat">
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl
index ce4d3f2..c12dfd4 100644
--- a/templates/partials/account/menu.tpl
+++ b/templates/partials/account/menu.tpl
@@ -16,7 +16,7 @@
 		<li>
   			<a component="account/flag" href="#">[[user:flag-profile]]</a>
   		</li>
-  		<li>
+  	<li>
 			<a component="account/block" href="#"><!-- IF !../isBlocked -->[[user:block_user]]<!-- ELSE -->[[user:unblock_user]]<!-- END --></a>
 		</li>
 		<!-- ENDIF !banned -->
diff --git a/templates/partials/category-filter.tpl b/templates/partials/category-filter.tpl
new file mode 100644
index 0000000..0c4729b
--- /dev/null
+++ b/templates/partials/category-filter.tpl
@@ -0,0 +1,19 @@
+<div component="category/dropdown" class="btn-group category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+    <!-- IF selectedCategory --><span class="fa-stack" style="{function.generateCategoryBackground, selectedCategory}"><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span> {selectedCategory.name}<!-- ELSE -->
+    [[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
+  </button>
+  <div component="category-selector-search" class="hidden">
+    <input type="text" class="form-control" autocomplete="off">
+  </div>
+  <ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
+    <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 -->
+    <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}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><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 -->
+  </ul>
+</div>
\ No newline at end of file
diff --git a/templates/partials/category/sort.tpl b/templates/partials/category/sort.tpl
index 2817e38..8d977b7 100644
--- a/templates/partials/category/sort.tpl
+++ b/templates/partials/category/sort.tpl
@@ -1,10 +1,10 @@
 <!-- IF loggedIn -->
 <li class="dropdown" component="thread/sort">
-    <span class="thread-sort" data-toggle="dropdown" aria-expanded="true"><i class="fa fa-sort-amount-desc"></i></span>
-    <ul class="dropdown-menu pull-right">
-        <li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
-		<li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
-		<li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
-    </ul>
+  <span class="thread-sort" data-toggle="dropdown" aria-expanded="true"><i class="fa fa-sort-amount-desc"></i></span>
+  <ul class="dropdown-menu pull-right">
+    <li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
+    <li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
+    <li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
+  </ul>
 </li>
 <!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 4ef8d68..f55a761 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -4,42 +4,43 @@
 	<div class="card">
 		<div class="listview lv-bordered lv-lg">
 			<div class="lv-header-alt">
-			<div class="lv-title">
-				[[category:subcategories]]
-			</div>
+				<div class="lv-title">
+					[[category:subcategories]]
+				</div>
 			</div>
 			<div class="lv-body">
 				<!-- BEGIN children -->
 				<div class="lv-item media row clearfix">
 					<div class="pull-left" style="{function.generateCategoryBackground}">
-			        	<i class="fa fa-fw {children.icon}"></i>
-			    	</div>
-			    	<div class="media-body">
-			    		<div class="lv-title">
-			    			<!-- IF children.link -->
+			      <i class="fa fa-fw {children.icon}"></i>
+			    </div>
+			    <div class="media-body">
+			    	<div class="lv-title">
+			    		<!-- IF children.link -->
 							<a href="{children.link}" itemprop="url" target="_blank">
 							<!-- ELSE -->
 							<a href="{config.relative_path}/category/{children.slug}" itemprop="url">
 							<!-- ENDIF children.link -->
-							{children.name}
-							</a><br />
+								{children.name}
+							</a>
+							<br />
 							<small class="lv-small">{children.descriptionParsed}</small>
-			    		</div>
-			    		<!-- IF !children.link -->
-			    		<div class="lv-actions hidden-xs hidden-sm">
-			    			<ul>
-			    				<li>
-			    					{children.totalTopicCount}
+			    	</div>
+			    	<!-- IF !children.link -->
+			    	<div class="lv-actions hidden-xs hidden-sm">
+			    		<ul>
+			    			<li>
+			    				{children.totalTopicCount}
 									<small>[[global:topics]]</small>
-			    				</li>
-			    				<li>
-			    					{children.totalPostCount}
+			    			</li>
+			    			<li>
+			    				{children.totalPostCount}
 									<small>[[global:posts]]</small>
-			    				</li>
-			    			</ul>
-			    		</div>
-			    		<!-- ENDIF !children.link -->
+			    			</li>
+			    		</ul>
 			    	</div>
+			    	<!-- ENDIF !children.link -->
+			    </div>
 				</div>
 				<!-- END children -->
 			</div>
@@ -63,17 +64,17 @@
 
 				<div class="category-card-body">
 					<ul class="category-counts pull-right">
-	                    <li>
-	                        <i class="fa fa-book"></i><span class="human-readable-number" title="{children.totalTopicCount}"></span>
-	                    </li>
-	                    <li>
-	                        <i class="fa fa-pencil"></i><span class="human-readable-number" title="{children.totalPostCount}"></span>
-	                    </li>
-	                </ul>
+						<li>
+							<i class="fa fa-book"></i><span class="human-readable-number" title="{children.totalTopicCount}"></span>
+						</li>
+						<li>
+							<i class="fa fa-pencil"></i><span class="human-readable-number" title="{children.totalPostCount}"></span>
+						</li>
+					</ul>
 					<h4>
 						{children.name} <!-- IF children.icon -->
-								<i class="fa {children.icon} fa-fw"></i>
-								<!-- ENDIF children.icon -->
+						<i class="fa {children.icon} fa-fw"></i>
+						<!-- ENDIF children.icon -->
 					</h4>
 					<small>{children.descriptionParsed}</small>
 				</div>
@@ -82,13 +83,13 @@
 				<!-- BEGIN posts -->				
 				<div component="category/posts">
 					<div class="pull-left hidden-xs user-avatar">
-				    	<a href="{config.relative_path}/user/{children.posts.user.userslug}">
-				        	<!-- IF children.posts.user.picture -->
-  							<img class="user-avatar" src="{children.posts.user.picture}" title="{children.posts.user.username}" />
+						<a href="{config.relative_path}/user/{children.posts.user.userslug}">
+							<!-- IF children.posts.user.picture -->
+							<img class="user-avatar" src="{children.posts.user.picture}" title="{children.posts.user.username}" />
 							<!-- ELSE -->
 							<div class="user-icon user-icon" title="{children.posts.user.username}" style="background-color: {children.posts.user.icon:bgColor}">{children.posts.user.icon:text}</div>
 							<!-- ENDIF children.posts.user.picture -->
-				    	</a>
+						</a>
 					</div>
 					<div class="topic-title">
 						<a href="{config.relative_path}/topic/{children.posts.topic.slug}">{children.posts.topic.title}</a>
diff --git a/templates/partials/category/tools.tpl b/templates/partials/category/tools.tpl
index d2c7606..dd4a966 100644
--- a/templates/partials/category/tools.tpl
+++ b/templates/partials/category/tools.tpl
@@ -1,8 +1,8 @@
 <!-- IF privileges.editable -->
 <li class="dropdown thread-tools">
-    <span data-toggle="dropdown" aria-expanded="true"><i class="fa fa-cog"></i></span>
-    <ul class="dropdown-menu pull-right">
-    	<li>
+  <span data-toggle="dropdown" aria-expanded="true"><i class="fa fa-cog"></i></span>
+  <ul class="dropdown-menu pull-right">
+    <li>
 			<a component="topic/mark-unread-for-all" href="#">
 				<i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]
 			</a>
@@ -70,6 +70,6 @@
 			<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
 		</li>
 		<!-- END thread_tools -->
-    </ul>
+  </ul>
 </li>
 <!-- ENDIF privileges.editable -->
\ No newline at end of file
diff --git a/templates/partials/category/watch.tpl b/templates/partials/category/watch.tpl
index 4628b28..1607a74 100644
--- a/templates/partials/category/watch.tpl
+++ b/templates/partials/category/watch.tpl
@@ -1,14 +1,14 @@
 <!-- IF loggedIn -->
 <li class="dropdown" component="topic/watch">
-    <span data-toggle="dropdown" aria-expanded="true" component="category/watching/menu" <!-- IF isIgnored -->class="hidden"<!-- ENDIF isIgnored -->><i class="fa fa-fw fa-eye"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:watching]]</span></span>
-
-	<span data-toggle="dropdown" aria-expanded="true" component="category/ignoring/menu" <!-- IF !isIgnored -->class="hidden"<!-- ENDIF !isIgnored -->><i class="fa fa-fw fa-eye-slash"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:ignoring]]</span></span>
-
+  <span component="category/watching/menu" <!-- IF !../isWatched -->class="hidden"<!-- ENDIF !../isWatched -->><i class="fa fa-fw fa-inbox"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:watching]]</span></span>
+	<span component="category/notwatching/menu" <!-- IF !../isNotWatched -->class="hidden"<!-- ENDIF !../isNotWatched -->><i class="fa fa-fw fa-clock-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:not-watching]]</span></span>
+  <span component="category/ignoring/menu" <!-- IF !../isIgnored -->class="hidden"<!-- ENDIF !../isIgnored -->><i class="fa fa-fw fa-eye-slash"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:ignoring]]</span></span>
 	<span data-toggle="dropdown" aria-expanded="true" class="caret"></span>
     
-    <ul class="dropdown-menu pull-right">
-        <li><a href="#" component="category/watching"><i component="category/watching/check" class="fa fa-fw <!-- IF !isIgnored -->fa-check<!-- ENDIF !isIgnored -->"></i><i class="fa fa-fw fa-eye"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
-		<li><a href="#" component="category/ignoring"><i component="category/ignoring/check" class="fa fa-fw <!-- IF isIgnored -->fa-check<!-- ENDIF isIgnored -->"></i><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
-    </ul>
+  <ul class="dropdown-menu pull-right">
+    <li><a href="#" component="category/watching" data-state="watching"><i component="category/watching/check" class="fa fa-fw <!-- IF ../isWatched -->fa-check<!-- ENDIF ../isWatched -->"></i><i class="fa fa-fw fa-inbox"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
+		<li><a href="#" component="category/notwatching" data-state="notwatching"><i component="category/notwatching/check" class="fa fa-fw <!-- IF ../isNotWatched -->fa-check<!-- ENDIF ../isNotWatched -->"></i><i class="fa fa-fw fa-clock-o"></i> [[category:not-watching]]<p class="help-text"><small>[[category:not-watching.description]]</small></p></a></li>
+		<li><a href="#" component="category/ignoring" data-state="ignoring"><i component="category/ignoring/check" class="fa fa-fw <!-- IF ../isIgnored -->fa-check<!-- ENDIF ../isIgnored -->"></i><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
+  </ul>
 </li>
 <!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/chats/dropdown.tpl b/templates/partials/chats/dropdown.tpl
index 3db93d3..fa113fb 100644
--- a/templates/partials/chats/dropdown.tpl
+++ b/templates/partials/chats/dropdown.tpl
@@ -1,21 +1,21 @@
 <!-- IF rooms.length -->
 <!-- BEGIN rooms -->
 <li class="<!-- IF rooms.unread -->unread<!-- ENDIF rooms.unread -->" data-roomId="{rooms.roomId}">
-    <a data-ajaxify="false">
-        <!-- IF rooms.lastUser -->
+  <a data-ajaxify="false">
+    <!-- IF rooms.lastUser -->
 		<!-- IF rooms.lastUser.picture -->
 		<img class="user-picture" src="{rooms.lastUser.picture}" title="{rooms.lastUser.username}" />
 		<!-- ELSE -->
 		<div class="user-icon" style="background-color: {rooms.lastUser.icon:bgColor}">{rooms.lastUser.icon:text}</div>
 		<!-- ENDIF rooms.lastUser.picture -->
-	<!-- ENDIF rooms.lastUser -->
+		<!-- ENDIF rooms.lastUser -->
 
-	<!-- IF rooms.lastUser -->
-	{rooms.usernames}
-	<!-- ELSE -->
-	[[modules:chat.no-users-in-room]]
-	<!-- ENDIF rooms.lastUser -->
-    </a>
+		<!-- IF rooms.lastUser -->
+		{rooms.usernames}
+		<!-- ELSE -->
+		[[modules:chat.no-users-in-room]]
+		<!-- ENDIF rooms.lastUser -->
+  </a>
 </li>
 <!-- END rooms -->
 <!-- ELSE -->
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
index efaff9a..575070b 100644
--- a/templates/partials/chats/message-window.tpl
+++ b/templates/partials/chats/message-window.tpl
@@ -1,86 +1,89 @@
 <!-- IF roomId -->
 <div component="chat/messages" data-roomid="{roomId}">
-    <div class="listview lv-message">
-        <div component="chat/header" class="lv-header-alt clearfix">
-            <div id="ms-menu-trigger">
-                <div class="line-wrap">
-                    <div class="line top"></div>
-                    <div class="line center"></div>
-                    <div class="line bottom"></div>
-                </div>
-            </div>
+  <div class="listview lv-message">
+    <div component="chat/header" class="lv-header-alt clearfix">
+			<div id="ms-menu-trigger">
+				<div class="line-wrap">
+					<div class="line top"></div>
+					<div class="line center"></div>
+					<div class="line bottom"></div>
+				</div>
+			</div>
 
-            <ul class="lv-actions actions">
-                <li class="dropdown">
-                    <span data-toggle="dropdown" component="chat/controlsToggle" aria-expanded="true"><i class="fa fa-cog"></i></span>
-                    <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 -->
-        				<li>
-        					<a href="{config.relative_path}/uid/{../uid}">
-        						<!-- IF ../picture -->
-        						<img class="avatar avatar-sm" component="user/picture" src="{../picture}" itemprop="image" />
-        						<!-- ELSE -->
-        						<div class="avatar avatar-sm" component="user/picture" style="background-color: {../icon:bgColor};">{../icon:text}</div><!-- END -->{../username}
-        					</a>
-        				</li>
-        				<!-- END -->
-        				<li role="separator" class="divider"></li>
-        				<!-- END -->
-        				<li class="dropdown-header">[[modules:chat.options]]</li>
-        				<li>
-        					<a href="#" data-action="members"><i class="fa fa-fw fa-cog"></i> [[modules:chat.manage-room]]</a>
-        				</li>
-        				<li>
-        					<a href="#" data-action="rename"><i class="fa fa-fw fa-edit"></i> [[modules:chat.rename-room]]</a>
-        				</li>
-        				<li>
-        					<a href="#" data-action="leave"><i class="fa fa-fw fa-sign-out"></i> [[modules:chat.leave]]</a>
-        				</li>
-        			</ul>
-                </li>
-                <li data-action="pop-out">
-                    <i class="fa fa-compress"></i>
-                </li>
-            </ul>
+      <ul class="lv-actions actions">
+        <li class="dropdown">
+          <span data-toggle="dropdown" component="chat/controlsToggle" aria-expanded="true"><i class="fa fa-cog"></i></span>
+          <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 -->
+						<li>
+							<a href="{config.relative_path}/uid/{../uid}">
+								<!-- IF ../picture -->
+								<img class="avatar avatar-sm" component="user/picture" src="{../picture}" itemprop="image" />
+								<!-- ELSE -->
+								<div class="avatar avatar-sm" component="user/picture" style="background-color: {../icon:bgColor};">{../icon:text}</div><!-- END -->{../username}
+							</a>
+						</li>
+						<!-- END -->
+						<li role="separator" class="divider"></li>
+						<!-- END -->
+						<li class="dropdown-header">[[modules:chat.options]]</li>
+						<li>
+							<a href="#" data-action="members"><i class="fa fa-fw fa-cog"></i> [[modules:chat.manage-room]]</a>
+						</li>
+						<li>
+							<a href="#" data-action="rename"><i class="fa fa-fw fa-edit"></i> [[modules:chat.rename-room]]</a>
+						</li>
+						<li>
+							<a href="#" data-action="leave"><i class="fa fa-fw fa-sign-out"></i> [[modules:chat.leave]]</a>
+						</li>
+        	</ul>
+        </li>
+				<li data-action="pop-out">
+					<i class="fa fa-compress"></i>
+				</li>
+        <li data-action="close">
+          <i class="fa fa-close"></i>
+        </li>
+      </ul>
 
-            <span class="members">
-    			[[modules:chat.chatting_with]]:
-    			<!-- BEGIN users -->
-    			<a href="{config.relative_path}/uid/{../uid}">{../username}</a><!-- IF !@last -->,<!-- END -->
-    			<!-- END -->
-    		</span>
-        </div>
+			<span class="members">
+				[[modules:chat.chatting_with]]:
+				<!-- BEGIN users -->
+				<a href="{config.relative_path}/uid/{../uid}">{../username}</a><!-- IF !@last -->,<!-- END -->
+				<!-- END -->
+			</span>
+    </div>
 
-        <ul class="lv-body chat-content">
-            <!-- IMPORT partials/chats/messages.tpl -->
-        </ul>
+		<ul class="lv-body chat-content">
+			<!-- IMPORT partials/chats/messages.tpl -->
+		</ul>
 
-        <div component="chat/composer" class="lv-footer ms-reply">
-            <textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="chat-input" <!-- IF !canReply -->readonly<!-- ENDIF !canReply -->></textarea>
-            <button data-action="send" <!-- IF !canReply -->disabled<!-- ENDIF !canReply -->><i class="fa fa-send"></i></button>
-            <span component="chat/message/remaining">{maximumChatMessageLength}</span>
-        </div>
-    </div>
+		<div component="chat/composer" class="lv-footer ms-reply">
+			<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="chat-input" <!-- IF !canReply -->readonly<!-- ENDIF !canReply -->></textarea>
+			<button data-action="send" <!-- IF !canReply -->disabled<!-- ENDIF !canReply -->><i class="fa fa-send"></i></button>
+			<span component="chat/message/remaining">{maximumChatMessageLength}</span>
+		</div>
+  </div>
 </div>
 <!-- ELSE -->
 <div>
-    <div class="listview lv-message">
-        <div class="lv-header-alt clearfix">
-            <div id="ms-menu-trigger" class="">
-                <div class="line-wrap">
-                    <div class="line top"></div>
-                    <div class="line center"></div>
-                    <div class="line bottom"></div>
-                </div>
-            </div>
-        </div>
-        <ul class="lv-body chat-content">
-        <div class="alert alert-info">
-            [[modules:chat.no-messages]]
-        </div>
-        </ul>
-    </div>
+	<div class="listview lv-message">
+		<div class="lv-header-alt clearfix">
+			<div id="ms-menu-trigger" class="">
+				<div class="line-wrap">
+					<div class="line top"></div>
+					<div class="line center"></div>
+					<div class="line bottom"></div>
+				</div>
+			</div>
+		</div>
+		<ul class="lv-body chat-content">
+			<div class="alert alert-info">
+					[[modules:chat.no-messages]]
+			</div>
+		</ul>
+	</div>
 </div>
 <!-- ENDIF roomId -->
\ No newline at end of file
diff --git a/templates/partials/chats/message.tpl b/templates/partials/chats/message.tpl
index b38d456..939b4b7 100644
--- a/templates/partials/chats/message.tpl
+++ b/templates/partials/chats/message.tpl
@@ -1,29 +1,29 @@
 <li component="chat/message" class="lv-item media<!-- IF messages.self --> right<!-- ENDIF messages.self -->" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}">
-    <div class="lv-avatar <!-- IF messages.self -->pull-right<!-- ELSE -->pull-left<!-- ENDIF messages.self -->">
-        <!-- IF messages.fromUser.picture -->
-        <img class="user-avatar" src="{messages.fromUser.picture}">
-        <!-- ELSE -->
-        <div class="user-icon" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div>
-        <!-- ENDIF messages.fromUser.picture -->
-    </div>
-    <!-- IF messages.newSet -->
-    <div><small class="ms-date"><i class="fa fa-clock-o"></i> <span class="chat-timestamp timeago" title="{messages.timestampISO}"></span></small></div>
-    <!-- ENDIF messages.newSet -->
-    <div class="media-body">
-        <div component="chat/message/body" class="ms-item">
-            <!-- IF messages.edited -->
-            <small class="text-muted chat-edit" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small>
-            <!-- ENDIF messages.edited -->
+  <div class="lv-avatar <!-- IF messages.self -->pull-right<!-- ELSE -->pull-left<!-- ENDIF messages.self -->">
+		<!-- IF messages.fromUser.picture -->
+		<img class="user-avatar" src="{messages.fromUser.picture}">
+		<!-- ELSE -->
+		<div class="user-icon" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div>
+		<!-- ENDIF messages.fromUser.picture -->
+	</div>
+	<!-- IF messages.newSet -->
+	<div><small class="ms-date"><i class="fa fa-clock-o"></i> <span class="chat-timestamp timeago" title="{messages.timestampISO}"></span></small></div>
+	<!-- ENDIF messages.newSet -->
+	<div class="media-body">
+    <div component="chat/message/body" class="ms-item">
+			<!-- IF messages.edited -->
+			<small class="text-muted chat-edit" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small>
+			<!-- ENDIF messages.edited -->
 
-            <!-- IF !config.disableChatMessageEditing -->
-            <!-- IF messages.self -->
-            <div class="chat-controls">
-                <button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button>
-                <button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button>
-            </div>
-            <!-- ENDIF messages.self -->
-            <!-- ENDIF !config.disableChatMessageEditing -->
-            {messages.content}
-        </div>
+			<!-- IF !config.disableChatMessageEditing -->
+			<!-- IF messages.self -->
+			<div class="chat-controls">
+				<button class="btn btn-xs btn-link" data-action="edit"><i class="fa fa-pencil"></i></button>
+				<button class="btn btn-xs btn-link" data-action="delete"><i class="fa fa-times"></i></button>
+			</div>
+			<!-- ENDIF messages.self -->
+			<!-- ENDIF !config.disableChatMessageEditing -->
+			{messages.content}
     </div>
+  </div>
 </li>
\ No newline at end of file
diff --git a/templates/partials/chats/recent_room.tpl b/templates/partials/chats/recent_room.tpl
index c116a3d..d6125e9 100644
--- a/templates/partials/chats/recent_room.tpl
+++ b/templates/partials/chats/recent_room.tpl
@@ -1,5 +1,5 @@
 <li component="chat/recent/room" data-roomid="{rooms.roomId}" class="lv-item media <!-- IF ../unread -->unread<!-- ENDIF ../unread -->">
-    <!-- IF rooms.lastUser.uid -->
+  <!-- IF rooms.lastUser.uid -->
 	<div class="lv-avatar pull-left" data-username="{rooms.lastUser.username}" data-uid="{rooms.lastUser.uid}">
 		<!-- IF rooms.lastUser.picture -->
 		<img class="user-avatar" src="{rooms.lastUser.picture}">
@@ -8,10 +8,10 @@
 		<!-- ENDIF rooms.lastUser.picture -->
 	</div>
 
-    <!-- ELSE -->
-    [[modules:chat.no-users-in-room]]
-    <!-- ENDIF rooms.lastUser.uid -->
-    <div class="media-body">
-        <span component="chat/title" class="lv-title"><!-- IF rooms.roomName -->{rooms.roomName}<!-- ELSE -->{rooms.usernames}<!-- ENDIF rooms.roomName --></span>
-    </div>
+	<!-- ELSE -->
+	[[modules:chat.no-users-in-room]]
+	<!-- ENDIF rooms.lastUser.uid -->
+	<div class="media-body">
+		<span component="chat/title" class="lv-title"><!-- IF rooms.roomName -->{rooms.roomName}<!-- ELSE -->{rooms.usernames}<!-- ENDIF rooms.roomName --></span>
+	</div>
 </li>
\ No newline at end of file
diff --git a/templates/partials/groups/list.tpl b/templates/partials/groups/list.tpl
index 69c8dac..80e4753 100644
--- a/templates/partials/groups/list.tpl
+++ b/templates/partials/groups/list.tpl
@@ -1,32 +1,31 @@
 <!-- BEGIN 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">
-            <div>{groups.displayName}</div>
-        </div>
-        <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 -->
-                <li>
-                    <a href="{config.relative_path}/user/{groups.members.userslug}">
-                        <!-- IF groups.members.picture -->
-                        <img class="user-avatar" src="{groups.members.picture}" alt="{groups.members.username}" title="{groups.members.username}" />
-                        <!-- ELSE -->
-                        <div class="user-icon" style="background-color: {groups.members.icon:bgColor};">{groups.members.icon:text}</div>
-                        <!-- ENDIF groups.members.picture -->
-                    </a>
-                </li>
-                <!-- END groups.members -->
-                <!-- IF groups.truncated -->
-                <li class="truncated"><i class="fa fa-ellipsis-h"></i></li>
-                <!-- ENDIF groups.truncated -->
-            </ul>
-        </div>
-        <div class="card-footer">
-            {groups.memberCount} member(s)
-        </div>
-    </div>
+  <div class="card">
+		<div class="card-header ch-alt">
+			<div>{groups.displayName}</div>
+		</div>
+    <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 -->
+				<li>
+					<a href="{config.relative_path}/user/{groups.members.userslug}">
+						<!-- IF groups.members.picture -->
+						<img class="user-avatar" src="{groups.members.picture}" alt="{groups.members.username}" title="{groups.members.username}" />
+						<!-- ELSE -->
+						<div class="user-icon" style="background-color: {groups.members.icon:bgColor};">{groups.members.icon:text}</div>
+						<!-- ENDIF groups.members.picture -->
+					</a>
+				</li>
+				<!-- END groups.members -->
+				<!-- IF groups.truncated -->
+				<li class="truncated"><i class="fa fa-ellipsis-h"></i></li>
+				<!-- ENDIF groups.truncated -->
+			</ul>
+		</div>
+		<div class="card-footer">
+			{groups.memberCount} member(s)
+		</div>
+  </div>
 </div>
 <!-- END groups -->
\ No newline at end of file
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index f0e8f83..5ccd92b 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -1,260 +1,259 @@
-<div id="header-menu">
-<div class="material-load-bar">
-      <div class="material-bar"></div>
-      <div class="material-bar"></div>
-      <div class="material-bar"></div>
-    </div>
 <header id="header" component="navbar">
-    <ul class="header-inner">
-        <li id="menu-trigger" data-trigger="#sidebar" <!-- IF config.menuInHeader -->class="menu-header"<!-- ENDIF config.menuInHeader -->>
-            <div class="line-wrap">
-                <div class="line top"></div>
-                <div class="line center"></div>
-                <div class="line bottom"></div>
-            </div>
-        </li>
-    	<li class="logo <!-- IF config.menuInHeader -->menu-in-header<!-- ENDIF config.menuInHeader -->">
+  <ul class="header-inner">
+		<li id="menu-trigger" data-trigger="#sidebar" <!-- IF config.menuInHeader -->class="menu-header"<!-- ENDIF config.menuInHeader -->>
+			<div class="line-wrap">
+				<div class="line top"></div>
+				<div class="line center"></div>
+				<div class="line bottom"></div>
+			</div>
+		</li>
+		<li class="logo <!-- IF config.menuInHeader -->menu-in-header<!-- ENDIF config.menuInHeader -->">
 			<!-- IF brand:logo -->
-            <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>
-            <!-- ENDIF brand:logo -->
+			<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>
+			<!-- ENDIF brand:logo -->
 
-            <!-- IF config.showSiteTitle -->
+			<!-- IF config.showSiteTitle -->
 			<a class="title" href="<!-- IF title:url -->{title:url}<!-- ELSE -->{relative_path}/<!-- ENDIF title:url -->">
 				{title}
 			</a>
 			<!-- ENDIF config.showSiteTitle -->
-        </li>
+		</li>
 
-        <!-- IF config.menuInHeader -->
-        <li class="hidden-xs">
-            <ul class="header-menu" id="main-nav">
-                <!-- BEGIN 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 -->>
-                        <!-- IF navigation.iconClass -->
-                        <i class="fa fa-fw {navigation.iconClass}"></i>
-                        <!-- ENDIF navigation.iconClass -->
-                    </a>
-                </li>
-                <!-- ENDIF function.displayMenuItem -->
-                <!-- END navigation -->
-            </ul>
-        </li>
-        <!-- ENDIF config.menuInHeader -->
+		<!-- IF config.menuInHeader -->
+		<li class="hidden-xs">
+			<ul class="header-menu" id="main-nav">
+				<!-- BEGIN 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 -->>
+						<!-- IF navigation.iconClass -->
+						<i class="fa fa-fw {navigation.iconClass}"></i>
+						<!-- ENDIF navigation.iconClass -->
+					</a>
+				</li>
+				<!-- ENDIF function.displayMenuItem -->
+				<!-- END navigation -->
+			</ul>
+		</li>
+		<!-- ENDIF config.menuInHeader -->
 
-        <li class="pull-right">
-        <ul class="top-menu">
-            <li class="nav navbar-nav pagination-block visible-lg visible-md">
-                <div class="dropdown">
-                    <i class="fa fa-angle-double-up pointer fa-fw pagetop"></i>
-                    <i class="fa fa-angle-up pointer fa-fw pageup"></i>
+    <li class="pull-right">
+      <ul class="top-menu">
+				<li class="nav navbar-nav pagination-block visible-lg visible-md">
+					<div class="dropdown">
+						<i class="fa fa-angle-double-up pointer fa-fw pagetop"></i>
+						<i class="fa fa-angle-up pointer fa-fw pageup"></i>
 
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <span class="pagination-text"></span>
-                    </a>
+						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
+							<span class="pagination-text"></span>
+						</a>
 
-                    <i class="fa fa-angle-down pointer fa-fw pagedown"></i>
-                    <i class="fa fa-angle-double-down pointer fa-fw pagebottom"></i>
+						<i class="fa fa-angle-down pointer fa-fw pagedown"></i>
+						<i class="fa fa-angle-double-down pointer fa-fw pagebottom"></i>
 
-                    <div class="progress-container">
-                        <div class="progress-bar"></div>
-                    </div>
+						<div class="progress-container">
+							<div class="progress-bar"></div>
+						</div>
 
-                    <ul class="dropdown-menu" role="menu">
-                        <li>
-                            <input type="text" class="form-control" id="indexInput" placeholder="[[global:pagination.enter_index]]">
-                        </li>
-                    </ul>
-                </div>
-            </li>
+						<ul class="dropdown-menu" role="menu">
+							<li>
+								<input type="text" class="form-control" id="indexInput" placeholder="[[global:pagination.enter_index]]">
+							</li>
+						</ul>
+					</div>
+				</li>
 
-            <li>
-                <a href="#" id="reconnect" class="hide" title="Connection to {title} has been lost, attempting to reconnect...">
-                    <i class="fa fa-check"></i>
-                </a>
-            </li>
-            <!-- IF config.searchEnabled -->
-            <li>
-                <form id="search-form" class="hidden-xs" role="search" method="GET">
-                    <div class="hidden" id="search-fields">
-                        <div class="form-group">
-                            <div class="fg-line">
-                                <input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
-                            </div>
-                        </div>
-                        <button type="submit" class="btn btn-default hide">[[global:search]]</button>
-                    </div>
-                    <button id="search-button" type="button" class="btn btn-link"><i class="fa fa-search fa-fw"></i></button>
-                </form>
-            </li>
-            <!-- ENDIF config.searchEnabled -->
+				<li>
+					<a href="#" id="reconnect" class="hide" title="Connection to {title} has been lost, attempting to reconnect...">
+						<i class="fa fa-check"></i>
+					</a>
+				</li>
 
-			<!-- IF config.loggedIn -->
-            <li class="notifications dropdown" component="notifications">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notif_dropdown">
-                    <i class="fa fa-fw fa-bell-o" component="notifications/icon" data-content="0"></i>
-                </a>
-                <div class="dropdown-menu dropdown-menu-lg pull-right">
-                    <div class="listview">
-                        <div class="lv-header">
-                            [[notifications:title]]
-                        </div>
-                        <div class="lv-body c-overflow" id="notif-list" component="notifications/list">
-                            <a href="#" class="lv-item"><i class="fa fa-refresh fa-spin"></i> [[global:notifications.loading]]</a>
-                        </div>
-                        <div class="lv-footer">
-                        <a href="#" class="mark-all-read">[[notifications:mark_all_read]]</a>
-                        <hr />
-                        <a href="{relative_path}/notifications">[[notifications:see_all]]</a>
-                        </div>
-                    </div>
-                </div>
-            </li>
+				<!-- IF config.searchEnabled -->
+				<li>
+					<form id="search-form" class="hidden-xs" role="search" method="GET">
+						<div class="hidden" id="search-fields">
+							<div class="form-group">
+								<div class="fg-line">
+									<input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
+								</div>
+							</div>
+							<button type="submit" class="btn btn-default hide">[[global:search]]</button>
+						</div>
+						<button id="search-button" type="button" class="btn btn-link"><i class="fa fa-search fa-fw"></i></button>
+					</form>
+				</li>
+				<!-- ENDIF config.searchEnabled -->
 
-            <!-- IF !config.disableChat -->
-            <li class="chats dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="chat_dropdown" component="chat/dropdown">
-                    <i component="chat/icon" class="fa fa-comment-o fa-fw"></i>
-                </a>
-                <div class="dropdown-menu dropdown-menu-md pull-right" aria-labelledby="chat_dropdown">
-                    <div class="listview">
-                        <div class="lv-body c-overflow chat-list" component="chat/list">
-                            <i class="fa fa-refresh fa-spin"></i> [[global:chats.loading]]
-                        </div>
-                        <div class="lv-footer">
-                            <a href="#" class="mark-all-read" component="chats/mark-all-read">[[modules:chat.mark_all_read]]</a>
-                            <hr />
-                            <a href="{relative_path}/user/{user.userslug}/chats">[[modules:chat.see_all]]</a>
-                        </div>
-                    </div>
-                </div>
-            </li>
-            <!-- ENDIF !config.disableChat -->
+				<!-- IF config.loggedIn -->
+				<li class="notifications dropdown" component="notifications">
+					<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notif_dropdown">
+						<i class="fa fa-fw fa-bell-o" component="notifications/icon" data-content="0"></i>
+					</a>
+					<div class="dropdown-menu dropdown-menu-lg pull-right">
+						<div class="listview">
+							<div class="lv-header">
+								[[notifications:title]]
+							</div>
+							<div class="lv-body c-overflow" id="notif-list" component="notifications/list">
+								<a href="#" class="lv-item"><i class="fa fa-refresh fa-spin"></i> [[global:notifications.loading]]</a>
+							</div>
+							<div class="lv-footer">
+								<a href="#" class="mark-all-read">[[notifications:mark_all_read]]</a>
+								<hr />
+								<a href="{relative_path}/notifications">[[notifications:see_all]]</a>
+							</div>
+						</div>
+					</div>
+				</li>
 
-            <li id="user_label" class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
-                    <img component="header/userpicture" src="{user.picture}" alt="{user.username}" class="user-picture" id="user-header-picture"<!-- IF !user.picture --> style="display:none;"<!-- ENDIF !user.picture --> />
-                    <div component="header/usericon" class="user-icon" style="background-color: {user.icon:bgColor};<!-- IF user.picture -->display:none;<!-- ENDIF user.picture -->">{user.icon:text}</div>
-                </a>
-                <ul id="user-control-list" component="header/usercontrol" class="dropdown-menu pull-right" aria-labelledby="user_dropdown">
-                    <li>
-                        <a component="header/profilelink" id="user-profile-link" href="{relative_path}/user/{user.userslug}">
-                            <i component="user/status" class="status {user.status}"></i> <span component="header/username" id="user-header-name">{user.username}</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="divider"></li>
-                    <li>
-                        <a href="#" class="user-status" data-status="online">
-                            <i class="status online"></i><span> [[global:online]]</span>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="user-status" data-status="away">
-                            <i class="status away"></i><span> [[global:away]]</span>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="user-status" data-status="dnd">
-                            <i class="status dnd"></i><span> [[global:dnd]]</span>
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" class="user-status" data-status="offline">
-                            <i class="status offline"></i><span> [[global:invisible]]</span>
-                        </a>
-                    </li>
-                    <li role="presentation" class="divider"></li>
-                    <li>
-						<a component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit">
-							<i class="fa fa-fw fa-edit"></i><span> [[user:edit-profile]]</span>
-						</a>
-					</li>
-					<li>
-						<a component="header/profilelink/settings" href="{relative_path}/user/{user.userslug}/settings">
-							<i class="fa fa-fw fa-gear"></i><span> [[user:settings]]</span>
-						</a>
-					</li>
+				<!-- IF !config.disableChat -->
+				<li class="chats dropdown">
+					<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="chat_dropdown" component="chat/dropdown">
+							<i component="chat/icon" class="fa fa-comment-o fa-fw"></i>
+					</a>
+					<div class="dropdown-menu dropdown-menu-md pull-right" aria-labelledby="chat_dropdown">
+						<div class="listview">
+							<div class="lv-body c-overflow chat-list" component="chat/list">
+							</div>
+							<div class="lv-footer">
+								<a href="#" class="mark-all-read" component="chats/mark-all-read">[[modules:chat.mark_all_read]]</a>
+								<hr />
+								<a href="{relative_path}/user/{user.userslug}/chats">[[modules:chat.see_all]]</a>
+							</div>
+						</div>
+					</div>
+				</li>
+				<!-- ENDIF !config.disableChat -->
 
-					<!-- IF showModMenu -->
-					<li role="presentation" class="divider"></li>
-					<li class="dropdown-header">[[pages:moderator-tools]]</li>
-					<li>
-						<a href="{relative_path}/flags">
-							<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>
-						</a>
+				<li id="user_label" class="dropdown">
+					<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
+						<img component="header/userpicture" src="{user.picture}" alt="{user.username}" class="user-picture" id="user-header-picture"<!-- IF !user.picture --> style="display:none;"<!-- ENDIF !user.picture --> />
+						<div component="header/usericon" class="user-icon" style="background-color: {user.icon:bgColor};<!-- IF user.picture -->display:none;<!-- ENDIF user.picture -->">{user.icon:text}</div>
+					</a>
+					<ul id="user-control-list" component="header/usercontrol" class="dropdown-menu pull-right" aria-labelledby="user_dropdown">
+						<li>
+							<a component="header/profilelink" id="user-profile-link" href="{relative_path}/user/{user.userslug}">
+								<i component="user/status" class="status {user.status}"></i> <span component="header/username" id="user-header-name">{user.username}</span>
+							</a>
+						</li>
+						<li role="presentation" class="divider"></li>
+						<li>
+							<a href="#" class="user-status" data-status="online">
+								<i class="status online"></i><span> [[global:online]]</span>
+							</a>
+						</li>
+						<li>
+							<a href="#" class="user-status" data-status="away">
+								<i class="status away"></i><span> [[global:away]]</span>
+							</a>
+						</li>
+						<li>
+							<a href="#" class="user-status" data-status="dnd">
+								<i class="status dnd"></i><span> [[global:dnd]]</span>
+							</a>
+						</li>
+						<li>
+							<a href="#" class="user-status" data-status="offline">
+								<i class="status offline"></i><span> [[global:invisible]]</span>
+							</a>
+						</li>
+						<li role="presentation" class="divider"></li>
+						<li>
+							<a component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit">
+								<i class="fa fa-fw fa-edit"></i><span> [[user:edit-profile]]</span>
+							</a>
+						</li>
+						<li>
+							<a component="header/profilelink/settings" href="{relative_path}/user/{user.userslug}/settings">
+								<i class="fa fa-fw fa-gear"></i><span> [[user:settings]]</span>
+							</a>
+						</li>
+
+						<!-- IF showModMenu -->
+						<li role="presentation" class="divider"></li>
+						<li class="dropdown-header">[[pages:moderator-tools]]</li>
+						<li>
+							<a href="{relative_path}/flags">
+								<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>
+							</a>
+						</li>
+						<li>
+							<a href="{relative_path}/post-queue">
+								<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
+							</a>
+						</li>
+						<li>
+							<a href="{relative_path}/ip-blacklist">
+								<i class="fa fa-fw fa-ban"></i> <span>[[pages:ip-blacklist]]</span>
+							</a>
+						</li>
+						<!-- ENDIF showModMenu -->
+
+						<li role="presentation" class="divider"></li>
+						<li component="user/logout">
+							<form method="post" action="{relative_path}/logout">
+								<input type="hidden" name="_csrf" value="{config.csrf_token}">
+								<input type="hidden" name="noscript" value="true">
+								<button type="submit" class="btn btn-link">
+									<i class="fa fa-fw fa-sign-out"></i><span> [[global:logout]]</span>
+								</button>
+							</form>
+						</li>
+					</ul>
+				</li>
+				<!-- ELSE -->
+				<!-- IF allowRegistration -->
+				<li class="hidden-xs">
+					<a href="{relative_path}/register">
+						<span>[[global:register]]</span>
+					</a>
+				</li>
+				<!-- ENDIF allowRegistration -->
+				<li class="hidden-xs">
+					<a href="{relative_path}/login">
+						<span>[[global:login]]</span>
+					</a>
+				</li>
+        <!-- ENDIF config.loggedIn -->
+      </ul>
+    </li>
+  </ul>
+</header>
+
+<section id="main" <!-- IF menuInHeader -->class="visible-xs"<!-- ENDIF menuInHeader -->>
+	<aside id="sidebar">
+		<div class="sidebar-inner">
+			<div class="si-inner">
+				<ul class="main-menu">
+					<li id="toggle-width" class="hidden-xs">
+						<div class="toggle-switch">
+							<input id="tw-switch" type="checkbox" hidden="hidden">
+							<label for="tw-switch" class="ts-helper"></label>
+						</div>
 					</li>
-					<li>
-						<a href="{relative_path}/post-queue">
-							<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
+					<!-- IF !config.loggedIn -->
+					<!-- IF allowRegistration -->
+					<li class="visible-xs">
+						<a href="{relative_path}/register">
+							<i class="fa fa-pencil fa-fw"></i> [[global:register]]
 						</a>
 					</li>
-					<li>
-						<a href="{relative_path}/ip-blacklist">
-							<i class="fa fa-fw fa-ban"></i> <span>[[pages:ip-blacklist]]</span>
+					<!-- ENDIF allowRegistration -->
+					<li class="visible-xs">
+						<a href="{relative_path}/login">
+							<i class="fa fa-sign-in fa-fw"></i> [[global:login]]
 						</a>
 					</li>
-					<!-- ENDIF showModMenu -->
+					<!-- ENDIF !config.loggedIn -->
 
-					<li role="presentation" class="divider"></li>
-                    <li component="user/logout">
-                        <a href="#"><i class="fa fa-fw fa-sign-out"></i><span> [[global:logout]]</span></a>
-                    </li>
-                </ul>
-            </li>
-            <!-- ELSE -->
-            <!-- IF allowRegistration -->
-            <li class="hidden-xs">
-                <a href="{relative_path}/register">
-					<span>[[global:register]]</span>
-				</a>
-            </li>
-            <!-- ENDIF allowRegistration -->
-            <li class="hidden-xs">
-            	<a href="{relative_path}/login">
-					<span>[[global:login]]</span>
-				</a>
-            </li>
-            <!-- ENDIF config.loggedIn -->
-            </ul>
-        </li>
-    </ul>
-
-</header>
-</div>
-<section id="main" <!-- IF menuInHeader -->class="visible-xs"<!-- ENDIF menuInHeader -->>
-    <aside id="sidebar">
-        <div class="sidebar-inner">
-            <div class="si-inner">
-                <ul class="main-menu">
-                    <li id="toggle-width" class="hidden-xs">
-                        <div class="toggle-switch">
-                            <input id="tw-switch" type="checkbox" hidden="hidden">
-                            <label for="tw-switch" class="ts-helper"></label>
-                        </div>
-                    </li>
-                    <!-- IF !config.loggedIn -->
-                    <!-- IF allowRegistration -->
-                    <li class="visible-xs">
-                        <a href="{relative_path}/register">
-                            <i class="fa fa-pencil fa-fw"></i> [[global:register]]
-                        </a>
-                    </li>
-                    <!-- ENDIF allowRegistration -->
-                    <li class="visible-xs">
-                        <a href="{relative_path}/login">
-                            <i class="fa fa-sign-in fa-fw"></i> [[global:login]]
-                        </a>
-                    </li>
-                    <!-- ENDIF !config.loggedIn -->
-
-                    <li class="visible-xs">
-                        <a href="{relative_path}/search">
-                            <i class="fa fa-search fa-fw"></i> [[global:search]]
-                        </a>
-                    </li>
+					<li class="visible-xs">
+						<a href="{relative_path}/search">
+							<i class="fa fa-search fa-fw"></i> [[global:search]]
+						</a>
+					</li>
 
 					<!-- BEGIN navigation -->
 					<!-- IF function.displayMenuItem, @index -->
@@ -270,8 +269,8 @@
 					</li>
 					<!-- ENDIF function.displayMenuItem -->
 					<!-- END navigation -->
-                </ul>
-            </div>
-        </div>
-    </aside>
+				</ul>
+			</div>
+		</div>
+	</aside>
 </section>
diff --git a/templates/partials/paginator.tpl b/templates/partials/paginator.tpl
index f556a1b..7f0db34 100644
--- a/templates/partials/paginator.tpl
+++ b/templates/partials/paginator.tpl
@@ -60,7 +60,7 @@
 
 	<!-- IF pagination.prev.active -->
 	<li class="first">
-		<a href="?page=1" data-page="1"><i class="fa fa-fast-backward"></i> </a>
+		<a href="?{pagination.first.qs}" data-page="1"><i class="fa fa-fast-backward"></i> </a>
 	</li>
 	<li>
         <a href="?{pagination.prev.qs}" data-page="{pagination.prev.page}" aria-label="Previous">
@@ -94,7 +94,7 @@
         </a>
     </li>
 	<li class="last">
-		<a href="?page={pagination.pageCount}" data-page="{pagination.pageCount}"><i class="fa fa-fast-forward"></i> </a>
+		<a href="?{pagination.last.qs}" data-page="{pagination.pageCount}"><i class="fa fa-fast-forward"></i> </a>
 	</li>
 	<!-- ENDIF pagination.next.active -->
 	<!-- ENDIF pagination.pages -->
diff --git a/templates/partials/topic/badge.tpl b/templates/partials/topic/badge.tpl
index 32e9d03..4e128fb 100644
--- a/templates/partials/topic/badge.tpl
+++ b/templates/partials/topic/badge.tpl
@@ -1,5 +1,5 @@
 <!-- BEGIN 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="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>
+<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
diff --git a/templates/partials/topic/deleted-message.tpl b/templates/partials/topic/deleted-message.tpl
new file mode 100644
index 0000000..b51bd18
--- /dev/null
+++ b/templates/partials/topic/deleted-message.tpl
@@ -0,0 +1,11 @@
+<div component="topic/deleted/message" class="lv-header-alt <!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
+  <span class="pull-left">[[topic:deleted_message]]</span>
+  <span class="pull-right">
+    <!-- IF deleter -->
+    <a href="{config.relative_path}/user/{deleter.userslug}">
+      <strong>{deleter.username}</strong>
+    </a>
+    <small class="timeago" title="{deletedTimestampISO}"></small>
+    <!-- ENDIF deleter -->
+  </span>
+</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 6ad77b4..022963d 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -1,33 +1,35 @@
 <!-- IF posts.display_moderator_tools -->
 <li class="tools-title">[[topic:tools]]</li>
-<li><a component="post/edit" href="#"><i class="fa fa-pencil"></i> [[topic:edit]]</a></li>
-<li><a component="post/delete" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->"><i class="fa fa-trash-o"></i> [[topic:delete]]</a></li>
-<li><a component="post/restore" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->"><i class="fa fa-history"></i> [[topic:restore]]</a></li>
-<li><a component="post/purge" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->"><i class="fa fa-eraser"></i> [[topic:purge]]</a></li>
-<li><a component="topic/delete/posts" href="#"><i class="fa fa-trash-o"></i> [[topic:thread_tools.delete-posts]]</a></li>
+<li><a component="post/edit" href="#"><i class="fa fa-fw fa-pencil"></i> [[topic:edit]]</a></li>
+<li <!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->><a component="post/delete" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->"><i class="fa fa-fw fa-trash-o"></i> [[topic:delete]]</a></li>
+<li <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->><a component="post/restore" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->"><i class="fa fa-fw fa-history"></i> [[topic:restore]]</a></li>
+<!-- IF posts.display_purge_tools -->
+<li <!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->><a component="post/purge" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->"><i class="fa fa-fw fa-eraser"></i> [[topic:purge]]</a></li>
+<!-- END -->
+<li><a component="topic/delete/posts" href="#"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete-posts]]</a></li>
 
 <!-- IF posts.display_history -->
 <li>
 	<a component="post/view-history" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa fa-history"></i></span> [[topic:view-history]]
+		<span class="menu-icon"><i class="fa fa-fw fa-history"></i></span> [[topic:view-history]]
 	</a>
 </li>
 <!-- END -->
 
 <!-- IF posts.display_move_tools -->
-<li><a component="post/move" href="#"><i class="fa fa-arrows"></i> [[topic:move]]</a></li>
+<li><a component="post/move" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:move]]</a></li>
 <!-- ENDIF posts.display_move_tools -->
 
 <!-- IF posts.ip -->
 <li>
 	<a component="post/copy-ip" role="menuitem" tabindex="-1" href="#" data-clipboard-text="{posts.ip}">
-		<span class="menu-icon" ><i class="fa fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
+		<span class="menu-icon" ><i class="fa fa-fw fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
 	</a>
 </li>
 <!-- IF posts.display_ip_ban -->
 <li>
 	<a component="post/ban-ip" role="menuitem" tabindex="-1" href="#" data-ip="{posts.ip}">
-		<span class="menu-icon"><i class="fa fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
+		<span class="menu-icon"><i class="fa fa-fw fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
 	</a>
 </li>
 <!-- ENDIF posts.display_ip_ban -->
@@ -37,7 +39,7 @@
 <!-- BEGIN posts.tools -->
 <li role="presentation">
 	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
+		<span class="menu-icon"><i class="fa fa-fw {posts.tools.icon}"></i></span> {{posts.tools.html}}
 	</a>
 </li>
 <!-- END posts.tools -->
@@ -50,8 +52,8 @@
 <li>
 	<a component="post/bookmark" href="#" data-bookmarked="{posts.bookmarked}">[[topic:bookmark]]
 	<span component="post/bookmark-count" class="bookmarkCount" data-bookmarks="{posts.bookmarks}">{posts.bookmarks}</span>&nbsp;
-	<i component="post/bookmark/on" class="fa fa-heart <!-- IF !posts.bookmarked -->hidden<!-- ENDIF !posts.bookmarked -->"></i>
-	<i component="post/bookmark/off" class="fa fa-heart-o <!-- IF posts.bookmarked -->hidden<!-- ENDIF posts.bookmarked -->"></i>
+	<i component="post/bookmark/on" class="fa fa-fw fa-heart <!-- IF !posts.bookmarked -->hidden<!-- ENDIF !posts.bookmarked -->"></i>
+	<i component="post/bookmark/off" class="fa fa-fw fa-heart-o <!-- IF posts.bookmarked -->hidden<!-- ENDIF posts.bookmarked -->"></i>
 	</a>
 </li>
 <!-- ENDIF config.loggedIn -->
@@ -62,7 +64,7 @@
 <!-- ENDIF postSharing.length -->
 <!-- BEGIN postSharing -->
 <li role="presentation">
-	<a role="menuitem" component="share/{postSharing.id}" tabindex="-1" href="#"><span class="menu-icon"><i class="fa {postSharing.class}"></i></span> {postSharing.name}</a>
+	<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 -->
 
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index f8e95f7..38920f0 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -1,75 +1,75 @@
 <div component="post" class="<!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
-    <a component="post/anchor" data-index="{posts.index}"></a>
-    <meta itemprop="datePublished" content="{posts.relativeTime}">
-    <meta itemprop="dateModified" content="{posts.relativeEditTime}">
+	<a component="post/anchor" data-index="{posts.index}"></a>
+	<meta itemprop="datePublished" content="{posts.relativeTime}">
+	<meta itemprop="dateModified" content="{posts.relativeEditTime}">
 
-    <div class="post-block">
-        <div class="poster-avatar hidden-xs">
-            <a href="{config.relative_path}/user/{posts.user.userslug}">
-                <!-- IF posts.user.picture -->
-                <img class="user-picture" src="{posts.user.picture}" alt="{posts.user.username}" title="{posts.user.username}"/>
-                <!-- ELSE -->
-                <div class="user-icon" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
-                <!-- ENDIF posts.user.picture -->
-                <span component="user/status" class="status {posts.user.status}" title="[[global:{posts.user.status}]]"></span>
-            </a>
-        </div>
+  <div class="post-block">
+    <div class="poster-avatar hidden-xs">
+			<a href="{config.relative_path}/user/{posts.user.userslug}">
+				<!-- IF posts.user.picture -->
+				<img class="user-picture" src="{posts.user.picture}" alt="{posts.user.username}" title="{posts.user.username}"/>
+				<!-- ELSE -->
+				<div class="user-icon" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
+				<!-- ENDIF posts.user.picture -->
+				<span component="user/status" class="status {posts.user.status}" title="[[global:{posts.user.status}]]"></span>
+			</a>
+    </div>
 
-        <div class="post-content">
-            <div class="post-body">
-                <ul class="post-actions pull-right">
-                    <li class="votes">
-                        <!-- IF !reputation:disabled -->
-                        <a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">
-                            <i class="fa fa-thumbs-o-up"></i>
-                        </a>
-                        <span component="post/vote-count" data-votes="{posts.votes}">{posts.votes}</span>
-                        <!-- IF !downvote:disabled -->
-                        <a component="post/downvote" href="#" class="<!-- IF posts.downvoted -->downvoted<!-- ENDIF posts.downvoted -->">
-                            <i class="fa fa-thumbs-o-down"></i>
-                        </a>
-                        <!-- ENDIF !downvote:disabled -->
-                        <!-- ENDIF !reputation:disabled -->
-                    </li>
-                    <!-- IMPORT partials/topic/post-menu.tpl -->
-                </ul>
+    <div class="post-content">
+      <div class="post-body">
+        <ul class="post-actions pull-right">
+          <li class="votes">
+						<!-- IF !reputation:disabled -->
+						<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">
+							<i class="fa fa-thumbs-o-up"></i>
+						</a>
+						<span component="post/vote-count" data-votes="{posts.votes}">{posts.votes}</span>
+						<!-- IF !downvote:disabled -->
+						<a component="post/downvote" href="#" class="<!-- IF posts.downvoted -->downvoted<!-- ENDIF posts.downvoted -->">
+							<i class="fa fa-thumbs-o-down"></i>
+						</a>
+						<!-- ENDIF !downvote:disabled -->
+						<!-- ENDIF !reputation:disabled -->
+					</li>
+          <!-- IMPORT partials/topic/post-menu.tpl -->
+        </ul>
 
-                <div class="post-header">
-                    <a class="pull-left visible-xs user-profile-link" href="{config.relative_path}/user/{posts.user.userslug}">
-                        <!-- IF posts.user.picture -->
-                        <img class="post-user-picture" src="{posts.user.picture}" alt="{posts.user.username}" title="{posts.user.username}"/>
-                        <!-- ELSE -->
-                        <div class="user-icon post-user-picture" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
-                        <!-- ENDIF posts.user.picture -->
-                    </a>
+        <div class="post-header">
+					<a class="pull-left visible-xs user-profile-link" href="{config.relative_path}/user/{posts.user.userslug}">
+						<!-- IF posts.user.picture -->
+						<img class="post-user-picture" src="{posts.user.picture}" alt="{posts.user.username}" title="{posts.user.username}"/>
+						<!-- ELSE -->
+						<div class="user-icon post-user-picture" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
+						<!-- ENDIF posts.user.picture -->
+					</a>
 
-                    <strong>
-                        <a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}</a>
-                    </strong>
-                    <!-- IMPORT partials/topic/badge.tpl -->
-                    <span class="post-time">
-                        <a class="permalink" href="{config.relative_path}/post/{posts.pid}"><span class="timeago" title="{posts.timestampISO}"></span></a>
+					<strong>
+						<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}</a>
+					</strong>
+					<!-- IMPORT partials/topic/badge.tpl -->
+					<span class="post-time">
+						<a class="permalink" href="{config.relative_path}/post/{posts.pid}"><span class="timeago" title="{posts.timestampISO}"></span></a>
 
-                        <span class="post-tools">
-                            <a component="post/reply" href="#" class="<!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->"><i class="fa fa-reply"></i>[[topic:reply]]</a>
-                            <a component="post/quote" href="#" class="<!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->"><i class="fa fa-quote-left"></i>[[topic:quote]]</a>
-                        </span>
-                    </span>
-                </div>
+						<span class="post-tools">
+							<a component="post/reply" href="#" class="<!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->"><i class="fa fa-reply"></i>[[topic:reply]]</a>
+							<a component="post/quote" href="#" class="<!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->"><i class="fa fa-quote-left"></i>[[topic:quote]]</a>
+						</span>
+					</span>
+        </div>
 
-                <div component="post/content" itemprop="text">
-                    {posts.content}
-                </div>
+				<div component="post/content" itemprop="text">
+					{posts.content}
+				</div>
 
-                <!-- IF posts.user.signature -->
-                <div component="post/signature" data-uid="{posts.user.uid}" class="post-signature hidden-xs">{posts.user.signature}</div>
-                <!-- ENDIF posts.user.signature -->
+				<!-- IF posts.user.signature -->
+				<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature hidden-xs">{posts.user.signature}</div>
+				<!-- ENDIF posts.user.signature -->
 
-                <div class="post-edit">
-                    <small component="post/editor" class="<!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"><strong><a href="{config.relative_path}/user/{posts.editor.userslug}">[[global:last_edited_by, {posts.editor.username}]]</a></strong> <span class="timeago" title="{posts.editedISO}"></span></small>
-                </div>
-                {posts.reactions}
-            </div>
-        </div>
+				<div class="post-edit">
+					<small component="post/editor" class="<!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"><strong><a href="{config.relative_path}/user/{posts.editor.userslug}">[[global:last_edited_by, {posts.editor.username}]]</a></strong> <span class="timeago" title="{posts.editedISO}"></span></small>
+				</div>
+				{posts.reactions}
+      </div>
     </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/templates/partials/topic/reply-button.tpl b/templates/partials/topic/reply-button.tpl
index 2982428..31a0beb 100644
--- a/templates/partials/topic/reply-button.tpl
+++ b/templates/partials/topic/reply-button.tpl
@@ -1,23 +1,23 @@
 <li class="reply-button" component="topic/reply/container">
-<button component="topic/reply" class="btn btn-md btn-primary <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</button>
+  <button component="topic/reply" class="btn btn-md btn-primary <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</button>
 
-<!-- IF loggedIn -->
+  <!-- IF loggedIn -->
 
-<!-- IF !privileges.topics:reply -->
-<!-- IF locked -->
-<button component="topic/reply/locked" class="btn btn-md btn-primary" disabled><i class="fa fa-lock"></i> [[topic:locked]]</button>
-<!-- ENDIF locked -->
-<!-- ENDIF !privileges.topics:reply -->
+  <!-- IF !privileges.topics:reply -->
+  <!-- IF locked -->
+  <button component="topic/reply/locked" class="btn btn-md btn-primary" disabled><i class="fa fa-lock"></i> [[topic:locked]]</button>
+  <!-- ENDIF locked -->
+  <!-- ENDIF !privileges.topics:reply -->
 
-<!-- IF !locked -->
-<button component="topic/reply/locked" class="btn btn-md btn-primary hidden" disabled><i class="fa fa-lock"></i> [[topic:locked]]</button>
-<!-- ENDIF !locked -->
+  <!-- IF !locked -->
+  <button component="topic/reply/locked" class="btn btn-md btn-primary hidden" disabled><i class="fa fa-lock"></i> [[topic:locked]]</button>
+  <!-- ENDIF !locked -->
 
-<!-- ELSE -->
+  <!-- ELSE -->
 
-<!-- IF !privileges.topics:reply -->
-<a href="{config.relative_path}/login" class="btn btn-md btn-primary">[[topic:guest-login-reply]]</a>
-<!-- ENDIF !privileges.topics:reply -->
+  <!-- IF !privileges.topics:reply -->
+  <a href="{config.relative_path}/login" class="btn btn-md btn-primary">[[topic:guest-login-reply]]</a>
+  <!-- ENDIF !privileges.topics:reply -->
 
-<!-- ENDIF loggedIn -->
+  <!-- ENDIF loggedIn -->
 </li>
\ No newline at end of file
diff --git a/templates/partials/topic/sort.tpl b/templates/partials/topic/sort.tpl
index 4dd7fcd..9dbea81 100644
--- a/templates/partials/topic/sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,10 +1,10 @@
 <!-- IF loggedIn -->
 <li class="dropdown" component="thread/sort">
-    <span data-toggle="dropdown" aria-expanded="true"><i class="fa fa-sort-amount-desc"></i></span>
-    <ul class="dropdown-menu pull-right">
-        <li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
-		<li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
-		<li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
-    </ul>
+  <span data-toggle="dropdown" aria-expanded="true"><i class="fa fa-sort-amount-desc"></i></span>
+  <ul class="dropdown-menu pull-right">
+    <li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
+    <li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
+    <li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
+  </ul>
 </li>
 <!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/topic/topic-menu-list.tpl b/templates/partials/topic/topic-menu-list.tpl
index 4d895c0..ac23c5d 100644
--- a/templates/partials/topic/topic-menu-list.tpl
+++ b/templates/partials/topic/topic-menu-list.tpl
@@ -4,22 +4,22 @@
 		<i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]
 	</a>
 </li>
-<li>
+<li <!-- IF pinned -->hidden<!-- ENDIF pinned -->>
 	<a component="topic/pin" href="#" class="<!-- IF pinned -->hidden<!-- ENDIF pinned -->">
 		<i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]
 	</a>
 </li>
-<li>
+<li <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->>
 	<a component="topic/unpin" href="#" class="<!-- IF !pinned -->hidden<!-- ENDIF !pinned -->">
 		<i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread_tools.unpin]]
 	</a>
 </li>
-<li>
+<li <!-- IF locked -->hidden<!-- ENDIF locked -->>
 	<a component="topic/lock" href="#" class="<!-- IF locked -->hidden<!-- ENDIF locked -->">
 		<i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]
 	</a>
 </li>
-<li>
+<li <!-- IF !locked -->hidden<!-- ENDIF !locked -->>
 	<a component="topic/unlock" href="#" class="<!-- IF !locked -->hidden<!-- ENDIF !locked -->">
 		<i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]
 	</a>
@@ -44,21 +44,23 @@
 <!-- ENDIF privileges.editable -->
 
 <!-- IF privileges.deletable -->
-<li>
+<li <!-- IF deleted -->hidden<!-- ENDIF deleted -->>
 	<a component="topic/delete" href="#" class="<!-- IF deleted -->hidden<!-- ENDIF deleted -->">
 		<i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]
 	</a>
 </li>
-<li>
+<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->>
 	<a component="topic/restore" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
 		<i class="fa fa-fw fa-history"></i> [[topic:thread_tools.restore]]
 	</a>
 </li>
-<li>
+<!-- IF privileges.purge -->
+<li <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->>
 	<a component="topic/purge" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
 		<i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]
 	</a>
 </li>
+<!-- END -->
 <!-- IF privileges.isAdminOrMod -->
 <li>
 	<a component="topic/delete/posts" href="#">
diff --git a/templates/partials/topic/watch.tpl b/templates/partials/topic/watch.tpl
index 7d75c4c..c8f14f9 100644
--- a/templates/partials/topic/watch.tpl
+++ b/templates/partials/topic/watch.tpl
@@ -1,17 +1,16 @@
 <!-- IF config.loggedIn -->
 <li class="dropdown" component="topic/watch">
-    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
-        <span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watching]]</span></span>
-    	<span component="topic/not-following/menu" <!-- IF !isNotFollowing -->class="hidden"<!-- ENDIF !isNotFollowing -->><i class="fa fa-fw fa-bell-slash-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:not-watching]]</span></span>
-    	<span component="topic/ignoring/menu" <!-- IF !isIgnoring -->class="hidden"<!-- ENDIF !isIgnoring -->><i class="fa fa-fw fa-eye-slash"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:ignoring]]</span></span>
-    	<span class="caret"></span>
+  <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
+    <span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watching]]</span></span>
+		<span component="topic/not-following/menu" <!-- IF !isNotFollowing -->class="hidden"<!-- ENDIF !isNotFollowing -->><i class="fa fa-fw fa-bell-slash-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:not-watching]]</span></span>
+		<span component="topic/ignoring/menu" <!-- IF !isIgnoring -->class="hidden"<!-- ENDIF !isIgnoring -->><i class="fa fa-fw fa-eye-slash"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:ignoring]]</span></span>
+		<span class="caret"></span>
 	</button>
     
-    <ul class="dropdown-menu pull-right">
-        <li><a href="#" component="topic/following"><i component="topic/following/check" class="fa fa-fw <!-- IF isFollowing -->fa-check<!-- ENDIF isFollowing -->"></i><i class="fa fa-fw fa-bell-o"></i> [[topic:watching]]<p class="help-text hidden-xs"><small>[[topic:watching.description]]</small></p></a></li>
+  <ul class="dropdown-menu pull-right">
+    <li><a href="#" component="topic/following"><i component="topic/following/check" class="fa fa-fw <!-- IF isFollowing -->fa-check<!-- ENDIF isFollowing -->"></i><i class="fa fa-fw fa-bell-o"></i> [[topic:watching]]<p class="help-text hidden-xs"><small>[[topic:watching.description]]</small></p></a></li>
 		<li><a href="#" component="topic/not-following"><i component="topic/not-following/check" class="fa fa-fw <!-- IF isNotFollowing -->fa-check<!-- ENDIF isNotFollowing -->"></i><i class="fa fa-fw fa-bell-slash-o"></i> [[topic:not-watching]]<p class="help-text hidden-xs"><small>[[topic:not-watching.description]]</small></p></a></li>
 		<li><a href="#" component="topic/ignoring"><i component="topic/ignoring/check" class="fa fa-fw <!-- IF isIgnoring -->fa-check<!-- ENDIF isIgnoring -->"></i><i class="fa fa-fw fa-eye-slash"></i> [[topic:ignoring]]<p class="help-text hidden-xs"><small>[[topic:ignoring.description]]</small></p></a></li>
-    </ul>
-    
+  </ul>
 </li>
 <!-- ENDIF config.loggedIn -->
\ No newline at end of file
diff --git a/templates/popular.tpl b/templates/popular.tpl
index 02582ce..d09821c 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -5,15 +5,15 @@
 		<div class="listview lv-bordered lv-lg">
 			<div class="lv-header-alt">
 				<div class="title">
-		        	<!-- IF loggedIn -->
+		      <!-- IF canPost -->
 					<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 					<!-- ELSE -->
 					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-					<!-- ENDIF loggedIn -->
+					<!-- ENDIF canPost -->
 
 					<div class="btn-group <!-- IF !terms.length -->hidden<!-- ENDIF !terms.length -->">
 						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-						{selectedTerm.name} <span class="caret"></span>
+							{selectedTerm.name} <span class="caret"></span>
 						</button>
 						<ul class="dropdown-menu" role="menu">
 							<!-- BEGIN terms -->
@@ -26,7 +26,7 @@
 
 					<div class="btn-group <!-- IF !filters.length -->hidden<!-- ENDIF !filters.length -->">
 						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-						{selectedFilter.name} <span class="caret"></span>
+							{selectedFilter.name} <span class="caret"></span>
 						</button>
 						<ul class="dropdown-menu" role="menu">
 							<!-- BEGIN filters -->
@@ -37,29 +37,9 @@
 						</ul>
 					</div>
 
-					<div component="category/dropdown" class="btn-group category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
-						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-							<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
-							[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
-						</button>
-						<ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
-							<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 -->
-							<li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}">
-								<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}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><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 -->
-						</ul>
-					</div>
-
-
-
-
-
+					<!-- IMPORT partials/category-filter.tpl -->
 
-		        </div>
+		      </div>
 		    </div>
 		    <!-- IF !topics.length -->
 			<div class="alert alert-warning" id="category-no-topics">
diff --git a/templates/recent.tpl b/templates/recent.tpl
index c883ec7..39f938b 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -9,32 +9,17 @@
 		<div class="listview lv-bordered lv-lg">
 			<div class="lv-header-alt">
 				<div class="title">
-			        <!-- IF loggedIn -->
-					<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+			    <!-- IF canPost -->
+					<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 					<!-- ELSE -->
-					<a href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-					<!-- ENDIF loggedIn -->
+					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+					<!-- ENDIF canPost -->
 
-					<div component="category/dropdown" class="btn-group category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
-						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-							<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
-							[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
-						</button>
-						<ul component="category/list" class="dropdown-menu category-dropdown-menu">
-							<li class="category">
-								<a href="{config.relative_path}/{allCategoriesUrl}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
-							</li>
-							<!-- BEGIN categories -->
-							<li class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}">
-								<a href="#"><i component="category/select/icon" class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><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 -->
-						</ul>
-					</div>
+					<!-- IMPORT partials/category-filter.tpl -->
 
 					<div class="btn-group">
 						<button type="button" class="btn btn-default dropdown-toggle <!-- IF !filters.length -->hidden<!-- ENDIF !filters.length -->" data-toggle="dropdown">
-						{selectedFilter.name} <span class="caret"></span>
+							{selectedFilter.name} <span class="caret"></span>
 						</button>
 						<ul class="dropdown-menu">
 							<!-- BEGIN filters -->
@@ -48,7 +33,7 @@
 				</div>
 		    </div>
 
-		    <!-- IF !topics.length -->
+		  <!-- IF !topics.length -->
 			<div class="alert alert-warning" id="category-no-topics">
 				[[recent:no_recent_topics]]
 			</div>
diff --git a/templates/register.tpl b/templates/register.tpl
index 13506cc..29d112d 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -1,71 +1,78 @@
 <div class="register">
-    <div class="register-block">
-        <div class="alert alert-danger<!-- IF !error --> hidden<!-- ENDIF !error -->" id="register-error-notify">
-            [[error:registration-error]]
-            <p>{error}</p>
-        </div>
-        <form class="form-horizontal" action="{config.relative_path}/register" method="post">
-            <div class="form-group">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-fw fa-envelope"></i></span>
-                    <div class="fg-line">
-                        <input class="form-control" type="email" name="email" id="email" placeholder="[[register:email_address_placeholder]]" autocorrect="off" autocapitalize="off" />
-                    </div>
-                </div>
-                <span class="register-feedback" id="email-notify"></span>
-            </div>
+	<div class="register-block">
+		<div class="alert alert-danger<!-- IF !error --> hidden<!-- ENDIF !error -->" id="register-error-notify">
+			[[error:registration-error]]
+			<p>{error}</p>
+		</div>
+		<form class="form-horizontal" action="{config.relative_path}/register" method="post">
+			<div class="form-group">
+				<div class="input-group">
+					<span class="input-group-addon"><i class="fa fa-fw fa-envelope"></i></span>
+					<div class="fg-line">
+						<input class="form-control" type="email" name="email" id="email"
+							placeholder="[[register:email_address_placeholder]]" autocorrect="off" autocapitalize="off" />
+					</div>
+				</div>
+				<span class="register-feedback" id="email-notify"></span>
+			</div>
 
-            <div class="form-group">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
-                    <div class="fg-line">
-                        <input class="form-control" type="text" name="username" id="username" placeholder="[[register:username_placeholder]]" autocorrect="off" autocapitalize="off" autocomplete="off" />
-                    </div>
-                </div>
-                <span class="register-feedback" id="username-notify"></span>
-            </div>
+			<div class="form-group">
+				<div class="input-group">
+					<span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
+					<div class="fg-line">
+						<input class="form-control" type="text" name="username" id="username"
+							placeholder="[[register:username_placeholder]]" autocorrect="off" autocapitalize="off"
+							autocomplete="off" />
+					</div>
+				</div>
+				<span class="register-feedback" id="username-notify"></span>
+			</div>
 
-            <div class="form-group">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
-                    <div class="fg-line">
-                        <input class="form-control" type="password" name="password" id="password" placeholder="[[register:password_placeholder]]" />
-                    </div>
-                </div>
-                <span class="register-feedback" id="password-notify"></span>
-            </div>
+			<div class="form-group">
+				<div class="input-group">
+					<span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
+					<div class="fg-line">
+						<input class="form-control" type="password" name="password" id="password"
+							placeholder="[[register:password_placeholder]]" />
+					</div>
+				</div>
+				<span class="register-feedback" id="password-notify"></span>
+			</div>
 
-            <div class="form-group">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
-                    <div class="fg-line">
-                        <input class="form-control" type="password" name="password-confirm" id="password-confirm" placeholder="[[register:confirm_password_placeholder]]" />
-                    </div>
-                </div>
-                <span class="register-feedback" id="password-confirm-notify"></span>
-            </div>
+			<div class="form-group">
+				<div class="input-group">
+					<span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
+					<div class="fg-line">
+						<input class="form-control" type="password" name="password-confirm" id="password-confirm"
+							placeholder="[[register:confirm_password_placeholder]]" />
+					</div>
+				</div>
+				<span class="register-feedback" id="password-confirm-notify"></span>
+			</div>
 
-            <!-- BEGIN regFormEntry -->
-            <div class="form-group">
-                <div id="register-{regFormEntry.styleName}">
-                    {{regFormEntry.html}}
-                </div>
-            </div>
-            <!-- END regFormEntry -->
+			<!-- BEGIN regFormEntry -->
+			<div class="form-group">
+				<div id="register-{regFormEntry.styleName}">
+					{{regFormEntry.html}}
+				</div>
+			</div>
+			<!-- END regFormEntry -->
 
-            <button class="btn btn-primary btn-lg btn-block" id="register" type="submit">[[register:register_now_button]]</button>
-            <input id="referrer" type="hidden" name="referrer" value="" />
-            <input id="token" type="hidden" name="token" value="" />
-        </form>
-    </div>
+			<button class="btn btn-primary btn-lg btn-block" id="register"
+				type="submit">[[register:register_now_button]]</button>
+			<input id="referrer" type="hidden" name="referrer" value="" />
+			<input id="token" type="hidden" name="token" value="" />
+		</form>
+	</div>
 
-    <!-- IF alternate_logins -->
-    <div class="register-options">
-        <ul class="alternate-auth">
-        <!-- BEGIN authentication -->
-        <li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-2x"></i></a></li>
-        <!-- END authentication -->
-        </ul>
-    </div>
-    <!-- ENDIF alternate_logins -->
-</div>
+	<!-- IF alternate_logins -->
+	<div class="register-options">
+		<ul class="alternate-auth">
+			<!-- BEGIN authentication -->
+			<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top"
+					href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-2x"></i></a></li>
+			<!-- END authentication -->
+		</ul>
+	</div>
+	<!-- ENDIF alternate_logins -->
+</div>
\ No newline at end of file
diff --git a/templates/search.tpl b/templates/search.tpl
index 457a69b..b6efaa5 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -12,7 +12,7 @@
 							<input type="text" class="form-control" id="search-input" placeholder="[[global:search]]">
 							</div>
 						</div>
-						<div class="col-md-6">
+						<div class="col-md-2">
 							<label>[[search:in]]</label>
 							<div class="fg-line">
 								<select id="search-in" class="form-control">
@@ -24,12 +24,21 @@
 								</select>
 							</div>
 						</div>
+						<div class="col-md-2">
+							<label>[[search:match-words]]</label>
+							<div class="fg-line">
+								<select id="match-words-filter" class="form-control">
+									<option value="all">[[search:all]]</option>
+									<option value="any">[[search:any]]</option>
+								</select>
+							</div>
+						</div>
+						<div class="col-md-2">
+							<button type="submit" class="btn btn-primary">[[global:search]]</button>
+						</div>
 					</div>
 				</div>
 
-				<button type="submit" class="btn btn-default">[[global:search]]</button>
-
-				<br/>
 				<br/>
 				<div class="card">
 					<div class="card-header ch-alt" data-toggle="collapse" data-target=".search-options">
@@ -37,139 +46,144 @@
 					</div>
 					<div class="card-body card-padding search-options collapse <!-- IF expandSearch -->in<!-- ENDIF expandSearch -->">
 						<div class="form-group post-search-item">
-							<div class="row">
-								<div class="col-md-3">
-									<label>[[search:match-words]]</label>
-									<div class="fg-line">
-										<select id="match-words-filter" class="form-control">
-											<option value="all">[[search:all]]</option>
-											<option value="any">[[search:any]]</option>
-										</select>
-									</div>
-								</div>
-								<div class="col-md-3">
-									<label>[[search:posted-by]]</label>
-									<input type="text" class="form-control" id="posted-by-user" placeholder="[[search:posted-by]]">
-								</div>
-								<div class="col-md-6">
-									<label>[[search:has-tags]]</label>
-									<input type="text" class="form-control" id="has-tags">
-								</div>
-							</div>
-						</div>
-
-						<div class="form-group post-search-item">
-							<label>[[search:in-categories]]</label>
-							<div class="fg-line">
-								<select multiple class="form-control" id="posted-in-categories" size="{categoriesCount}">
-									<!-- BEGIN categories -->
-									<option value="{categories.value}">{categories.text}</option>
-									<!-- END categories -->
-								</select>
-							</div>
-							<div class="checkbox">
-			                    <label>
-			                        <input type="checkbox" id="search-children">
-			                        <i class="input-helper"></i>
-			                        [[search:search-child-categories]]
-			                    </label>
-			                </div>
-						</div>
-
-						<div class="form-group post-search-item">
-							<label>[[search:reply-count]]</label>
 							<div class="row">
 								<div class="col-md-6">
+									<label>[[search:in-categories]]</label>
 									<div class="fg-line">
-										<select id="reply-count-filter" class="form-control">
-											<option value="atleast">[[search:at-least]]</option>
-											<option value="atmost">[[search:at-most]]</option>
+										<select multiple class="form-control" id="posted-in-categories" size="{categoriesCount}">
+											<!-- BEGIN categories -->
+											<option value="{categories.value}">{categories.text}</option>
+											<!-- END categories -->
 										</select>
 									</div>
-								</div>
-								<div class="col-md-6">
-									<div class="fg-line">
-										<input type="text" class="form-control" id="reply-count">
+									<div class="checkbox">
+										<label>
+											<input type="checkbox" id="search-children">
+											<i class="input-helper"></i>
+											[[search:search-child-categories]]
+										</label>
 									</div>
 								</div>
-							</div>
-						</div>
-
-						<div class="form-group post-search-item">
-							<label>[[search:post-time]]</label>
-							<div class="row">
 								<div class="col-md-6">
-									<div class="fg-line">
-										<select id="post-time-filter" class="form-control">
-											<option value="newer">[[search:newer-than]]</option>
-											<option value="older">[[search:older-than]]</option>
-										</select>
+									<div class="form-group post-search-item">
+										<div class="row">
+											<div class="col-md-6">
+												<label>[[search:posted-by]]</label>
+												<div class="fg-line">
+													<input type="text" class="form-control" id="posted-by-user" placeholder="[[search:posted-by]]">
+												</div>
+											</div>
+											<div class="col-md-6">
+												<label>[[search:has-tags]]</label>
+												<div class="fg-line">
+													<input type="text" class="form-control" id="has-tags">
+												</div>
+											</div>
+										</div>
 									</div>
-								</div>
-								<div class="col-md-6">
-									<div class="fg-line">
-										<select id="post-time-range" class="form-control">
-											<option value="">[[search:any-date]]</option>
-											<option value="86400">[[search:yesterday]]</option>
-											<option value="604800">[[search:one-week]]</option>
-											<option value="1209600">[[search:two-weeks]]</option>
-											<option value="2592000">[[search:one-month]]</option>
-											<option value="7776000">[[search:three-months]]</option>
-											<option value="15552000">[[search:six-months]]</option>
-											<option value="31104000">[[search:one-year]]</option>
-										</select>
+									
+									<div class="form-group post-search-item">
+										<label>[[search:reply-count]]</label>
+										<div class="row">
+											<div class="col-md-6">
+												<div class="fg-line">
+													<select id="reply-count-filter" class="form-control">
+														<option value="atleast">[[search:at-least]]</option>
+														<option value="atmost">[[search:at-most]]</option>
+													</select>
+												</div>
+											</div>
+											<div class="col-md-6">
+												<div class="fg-line">
+													<input type="text" class="form-control" id="reply-count">
+												</div>
+											</div>
+										</div>
 									</div>
-								</div>
-							</div>
-						</div>
 
-						<div class="form-group post-search-item">
-							<label>[[search:sort-by]]</label>
-							<div class="row">
-								<div class="col-md-6">
-									<div class="fg-line">
-										<select id="post-sort-by" class="form-control">
-											<option value="relevance">[[search:relevance]]</option>
-											<option value="timestamp">[[search:post-time]]</option>
-											<option value="teaser.timestamp">[[search:last-reply-time]]</option>
-											<option value="topic.title">[[search:topic-title]]</option>
-											<option value="topic.postcount">[[search:number-of-replies]]</option>
-											<option value="topic.viewcount">[[search:number-of-views]]</option>
-											<option value="topic.timestamp">[[search:topic-start-date]]</option>
-											<option value="user.username">[[search:username]]</option>
-											<option value="category.name">[[search:category]]</option>
-										</select>
+									<div class="form-group post-search-item">
+										<label>[[search:post-time]]</label>
+										<div class="row">
+											<div class="col-md-6">
+												<div class="fg-line">
+													<select id="post-time-filter" class="form-control">
+														<option value="newer">[[search:newer-than]]</option>
+														<option value="older">[[search:older-than]]</option>
+													</select>
+												</div>
+											</div>
+											<div class="col-md-6">
+												<div class="fg-line">
+													<select id="post-time-range" class="form-control">
+														<option value="">[[search:any-date]]</option>
+														<option value="86400">[[search:yesterday]]</option>
+														<option value="604800">[[search:one-week]]</option>
+														<option value="1209600">[[search:two-weeks]]</option>
+														<option value="2592000">[[search:one-month]]</option>
+														<option value="7776000">[[search:three-months]]</option>
+														<option value="15552000">[[search:six-months]]</option>
+														<option value="31104000">[[search:one-year]]</option>
+													</select>
+												</div>
+											</div>
+										</div>
 									</div>
-								</div>
-								<div class="col-md-6">
-									<div class="fg-line">
-										<select id="post-sort-direction" class="form-control">
-											<option value="desc">[[search:descending]]</option>
-											<option value="asc">[[search:ascending]]</option>
-										</select>
+
+									<div class="form-group post-search-item">
+										<label>[[search:sort-by]]</label>
+										<div class="row">
+											<div class="col-md-6">
+												<div class="fg-line">
+													<select id="post-sort-by" class="form-control">
+														<option value="relevance">[[search:relevance]]</option>
+														<option value="timestamp">[[search:post-time]]</option>
+														<option value="votes">[[search:votes]]</option>
+														<option value="topic.lastposttime">[[search:last-reply-time]]</option>
+														<option value="topic.title">[[search:topic-title]]</option>
+														<option value="topic.postcount">[[search:number-of-replies]]</option>
+														<option value="topic.viewcount">[[search:number-of-views]]</option>
+														<option value="topic.votes">[[search:topic-votes]]</option>
+														<option value="topic.timestamp">[[search:topic-start-date]]</option>
+														<option value="user.username">[[search:username]]</option>
+														<option value="category.name">[[search:category]]</option>
+													</select>
+												</div>
+											</div>
+											<div class="col-md-6">
+												<div class="fg-line">
+													<select id="post-sort-direction" class="form-control">
+														<option value="desc">[[search:descending]]</option>
+														<option value="asc">[[search:ascending]]</option>
+													</select>
+												</div>
+											</div>
+										</div>
 									</div>
-								</div>
-							</div>
-						</div>
 
-						<div class="form-group post-search-item">
-							<label>[[search:show-results-as]]</label>
-							<div id="show-results-as">
-								<label class="radio radio-inline active">
-									<input type="radio" name="options" id="show-as-posts" autocomplete="off" checked>
-									<i class="input-helper"></i>
-									[[global:posts]]
-								</label>
-								<label class="radio radio-inline">
-									<input type="radio" name="options" id="show-as-topics" autocomplete="off">
-									<i class="input-helper"></i>
-									[[global:topics]]
-								</label>
+									<div class="form-group post-search-item">
+										<label>[[search:show-results-as]]</label>
+										<div id="show-results-as">
+											<label class="radio radio-inline active">
+												<input type="radio" name="options" id="show-as-posts" autocomplete="off" checked>
+												<i class="input-helper"></i>
+												[[global:posts]]
+											</label>
+											<label class="radio radio-inline">
+												<input type="radio" name="options" id="show-as-topics" autocomplete="off">
+												<i class="input-helper"></i>
+												[[global:topics]]
+											</label>
+										</div>
+									</div>
+
+								</div>
 							</div>
 						</div>
 
-						<a id="save-preferences" class="btn btn-sm btn-default" href="#">[[search:save-preferences]]</a>
-						<a id="clear-preferences" class="btn btn-sm btn-default" href="#">[[search:clear-preferences]]</a>
+						<button type="submit" class="btn btn-sm btn-primary">[[global:search]]</button>
+						<a id="save-preferences" class="btn btn-sm btn-primary" href="#">[[search:save-preferences]]</a>
+						<a id="clear-preferences" class="btn btn-sm btn-primary" href="#">[[search:clear-preferences]]</a>
+						
 					</div>
 				</div>
 			</form>
@@ -213,7 +227,7 @@
 								<!-- IF posts.user.picture -->
 								<img class="user-picture" title="{posts.user.username}" src="{posts.user.picture}"/>
 								<!-- ELSE -->
-								<div class="user-icon" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
+								<div class="user-icon" title="{posts.user.username}" style="background-color: {posts.user.icon:bgColor};">{posts.user.icon:text}</div>
 								<!-- ENDIF posts.user.picture -->
 							</a>
 							<a href="{config.relative_path}/category/{posts.category.slug}">[[global:posted_in, {posts.category.name}]] <i class="fa {posts.category.icon}"></i></a> <span class="timeago" title="{posts.timestampISO}"></span>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 4a30d24..b07084e 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -23,17 +23,7 @@
 			</div>
 			<!-- ENDIF merger -->
 
-			<div component="topic/deleted/message" class="lv-header-alt <!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
-				<span class="pull-left">[[topic:deleted_message]]</span>
-				<span class="pull-right">
-					<!-- IF deleter -->
-					<a href="{config.relative_path}/user/{deleter.userslug}">
-						<strong>{deleter.username}</strong>
-					</a>
-					<small class="timeago" title="{deletedTimestampISO}"></small>
-					<!-- ENDIF deleter -->
-				</span>
-			</div>
+			<!-- IMPORT partials/topic/deleted-message.tpl -->
 
 			<div class="lv-body">
 				<div component="topic" data-tid="{tid}" data-cid="{cid}">
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 8335932..67b3d95 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -8,11 +8,7 @@
 		<div class="listview lv-bordered lv-lg">
 			<div class="lv-header-alt <!-- IF !topics.length -->hidden<!-- ENDIF !topics.length -->">
 				<div class="title">
-					<!-- IF loggedIn -->
 					<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
-					<!-- ELSE -->
-					<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-					<!-- ENDIF loggedIn -->
 
 					<div class="markread btn-group <!-- IF !topics.length -->hidden<!-- ENDIF !topics.length -->">
 						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -35,21 +31,8 @@
 						</ul>
 					</div>
 
-					<div class="btn-group">
-						<button component="category/dropdown" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-							<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
-						</button>
-						<ul component="category/list" class="dropdown-menu" role="menu">
-							<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 -->
-							<li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}">
-								<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}<!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><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 -->
-  						</ul>
-					</div>
+					<!-- IMPORT partials/category-filter.tpl -->
+					
 					<div class="btn-group pull-right">
 						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 						{selectedFilter.name} <span class="caret"></span>