diff --git a/less/chats.less b/less/chats.less
index 923e585..1a1d550 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -43,6 +43,7 @@
 			width:24px;
 			height:24px;
 			margin-left: 0.5em;
+			border-radius: 50%;
 		}
 	}
 }
diff --git a/less/header.less b/less/header.less
index 22bcf99..8d23a67 100644
--- a/less/header.less
+++ b/less/header.less
@@ -129,6 +129,7 @@
 				max-width: 32px;
 				max-height: 32px;
 				float: left;
+				border-radius: 50%;
 			}
 
 			a {
@@ -208,6 +209,7 @@
 				img {
 					width: 32px;
 					margin-right: 1em;
+					border-radius: 50%;
 				}
 			}
 
diff --git a/less/notifications.less b/less/notifications.less
index c2e3929..b4ed4f6 100644
--- a/less/notifications.less
+++ b/less/notifications.less
@@ -34,6 +34,7 @@
 		.user-img {
 			width: 24px;
 			height: 24px;
+			border-radius: 50%;
 		}
 	}
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index bb26c39..783f2e5 100644
--- a/package.json
+++ b/package.json
@@ -38,4 +38,4 @@
   "bugs": {
     "url": "https://github.com/psychobunny/nodebb-theme-persona/issues"
   }
-}
+}
\ No newline at end of file
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 1ad8da9..c1f2da9 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -114,7 +114,7 @@
 						<div class="input-group">
 							<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
 							<span class="input-group-addon">
-								<span id="password-notify"><i class="fa fa-circle-o"></i></span>
+								<span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
 							</span>
 						</div>
 					</div>
@@ -124,7 +124,7 @@
 						<div class="input-group">
 							<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
 							<span class="input-group-addon">
-								<span id="password-confirm-notify"><i class="fa fa-circle-o"></i></span>
+								<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
 							</span>
 						</div>
 					</div>
diff --git a/templates/account/favourites.tpl b/templates/account/favourites.tpl
index 8cc5915..495cd53 100644
--- a/templates/account/favourites.tpl
+++ b/templates/account/favourites.tpl
@@ -7,12 +7,13 @@
 	<!-- ENDIF !posts.length -->
 
 	<div class="row">
+		<div class="col-xs-12">
+			<!-- IMPORT partials/posts_list.tpl -->
 
-		<!-- IMPORT partials/posts_list.tpl -->
-
-		<!-- IF config.usePagination -->
-			<!-- IMPORT partials/paginator.tpl -->
-		<!-- ENDIF config.usePagination -->
+			<!-- IF config.usePagination -->
+				<!-- IMPORT partials/paginator.tpl -->
+			<!-- ENDIF config.usePagination -->
+		</div>
 	</div>
 </div>
 
diff --git a/templates/account/groups.tpl b/templates/account/groups.tpl
index 4cabc46..b6eca0e 100644
--- a/templates/account/groups.tpl
+++ b/templates/account/groups.tpl
@@ -1,7 +1,7 @@
 
 <!-- IMPORT partials/account_menu.tpl -->
 
-<div id="groups-list" class="groups">
+<div component="groups/container" id="groups-list" class="groups row">
 	<!-- IF !groups.length -->
 	<div class="alert alert-warning">[[groups:no_groups_found]]</div>
 	<!-- ELSE -->
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index e5d12a6..1f82f5f 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -4,16 +4,17 @@
 <div class="favourites">
 
 	<!-- IF !posts.length -->
-	<div class="alert alert-info">[[user:has_no_posts]]</div>
+	<div class="alert alert-warning">[[user:has_no_posts]]</div>
 	<!-- ENDIF !posts.length -->
 
 	<div class="row">
+		<div class="col-xs-12">
+			<!-- IMPORT partials/posts_list.tpl -->
 
-		<!-- IMPORT partials/posts_list.tpl -->
-
-		<!-- IF config.usePagination -->
-			<!-- IMPORT partials/paginator.tpl -->
-		<!-- ENDIF config.usePagination -->
+			<!-- IF config.usePagination -->
+				<!-- IMPORT partials/paginator.tpl -->
+			<!-- ENDIF config.usePagination -->
+		</div>
 	</div>
 </div>
 
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 78631a0..8f10217 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -25,7 +25,7 @@
 							<!-- ENDIF !config.disableChat -->
  							<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
  							<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
-                            
+
                             				<!-- IF isAdmin -->
 							<br/><br/>
 
@@ -156,7 +156,7 @@
 
 		<div class="col-md-7">
 		<!-- IF !posts.length -->
-		<div class="alert alert-info">[[user:has_no_posts]]</div>
+		<div class="alert alert-warning">[[user:has_no_posts]]</div>
 		<!-- ENDIF !posts.length -->
 		<!-- IMPORT partials/posts_list.tpl -->
 		</div>
diff --git a/templates/chats.tpl b/templates/chats.tpl
index 0f04d76..0d95b58 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -1,65 +1,67 @@
-<div class="col-sm-9">
-	<!-- IF !allowed -->
-	<div class="alert alert-warning">
-		[[error:chat-restricted]]
-	</div>
-	<!-- ENDIF !allowed -->
-	<!-- IF meta -->
-	<div class="panel panel-default expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
-		<div class="panel-heading">
-			<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
-			<h2 class="panel-title">[[modules:chat.message-history]]</h2>
+<div class="row">
+	<div class="col-sm-9">
+		<!-- IF !allowed -->
+		<div class="alert alert-warning">
+			[[error:chat-restricted]]
 		</div>
-		<div class="panel-body">
-			<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
-			<ul class="chat-content">
-				<!-- IMPORT partials/chat_messages.tpl -->
-			</ul>
-			<div class="input-group">
-				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
-				<span class="input-group-btn">
-					<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
-				</span>
+		<!-- ENDIF !allowed -->
+		<!-- IF meta -->
+		<div class="panel panel-default expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
+			<div class="panel-heading">
+				<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
+				<h2 class="panel-title">[[modules:chat.message-history]]</h2>
+			</div>
+			<div class="panel-body">
+				<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
+				<ul class="chat-content">
+					<!-- IMPORT partials/chat_messages.tpl -->
+				</ul>
+				<div class="input-group">
+					<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
+					<span class="input-group-btn">
+						<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
+					</span>
+				</div>
 			</div>
 		</div>
-	</div>
-	<!-- ELSE -->
-	<div class="alert alert-info">
-		[[modules:chat.no-messages]]
-	</div>
-	<!-- ENDIF meta -->
-</div>
-<div class="col-sm-3">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h2 class="panel-title">[[modules:chat.contacts]]</h2>
-		</div>
-		<div class="panel-body">
-			<ul class="chats-list">
-				<!-- BEGIN contacts -->
-				<li data-username="{contacts.username}" data-uid="{contacts.uid}">
-					<i component="user/status" title="[[global:{contacts.status}]]" class="fa fa-circle status {contacts.status}"></i>
-					<img class="user-img" src="{contacts.picture}">
-					<span>{contacts.username}</span>
-				</li>
-				<!-- END contacts -->
-			</ul>
+		<!-- ELSE -->
+		<div class="alert alert-info">
+			[[modules:chat.no-messages]]
 		</div>
+		<!-- ENDIF meta -->
 	</div>
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h2 class="panel-title">[[modules:chat.recent-chats]]</h2>
+	<div class="col-sm-3">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h2 class="panel-title">[[modules:chat.contacts]]</h2>
+			</div>
+			<div class="panel-body">
+				<ul class="chats-list">
+					<!-- BEGIN contacts -->
+					<li data-username="{contacts.username}" data-uid="{contacts.uid}">
+						<i component="user/status" title="[[global:{contacts.status}]]" class="fa fa-circle status {contacts.status}"></i>
+						<img class="user-img" src="{contacts.picture}">
+						<span>{contacts.username}</span>
+					</li>
+					<!-- END contacts -->
+				</ul>
+			</div>
 		</div>
-		<div class="panel-body">
-			<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
-				<!-- BEGIN chats -->
-				<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
-					<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
-					<img class="user-img" src="{chats.picture}">
-					<span>{chats.username}</span>
-				</li>
-				<!-- END chats -->
-			</ul>
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h2 class="panel-title">[[modules:chat.recent-chats]]</h2>
+			</div>
+			<div class="panel-body">
+				<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
+					<!-- BEGIN chats -->
+					<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
+						<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
+						<img class="user-img" src="{chats.picture}">
+						<span>{chats.username}</span>
+					</li>
+					<!-- END chats -->
+				</ul>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index f849eff..5c0ccab 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -31,7 +31,7 @@
 
 				<span class="tag-list">
 					<!-- BEGIN tags -->
-					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag">{topics.tags.value}</span></a>
+					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.value}</span></a>
 					<!-- END tags -->
 					<!-- IF topics.tags.length --><small>&bull;</small><!-- ENDIF topics.tags.length -->
 				</span>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index fb7fd27..c045f39 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -34,11 +34,11 @@
 			</button>
 			<ul class="dropdown-menu" role="menu">
 				<li role="presentation" class="category">
-					<a role="menu-item" href="/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
+					<a role="menu-item" href="{config.relative_path}/unread"><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}">
-					<a role="menu-item" href="/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
+					<a role="menu-item" href="{config.relative_path}/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
 				</li>
 				<!-- END categories -->
 			</ul>
diff --git a/templates/users.tpl b/templates/users.tpl
index f71ab29..c03ae61 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -29,7 +29,7 @@
 		<!-- IMPORT partials/users_list.tpl -->
 		<!-- IF anonymousUserCount -->
 		<li class="users-box anon-user">
-			<img src="https://secure.gravatar.com/avatar/" />
+			<img src="{defaultGravatar}" />
 			<br/>
 			<div class="user-info">
 				<span id="online_anon_count">{anonymousUserCount}</span>