diff --git a/templates/header.tpl b/templates/header.tpl
index ca25407..89fb7c8 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -47,7 +47,7 @@
 </head>
 
 <body>
-	<div class="navbar navbar-inverse navbar-fixed-top header" role="navigation" id="header-menu">
+	<div class="navbar navbar-fixed-top header" role="navigation" id="header-menu">
 		<div class="container">
 			<!-- IMPORT partials/menu.tpl -->
 		</div>
diff --git a/templates/partials/chat_messages.tpl b/templates/partials/chat_messages.tpl
new file mode 100644
index 0000000..81284ef
--- /dev/null
+++ b/templates/partials/chat_messages.tpl
@@ -0,0 +1,3 @@
+<!-- BEGIN messages -->
+<!-- IMPORT partials/chat_message.tpl -->
+<!-- END messages -->
\ No newline at end of file
diff --git a/templates/partials/fontawesome.tpl b/templates/partials/fontawesome.tpl
new file mode 100644
index 0000000..b0263d9
--- /dev/null
+++ b/templates/partials/fontawesome.tpl
@@ -0,0 +1 @@
+<i class="fa fa-adjust"></i><i class="fa fa-adn"></i><i class="fa fa-align-center"></i><i class="fa fa-align-justify"></i><i class="fa fa-align-left"></i><i class="fa fa-align-right"></i><i class="fa fa-ambulance"></i><i class="fa fa-anchor"></i><i class="fa fa-android"></i><i class="fa fa-angellist"></i><i class="fa fa-angle-double-down"></i><i class="fa fa-angle-double-left"></i><i class="fa fa-angle-double-right"></i><i class="fa fa-angle-double-up"></i><i class="fa fa-angle-down"></i><i class="fa fa-angle-left"></i><i class="fa fa-angle-right"></i><i class="fa fa-angle-up"></i><i class="fa fa-apple"></i><i class="fa fa-archive"></i><i class="fa fa-area-chart"></i><i class="fa fa-arrow-circle-down"></i><i class="fa fa-arrow-circle-left"></i><i class="fa fa-arrow-circle-o-down"></i><i class="fa fa-arrow-circle-o-left"></i><i class="fa fa-arrow-circle-o-right"></i><i class="fa fa-arrow-circle-o-up"></i><i class="fa fa-arrow-circle-right"></i><i class="fa fa-arrow-circle-up"></i><i class="fa fa-arrow-down"></i><i class="fa fa-arrow-left"></i><i class="fa fa-arrow-right"></i><i class="fa fa-arrow-up"></i><i class="fa fa-arrows"></i><i class="fa fa-arrows-alt"></i><i class="fa fa-arrows-h"></i><i class="fa fa-arrows-v"></i><i class="fa fa-asterisk"></i><i class="fa fa-at"></i><i class="fa fa-backward"></i><i class="fa fa-ban"></i><i class="fa fa-bar-chart"></i><i class="fa fa-barcode"></i><i class="fa fa-bars"></i><i class="fa fa-beer"></i><i class="fa fa-behance"></i><i class="fa fa-behance-square"></i><i class="fa fa-bell"></i><i class="fa fa-bell-o"></i><i class="fa fa-bell-slash"></i><i class="fa fa-bell-slash-o"></i><i class="fa fa-bicycle"></i><i class="fa fa-binoculars"></i><i class="fa fa-birthday-cake"></i><i class="fa fa-bitbucket"></i><i class="fa fa-bitbucket-square"></i><i class="fa fa-bold"></i><i class="fa fa-bolt"></i><i class="fa fa-bomb"></i><i class="fa fa-book"></i><i class="fa fa-bookmark"></i><i class="fa fa-bookmark-o"></i><i class="fa fa-briefcase"></i><i class="fa fa-btc"></i><i class="fa fa-bug"></i><i class="fa fa-building"></i><i class="fa fa-building-o"></i><i class="fa fa-bullhorn"></i><i class="fa fa-bullseye"></i><i class="fa fa-bus"></i><i class="fa fa-calculator"></i><i class="fa fa-calendar"></i><i class="fa fa-calendar-o"></i><i class="fa fa-camera"></i><i class="fa fa-camera-retro"></i><i class="fa fa-car"></i><i class="fa fa-caret-down"></i><i class="fa fa-caret-left"></i><i class="fa fa-caret-right"></i><i class="fa fa-caret-square-o-down"></i><i class="fa fa-caret-square-o-left"></i><i class="fa fa-caret-square-o-right"></i><i class="fa fa-caret-square-o-up"></i><i class="fa fa-caret-up"></i><i class="fa fa-cc"></i><i class="fa fa-cc-amex"></i><i class="fa fa-cc-discover"></i><i class="fa fa-cc-mastercard"></i><i class="fa fa-cc-paypal"></i><i class="fa fa-cc-stripe"></i><i class="fa fa-cc-visa"></i><i class="fa fa-certificate"></i><i class="fa fa-chain-broken"></i><i class="fa fa-check"></i><i class="fa fa-check-circle"></i><i class="fa fa-check-circle-o"></i><i class="fa fa-check-square"></i><i class="fa fa-check-square-o"></i><i class="fa fa-chevron-circle-down"></i><i class="fa fa-chevron-circle-left"></i><i class="fa fa-chevron-circle-right"></i><i class="fa fa-chevron-circle-up"></i><i class="fa fa-chevron-down"></i><i class="fa fa-chevron-left"></i><i class="fa fa-chevron-right"></i><i class="fa fa-chevron-up"></i><i class="fa fa-child"></i><i class="fa fa-circle"></i><i class="fa fa-circle-o"></i><i class="fa fa-circle-o-notch"></i><i class="fa fa-circle-thin"></i><i class="fa fa-clipboard"></i><i class="fa fa-clock-o"></i><i class="fa fa-cloud"></i><i class="fa fa-cloud-download"></i><i class="fa fa-cloud-upload"></i><i class="fa fa-code"></i><i class="fa fa-code-fork"></i><i class="fa fa-codepen"></i><i class="fa fa-coffee"></i><i class="fa fa-cog"></i><i class="fa fa-cogs"></i><i class="fa fa-columns"></i><i class="fa fa-comment"></i><i class="fa fa-comment-o"></i><i class="fa fa-comments"></i><i class="fa fa-comments-o"></i><i class="fa fa-compass"></i><i class="fa fa-compress"></i><i class="fa fa-copyright"></i><i class="fa fa-credit-card"></i><i class="fa fa-crop"></i><i class="fa fa-crosshairs"></i><i class="fa fa-css3"></i><i class="fa fa-cube"></i><i class="fa fa-cubes"></i><i class="fa fa-cutlery"></i><i class="fa fa-database"></i><i class="fa fa-delicious"></i><i class="fa fa-desktop"></i><i class="fa fa-deviantart"></i><i class="fa fa-digg"></i><i class="fa fa-dot-circle-o"></i><i class="fa fa-download"></i><i class="fa fa-dribbble"></i><i class="fa fa-dropbox"></i><i class="fa fa-drupal"></i><i class="fa fa-eject"></i><i class="fa fa-ellipsis-h"></i><i class="fa fa-ellipsis-v"></i><i class="fa fa-empire"></i><i class="fa fa-envelope"></i><i class="fa fa-envelope-o"></i><i class="fa fa-envelope-square"></i><i class="fa fa-eraser"></i><i class="fa fa-eur"></i><i class="fa fa-exchange"></i><i class="fa fa-exclamation"></i><i class="fa fa-exclamation-circle"></i><i class="fa fa-exclamation-triangle"></i><i class="fa fa-expand"></i><i class="fa fa-external-link"></i><i class="fa fa-external-link-square"></i><i class="fa fa-eye"></i><i class="fa fa-eye-slash"></i><i class="fa fa-eyedropper"></i><i class="fa fa-facebook"></i><i class="fa fa-facebook-square"></i><i class="fa fa-fast-backward"></i><i class="fa fa-fast-forward"></i><i class="fa fa-fax"></i><i class="fa fa-female"></i><i class="fa fa-fighter-jet"></i><i class="fa fa-file"></i><i class="fa fa-file-archive-o"></i><i class="fa fa-file-audio-o"></i><i class="fa fa-file-code-o"></i><i class="fa fa-file-excel-o"></i><i class="fa fa-file-image-o"></i><i class="fa fa-file-o"></i><i class="fa fa-file-pdf-o"></i><i class="fa fa-file-powerpoint-o"></i><i class="fa fa-file-text"></i><i class="fa fa-file-text-o"></i><i class="fa fa-file-video-o"></i><i class="fa fa-file-word-o"></i><i class="fa fa-files-o"></i><i class="fa fa-film"></i><i class="fa fa-filter"></i><i class="fa fa-fire"></i><i class="fa fa-fire-extinguisher"></i><i class="fa fa-flag"></i><i class="fa fa-flag-checkered"></i><i class="fa fa-flag-o"></i><i class="fa fa-flask"></i><i class="fa fa-flickr"></i><i class="fa fa-floppy-o"></i><i class="fa fa-folder"></i><i class="fa fa-folder-o"></i><i class="fa fa-folder-open"></i><i class="fa fa-folder-open-o"></i><i class="fa fa-font"></i><i class="fa fa-forward"></i><i class="fa fa-foursquare"></i><i class="fa fa-frown-o"></i><i class="fa fa-futbol-o"></i><i class="fa fa-gamepad"></i><i class="fa fa-gavel"></i><i class="fa fa-gbp"></i><i class="fa fa-gift"></i><i class="fa fa-git"></i><i class="fa fa-git-square"></i><i class="fa fa-github"></i><i class="fa fa-github-alt"></i><i class="fa fa-github-square"></i><i class="fa fa-gittip"></i><i class="fa fa-glass"></i><i class="fa fa-globe"></i><i class="fa fa-google"></i><i class="fa fa-google-plus"></i><i class="fa fa-google-plus-square"></i><i class="fa fa-google-wallet"></i><i class="fa fa-graduation-cap"></i><i class="fa fa-h-square"></i><i class="fa fa-hacker-news"></i><i class="fa fa-hand-o-down"></i><i class="fa fa-hand-o-left"></i><i class="fa fa-hand-o-right"></i><i class="fa fa-hand-o-up"></i><i class="fa fa-hdd-o"></i><i class="fa fa-header"></i><i class="fa fa-headphones"></i><i class="fa fa-heart"></i><i class="fa fa-heart-o"></i><i class="fa fa-history"></i><i class="fa fa-home"></i><i class="fa fa-hospital-o"></i><i class="fa fa-html5"></i><i class="fa fa-ils"></i><i class="fa fa-inbox"></i><i class="fa fa-indent"></i><i class="fa fa-info"></i><i class="fa fa-info-circle"></i><i class="fa fa-inr"></i><i class="fa fa-instagram"></i><i class="fa fa-ioxhost"></i><i class="fa fa-italic"></i><i class="fa fa-joomla"></i><i class="fa fa-jpy"></i><i class="fa fa-jsfiddle"></i><i class="fa fa-key"></i><i class="fa fa-keyboard-o"></i><i class="fa fa-krw"></i><i class="fa fa-language"></i><i class="fa fa-laptop"></i><i class="fa fa-lastfm"></i><i class="fa fa-lastfm-square"></i><i class="fa fa-leaf"></i><i class="fa fa-lemon-o"></i><i class="fa fa-level-down"></i><i class="fa fa-level-up"></i><i class="fa fa-life-ring"></i><i class="fa fa-lightbulb-o"></i><i class="fa fa-line-chart"></i><i class="fa fa-link"></i><i class="fa fa-linkedin"></i><i class="fa fa-linkedin-square"></i><i class="fa fa-linux"></i><i class="fa fa-list"></i><i class="fa fa-list-alt"></i><i class="fa fa-list-ol"></i><i class="fa fa-list-ul"></i><i class="fa fa-location-arrow"></i><i class="fa fa-lock"></i><i class="fa fa-long-arrow-down"></i><i class="fa fa-long-arrow-left"></i><i class="fa fa-long-arrow-right"></i><i class="fa fa-long-arrow-up"></i><i class="fa fa-magic"></i><i class="fa fa-magnet"></i><i class="fa fa-male"></i><i class="fa fa-map-marker"></i><i class="fa fa-maxcdn"></i><i class="fa fa-meanpath"></i><i class="fa fa-medkit"></i><i class="fa fa-meh-o"></i><i class="fa fa-microphone"></i><i class="fa fa-microphone-slash"></i><i class="fa fa-minus"></i><i class="fa fa-minus-circle"></i><i class="fa fa-minus-square"></i><i class="fa fa-minus-square-o"></i><i class="fa fa-mobile"></i><i class="fa fa-money"></i><i class="fa fa-moon-o"></i><i class="fa fa-music"></i><i class="fa fa-newspaper-o"></i><i class="fa fa-openid"></i><i class="fa fa-outdent"></i><i class="fa fa-pagelines"></i><i class="fa fa-paint-brush"></i><i class="fa fa-paper-plane"></i><i class="fa fa-paper-plane-o"></i><i class="fa fa-paperclip"></i><i class="fa fa-paragraph"></i><i class="fa fa-pause"></i><i class="fa fa-paw"></i><i class="fa fa-paypal"></i><i class="fa fa-pencil"></i><i class="fa fa-pencil-square"></i><i class="fa fa-pencil-square-o"></i><i class="fa fa-phone"></i><i class="fa fa-phone-square"></i><i class="fa fa-picture-o"></i><i class="fa fa-pie-chart"></i><i class="fa fa-pied-piper"></i><i class="fa fa-pied-piper-alt"></i><i class="fa fa-pinterest"></i><i class="fa fa-pinterest-square"></i><i class="fa fa-plane"></i><i class="fa fa-play"></i><i class="fa fa-play-circle"></i><i class="fa fa-play-circle-o"></i><i class="fa fa-plug"></i><i class="fa fa-plus"></i><i class="fa fa-plus-circle"></i><i class="fa fa-plus-square"></i><i class="fa fa-plus-square-o"></i><i class="fa fa-power-off"></i><i class="fa fa-print"></i><i class="fa fa-puzzle-piece"></i><i class="fa fa-qq"></i><i class="fa fa-qrcode"></i><i class="fa fa-question"></i><i class="fa fa-question-circle"></i><i class="fa fa-quote-left"></i><i class="fa fa-quote-right"></i><i class="fa fa-random"></i><i class="fa fa-rebel"></i><i class="fa fa-recycle"></i><i class="fa fa-reddit"></i><i class="fa fa-reddit-square"></i><i class="fa fa-refresh"></i><i class="fa fa-renren"></i><i class="fa fa-repeat"></i><i class="fa fa-reply"></i><i class="fa fa-reply-all"></i><i class="fa fa-retweet"></i><i class="fa fa-road"></i><i class="fa fa-rocket"></i><i class="fa fa-rss"></i><i class="fa fa-rss-square"></i><i class="fa fa-rub"></i><i class="fa fa-scissors"></i><i class="fa fa-search"></i><i class="fa fa-search-minus"></i><i class="fa fa-search-plus"></i><i class="fa fa-share"></i><i class="fa fa-share-alt"></i><i class="fa fa-share-alt-square"></i><i class="fa fa-share-square"></i><i class="fa fa-share-square-o"></i><i class="fa fa-shield"></i><i class="fa fa-shopping-cart"></i><i class="fa fa-sign-in"></i><i class="fa fa-sign-out"></i><i class="fa fa-signal"></i><i class="fa fa-sitemap"></i><i class="fa fa-skype"></i><i class="fa fa-slack"></i><i class="fa fa-sliders"></i><i class="fa fa-slideshare"></i><i class="fa fa-smile-o"></i><i class="fa fa-sort"></i><i class="fa fa-sort-alpha-asc"></i><i class="fa fa-sort-alpha-desc"></i><i class="fa fa-sort-amount-asc"></i><i class="fa fa-sort-amount-desc"></i><i class="fa fa-sort-asc"></i><i class="fa fa-sort-desc"></i><i class="fa fa-sort-numeric-asc"></i><i class="fa fa-sort-numeric-desc"></i><i class="fa fa-soundcloud"></i><i class="fa fa-space-shuttle"></i><i class="fa fa-spinner"></i><i class="fa fa-spoon"></i><i class="fa fa-spotify"></i><i class="fa fa-square"></i><i class="fa fa-square-o"></i><i class="fa fa-stack-exchange"></i><i class="fa fa-stack-overflow"></i><i class="fa fa-star"></i><i class="fa fa-star-half"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i><i class="fa fa-steam"></i><i class="fa fa-steam-square"></i><i class="fa fa-step-backward"></i><i class="fa fa-step-forward"></i><i class="fa fa-stethoscope"></i><i class="fa fa-stop"></i><i class="fa fa-strikethrough"></i><i class="fa fa-stumbleupon"></i><i class="fa fa-stumbleupon-circle"></i><i class="fa fa-subscript"></i><i class="fa fa-suitcase"></i><i class="fa fa-sun-o"></i><i class="fa fa-superscript"></i><i class="fa fa-table"></i><i class="fa fa-tablet"></i><i class="fa fa-tachometer"></i><i class="fa fa-tag"></i><i class="fa fa-tags"></i><i class="fa fa-tasks"></i><i class="fa fa-taxi"></i><i class="fa fa-tencent-weibo"></i><i class="fa fa-terminal"></i><i class="fa fa-text-height"></i><i class="fa fa-text-width"></i><i class="fa fa-th"></i><i class="fa fa-th-large"></i><i class="fa fa-th-list"></i><i class="fa fa-thumb-tack"></i><i class="fa fa-thumbs-down"></i><i class="fa fa-thumbs-o-down"></i><i class="fa fa-thumbs-o-up"></i><i class="fa fa-thumbs-up"></i><i class="fa fa-ticket"></i><i class="fa fa-times"></i><i class="fa fa-times-circle"></i><i class="fa fa-times-circle-o"></i><i class="fa fa-tint"></i><i class="fa fa-toggle-off"></i><i class="fa fa-toggle-on"></i><i class="fa fa-trash"></i><i class="fa fa-trash-o"></i><i class="fa fa-tree"></i><i class="fa fa-trello"></i><i class="fa fa-trophy"></i><i class="fa fa-truck"></i><i class="fa fa-try"></i><i class="fa fa-tty"></i><i class="fa fa-tumblr"></i><i class="fa fa-tumblr-square"></i><i class="fa fa-twitch"></i><i class="fa fa-twitter"></i><i class="fa fa-twitter-square"></i><i class="fa fa-umbrella"></i><i class="fa fa-underline"></i><i class="fa fa-undo"></i><i class="fa fa-university"></i><i class="fa fa-unlock"></i><i class="fa fa-unlock-alt"></i><i class="fa fa-upload"></i><i class="fa fa-usd"></i><i class="fa fa-user"></i><i class="fa fa-user-md"></i><i class="fa fa-users"></i><i class="fa fa-video-camera"></i><i class="fa fa-vimeo-square"></i><i class="fa fa-vine"></i><i class="fa fa-vk"></i><i class="fa fa-volume-down"></i><i class="fa fa-volume-off"></i><i class="fa fa-volume-up"></i><i class="fa fa-weibo"></i><i class="fa fa-weixin"></i><i class="fa fa-wheelchair"></i><i class="fa fa-wifi"></i><i class="fa fa-windows"></i><i class="fa fa-wordpress"></i><i class="fa fa-wrench"></i><i class="fa fa-xing"></i><i class="fa fa-xing-square"></i><i class="fa fa-yahoo"></i><i class="fa fa-yelp"></i><i class="fa fa-youtube"></i><i class="fa fa-youtube-play"></i><i class="fa fa-youtube-square"></i>
\ No newline at end of file
diff --git a/templates/partials/fork_thread_modal.tpl b/templates/partials/fork_thread_modal.tpl
new file mode 100644
index 0000000..a4ad5d0
--- /dev/null
+++ b/templates/partials/fork_thread_modal.tpl
@@ -0,0 +1,23 @@
+<div id="fork-thread-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4>[[topic:fork_topic]]</h4>
+			</div>
+			<div class="modal-body">
+				<div class="form-group">
+					<label for="title">Title</label>
+					<input id="fork-title" type="text" class="form-control" placeholder="Enter new thread title"><br/>
+					<label>[[topic:fork_topic_instruction]]</label> <br/>
+					<span id="fork-pids"></span>
+				</div>
+			</div>
+
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal" id="fork_thread_cancel">[[global:buttons.close]]</button>
+				<button type="button" class="btn btn-primary" id="fork_thread_commit" disabled>[[topic:confirm_fork]]</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/partials/groups/list.tpl b/templates/partials/groups/list.tpl
new file mode 100644
index 0000000..3789a5b
--- /dev/null
+++ b/templates/partials/groups/list.tpl
@@ -0,0 +1,23 @@
+	<!-- BEGIN groups -->
+	<div class="col-lg-4 col-md-6 col-sm-12" data-slug="{groups.slug}">
+		<div class="panel panel-default">
+			<div class="panel-heading list-cover" style="<!-- IF groups.cover:url -->background-image: url({groups.cover:url});<!-- ENDIF groups.cover:url -->">
+				<h3 class="panel-title">{groups.name} <small>{groups.memberCount}</small></h3>
+			</div>
+			<div class="panel-body">
+				<ul class="members">
+					<!-- BEGIN members -->
+					<li>
+						<a href="{relative_path}/user/{groups.members.userslug}">
+							<img src="{groups.members.picture}" title="{groups.members.userslug}" />
+						</a>
+					</li>
+					<!-- END members -->
+					<!-- IF groups.truncated -->
+					<li class="truncated"><i class="fa fa-ellipsis-h"></i></li>
+					<!-- ENDIF groups.truncated -->
+				</ul>
+			</div>
+		</div>
+	</div>
+	<!-- END groups -->
\ No newline at end of file
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
new file mode 100644
index 0000000..c44f072
--- /dev/null
+++ b/templates/partials/menu.tpl
@@ -0,0 +1,201 @@
+			<div class="navbar-header">
+				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+				</button>
+				<div>
+					<a href="{relative_path}/">
+						<img class="{brand:logo:display} forum-logo" src="{brand:logo}" />
+					</a>
+					<!-- IF showSiteTitle -->
+					<a href="{relative_path}/">
+						<h1 class="navbar-brand forum-title">{title}</h1>
+					</a>
+					<!-- ENDIF showSiteTitle -->
+
+					<div class="header-topic-title visible-xs">
+						<span></span>
+					</div>
+				</div>
+			</div>
+
+			<div class="navbar-collapse collapse navbar-ex1-collapse" id="nav-dropdown">
+				<!-- IF !maintenanceHeader -->
+				<ul id="main-nav" class="nav navbar-nav pull-left">
+					<!-- BEGIN navigation -->
+					<!-- IF function.displayMenuItem, @index -->
+					<li class="{navigation.class}">
+						<a href="{relative_path}{navigation.route}" title="{navigation.title}" id="{navigation.id}" target="{navigation.properties.target}">
+							<!-- IF navigation.iconClass -->
+							<i class="fa fa-fw {navigation.iconClass}"></i>
+							<!-- ENDIF navigation.iconClass -->
+
+							<!-- IF navigation.text -->
+							<span class="{navigation.textClass}">{navigation.text}</span>
+							<!-- ENDIF navigation.text -->
+						</a>
+					</li>
+					<!-- ENDIF function.displayMenuItem -->
+					<!-- END navigation -->
+				</ul>
+
+				<!-- IF loggedIn -->
+				<ul id="logged-in-menu" class="nav navbar-nav navbar-right pull-right">
+					<li class="notifications dropdown text-center hidden-xs">
+						<a href="#" title="[[global:header.notifications]]" class="dropdown-toggle" data-toggle="dropdown" id="notif_dropdown">
+							<i class="notification-icon fa fa-fw fa-bell-o" data-content="0"></i>
+						</a>
+						<ul class="dropdown-menu" aria-labelledby="notif_dropdown">
+							<li>
+								<ul id="notif-list">
+									<li>
+										<a href="#"><i class="fa fa-refresh fa-spin"></i> [[global:notifications.loading]]</a>
+									</li>
+								</ul>
+							</li>
+							<li class="notif-dropdown-link"><a href="#" class="mark-all-read">[[notifications:mark_all_read]]</a></li>
+							<li class="notif-dropdown-link"><a href="{relative_path}/notifications">[[notifications:see_all]]</a></li>
+						</ul>
+					</li>
+
+					<li class="visible-xs">
+						<a href="{relative_path}/notifications" title="[[notifications:title]]">
+							<i class="notification-icon fa fa-bell-o fa-fw" data-content="0"></i> [[notifications:title]]
+						</a>
+					</li>
+
+					<!-- IF !disableChat -->
+					<li class="chats dropdown">
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="[[global:header.chats]]" id="chat_dropdown">
+							<i id="chat-count" class="fa fa-comment-o fa-fw"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
+						</a>
+						<ul class="dropdown-menu" aria-labelledby="chat_dropdown">
+							<li>
+								<ul id="chat-list">
+									<li>
+										<a href="#"><i class="fa fa-refresh fa-spin"></i> [[global:chats.loading]]</a>
+									</li>
+								</ul>
+							</li>
+							<li class="notif-dropdown-link"><a href="{relative_path}/chats">[[modules:chat.see_all]]</a></li>
+						</ul>
+					</li>
+					<!-- ENDIF !disableChat -->
+
+					<li id="user_label" class="dropdown">
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown" title="[[global:header.profile]]">
+							<img id="user-header-picture" src="{user.picture}"/>
+						</a>
+						<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
+							<li>
+								<a id="user-profile-link" href="{relative_path}/user/{user.userslug}">
+									<i class="fa fa-fw fa-circle status {user.status}"></i> <span 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="fa fa-fw fa-circle status online"></i><span> [[global:online]]</span>
+								</a>
+							</li>
+							<li>
+								<a href="#" class="user-status" data-status="away">
+									<i class="fa fa-fw fa-circle status away"></i><span> [[global:away]]</span>
+								</a>
+							</li>
+							<li>
+								<a href="#" class="user-status" data-status="dnd">
+									<i class="fa fa-fw fa-circle status dnd"></i><span> [[global:dnd]]</span>
+								</a>
+							</li>
+							<li>
+								<a href="#" class="user-status" data-status="offline">
+									<i class="fa fa-fw fa-circle status offline"></i><span> [[global:invisible]]</span>
+								</a>
+							</li>
+							<li role="presentation" class="divider"></li>
+							<li id="logout-link">
+								<a href="#"><i class="fa fa-fw fa-sign-out"></i><span> [[global:logout]]</span></a>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<!-- ELSE -->
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right pull-right">
+					<!-- IF allowRegistration -->
+					<li>
+						<a href="{relative_path}/register">
+							<i class="fa fa-pencil visible-xs-inline"></i>
+							<span>[[global:register]]</span>
+						</a>
+					</li>
+					<!-- ENDIF allowRegistration -->
+					<li>
+						<a href="{relative_path}/login">
+							<i class="fa fa-sign-in visible-xs-inline"></i>
+							<span>[[global:login]]</span>
+						</a>
+					</li>
+				</ul>
+				<!-- ENDIF loggedIn -->
+				<!-- IF searchEnabled -->
+				<ul class="nav navbar-nav navbar-right">
+					<li>
+						<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
+							<div class="hide" id="search-fields">
+								<div class="form-group">
+									<input type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
+								</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" title="[[global:header.search]]"></i></button>
+						</form>
+					</li>
+				</ul>
+				<!-- ENDIF searchEnabled -->
+
+				<ul class="nav navbar-nav navbar-right pull-right">
+					<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>
+				</ul>
+
+				<ul class="nav navbar-nav navbar-right pagination-block hidden visible-lg visible-md">
+					<li 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 id="pagination"></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>
+
+						<div class="progress-container">
+							<div class="progress-bar"></div>
+						</div>
+
+						<ul class="dropdown-menu" role="menu">
+  							<input type="text" class="form-control" id="indexInput" placeholder="[[global:pagination.enter_index]]">
+  						</ul>
+					</li>
+				</ul>
+
+				<div class="header-topic-title hidden-xs">
+					<span></span>
+				</div>
+				<!-- ELSE -->
+				<ul class="nav navbar-nav navbar-right pull-right">
+					<li>
+						<a href="{relative_path}/login">
+							<i class="fa fa-sign-in visible-xs-inline"></i>
+							<span>[[global:login]]</span>
+						</a>
+					</li>
+				</ul>
+				<!-- ENDIF !maintenanceHeader -->
+			</div>
\ No newline at end of file
diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
new file mode 100644
index 0000000..3a3358a
--- /dev/null
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -0,0 +1,32 @@
+	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h3 id="myModalLabel">[[user:change_picture]]</h3>
+				</div>
+				<div class="modal-body">
+					<div id="gravatar-box">
+						<img id="user-gravatar-picture" src="" class="img-thumbnail user-profile-picture">
+						<span class="user-picture-label">[[user:gravatar]]</span>
+						<i class='fa fa-check fa-2x'></i>
+					</div>
+					<br/>
+					<div id="uploaded-box">
+						<img id="user-uploaded-picture" src="" class="img-thumbnail user-profile-picture">
+						<span class="user-picture-label">[[user:uploaded_picture]]</span>
+						<i class='fa fa-check fa-2x'></i>
+					</div>
+
+					<a id="uploadPictureBtn" href="#">[[user:upload_new_picture]]</a> <br/>
+					<!-- IF config.hasImageUploadPlugin -->
+					<a id="uploadFromUrlBtn" href="#">[[user:upload_new_picture_from_url]]</a>
+					<!-- ENDIF config.hasImageUploadPlugin -->
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
+					<button id="savePictureChangesBtn" class="btn btn-primary">[[global:save_changes]]</button>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
\ No newline at end of file
diff --git a/templates/partials/modals/upload_picture_from_url_modal.tpl b/templates/partials/modals/upload_picture_from_url_modal.tpl
new file mode 100644
index 0000000..240d709
--- /dev/null
+++ b/templates/partials/modals/upload_picture_from_url_modal.tpl
@@ -0,0 +1,17 @@
+	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture From Url" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h3>[[user:upload_picture]]</h3>
+				</div>
+				<div class="modal-body">
+					<input id="uploadFromUrl" class="form-control" type="text"/>
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button class="btn btn-primary upload-btn">[[user:upload_picture]]</button>
+				</div>
+			</div>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/templates/partials/modals/upload_picture_modal.tpl b/templates/partials/modals/upload_picture_modal.tpl
new file mode 100644
index 0000000..3fe7fd2
--- /dev/null
+++ b/templates/partials/modals/upload_picture_modal.tpl
@@ -0,0 +1,34 @@
+	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Upload Picture" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h3 id="myModalLabel">[[user:upload_picture]]</h3>
+				</div>
+				<div class="modal-body">
+					<form id="uploadForm" action="" method="post" enctype="multipart/form-data">
+						<div class="form-group">
+							<label for="userPhoto">[[user:upload_a_picture]]</label>
+							<input type="file" id="userPhotoInput" name="files[]">
+							<p class="help-block">[[user:image_spec]] <span id="file-size-block" class="hide"> ([[user:max]] <span id="upload-file-size"></span> kbs.)</span></p>
+						</div>
+						<input type="hidden" id="params" name="params" />
+					</form>
+
+					<div id="upload-progress-box" class="progress progress-striped">
+						<div id="upload-progress-bar" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0">
+							<span class="sr-only"> [[success:success]]</span>
+						</div>
+					</div>
+
+					<div id="alert-status" class="alert alert-info hide"></div>
+					<div id="alert-success" class="alert alert-success hide"></div>
+					<div id="alert-error" class="alert alert-danger hide"></div>
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+					<button id="pictureUploadSubmitBtn" class="btn btn-primary">[[user:upload_picture]]</button>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
\ No newline at end of file
diff --git a/templates/partials/modals/votes_modal.tpl b/templates/partials/modals/votes_modal.tpl
new file mode 100644
index 0000000..c6e7bae
--- /dev/null
+++ b/templates/partials/modals/votes_modal.tpl
@@ -0,0 +1,13 @@
+<h3>Upvoters <small>({upvoteCount})</small></h3>
+<!-- BEGIN upvoters -->
+<a href="{relative_path}/user/{upvoters.userslug}">
+<img class="profile-image small" src="{upvoters.picture}" title="{upvoters.username}"/>
+</a>
+<!-- END upvoters -->
+
+<h3>Downvoters <small>({downvoteCount})</small></h3>
+<!-- BEGIN downvoters -->
+<a href="{relative_path}/user/{downvoters.userslug}">
+<img class="profile-image small" src="{downvoters.picture}" title="{downvoters.username}"/>
+</a>
+<!-- END downvoters -->
\ No newline at end of file
diff --git a/templates/partials/move_post_modal.tpl b/templates/partials/move_post_modal.tpl
new file mode 100644
index 0000000..db8ee88
--- /dev/null
+++ b/templates/partials/move_post_modal.tpl
@@ -0,0 +1,21 @@
+<div id="move-post-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4>[[topic:move_post]]</h4>
+			</div>
+			<div class="modal-body">
+				<div class="form-group">
+					<label for="topicId">Topic ID</label>
+					<input id="topicId" type="text" class="form-control" placeholder="Enter topic ID"><br/>
+				</div>
+			</div>
+
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal" id="move_post_cancel">[[global:buttons.close]]</button>
+				<button type="button" class="btn btn-primary" id="move_post_commit" disabled>[[topic:confirm_move]]</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/partials/move_thread_modal.tpl b/templates/partials/move_thread_modal.tpl
new file mode 100644
index 0000000..9c98c5b
--- /dev/null
+++ b/templates/partials/move_thread_modal.tpl
@@ -0,0 +1,24 @@
+<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Move Topic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h3>[[topic:move_topic]]</h3>
+			</div>
+			<div class="modal-body">
+				<p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p>
+				<p>
+					[[topic:disabled_categories_note]]
+				</p>
+				<div id="move-confirm" style="display: none;">
+					<hr />
+					<div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal" id="move_thread_cancel">[[global:buttons.close]]</button>
+				<button type="button" class="btn btn-primary" id="move_thread_commit" disabled>[[topic:confirm_move]]</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/partials/noscript/paginator.tpl b/templates/partials/noscript/paginator.tpl
new file mode 100644
index 0000000..62ebbdf
--- /dev/null
+++ b/templates/partials/noscript/paginator.tpl
@@ -0,0 +1,9 @@
+	<noscript>
+		<div class="text-center">
+			<ul class="pagination">
+				<!-- BEGIN pages -->
+				<li <!-- IF pages.active -->class="active"<!-- ENDIF pages.active -->><a href="?page={pages.page}">{pages.page}</a></li>
+				<!-- END pages -->
+			</ul>
+		</div>
+	</noscript>
\ No newline at end of file
diff --git a/templates/partials/noscript/warning.tpl b/templates/partials/noscript/warning.tpl
new file mode 100644
index 0000000..64dc5da
--- /dev/null
+++ b/templates/partials/noscript/warning.tpl
@@ -0,0 +1,10 @@
+	<noscript>
+		<div class="alert alert-danger">
+			<p>
+				Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you have been placed in <strong>read-only mode</strong>.
+			</p>
+			<p>
+				Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).
+			</p>
+		</div>
+	</noscript>
\ No newline at end of file
diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
new file mode 100644
index 0000000..97df155
--- /dev/null
+++ b/templates/partials/notifications_list.tpl
@@ -0,0 +1,23 @@
+
+<!-- IF !notifications.length -->
+<li class="no-notifs"><a>[[notifications:no_notifs]]</a></li>
+<!-- ENDIF !notifications.length -->
+
+<!-- BEGIN notifications -->
+<li class="{notifications.readClass}" data-nid="{notifications.nid}">
+	<!-- IF notifications.image -->
+	<!-- IF notifications.from -->
+	<a href="{relative_path}/user/{notifications.user.userslug}"><img src="{notifications.image}" /></a>
+	<!-- ENDIF notifications.from -->
+	<!-- ELSE -->
+	<img src="{notifications.image}" />
+	<!-- ENDIF notifications.image -->
+
+	<div class="pull-right mark-read" aria-label="Mark Read"></div>
+	<a href="{notifications.path}">
+		<span class="pull-right relTime">{notifications.timeago}</span>
+		<span class="text">{notifications.bodyShort}</span>
+	</a>
+	<div class="clear"></div>
+</li>
+<!-- END notifications -->
diff --git a/templates/partials/paginator.tpl b/templates/partials/paginator.tpl
new file mode 100644
index 0000000..e5526a3
--- /dev/null
+++ b/templates/partials/paginator.tpl
@@ -0,0 +1,18 @@
+
+<div class="text-center pagination-container<!-- IF !pagination.pages.length --> hidden<!-- ENDIF !pagination.pages.length -->">
+	<ul class="pagination">
+		<li class="previous pull-left<!-- IF !pagination.prev.active --> disabled<!-- ENDIF !pagination.prev.active -->">
+			<a href="?page={pagination.prev.page}" data-page="{pagination.prev.page}"><i class="fa fa-chevron-left"></i> </a>
+		</li>
+
+		<!-- BEGIN pages -->
+			<li class="page<!-- IF pagination.pages.active --> active<!-- ENDIF pagination.pages.active -->" >
+				<a href="?{pagination.pages.qs}" data-page="{pagination.pages.page}">{pagination.pages.page}</a>
+			</li>
+		<!-- END pages -->
+
+		<li class="next pull-right<!-- IF !pagination.next.active --> disabled<!-- ENDIF !pagination.next.active -->">
+			<a href="?page={pagination.next.page}" data-page="{pagination.next.page}"> <i class="fa fa-chevron-right"></i></a>
+		</li>
+	</ul>
+</div>
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
new file mode 100644
index 0000000..f1fc304
--- /dev/null
+++ b/templates/partials/post_bar.tpl
@@ -0,0 +1,43 @@
+<div class="inline-block">
+
+	<span class="tags">
+	<!-- BEGIN tags -->
+	<a href="{relative_path}/tags/{tags.value}"><span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span><span class="tag-topic-count">{tags.score}</span></a>
+	<!-- END tags -->
+	</span>
+
+	<!-- IF tags.length -->
+	<span>|</span>
+	<!-- ENDIF tags.length -->
+
+	<small class="topic-stats">
+		<span>[[global:posts]]</span>
+		<strong><span class="topic-post-count human-readable-number" title="{postcount}">{postcount}</span></strong> |
+		<span>[[global:views]]</span>
+		<strong><span class="human-readable-number" title="{viewcount}">{viewcount}</span></strong>
+	</small>
+	<span class="browsing-users hidden">
+		&bull;
+		<small><span>[[category:browsing]]</span></small>
+		<div class="thread_active_users active-users inline-block"></div>
+		<small class="hidden"><i class="fa fa-users"></i> <span class="user-count"></span></small>
+	</span>
+</div>
+
+<div class="topic-main-buttons pull-right inline-block">
+	<div class="loading-indicator" done="0" style="display:none;">
+		<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
+	</div>
+	<!-- IF privileges.topics:reply -->
+	<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
+	<!-- ELSE -->
+		<!-- IF !loggedIn -->
+		<a href="/login?next=topic/{slug}" class="btn btn-primary">[[topic:guest-login-reply]]</a>
+		<!-- ENDIF !loggedIn -->
+	<!-- ENDIF privileges.topics:reply -->
+
+	<!-- IMPORT partials/thread_sort.tpl -->
+
+	<!-- IMPORT partials/thread_tools.tpl -->
+</div>
+<div style="clear:both;"></div>
\ No newline at end of file
diff --git a/templates/partials/share_dropdown.tpl b/templates/partials/share_dropdown.tpl
new file mode 100644
index 0000000..a496f0d
--- /dev/null
+++ b/templates/partials/share_dropdown.tpl
@@ -0,0 +1,19 @@
+
+<ul class="dropdown-menu pull-right" role="menu">
+
+	<li role="presentation" class="dropdown-header">[[category:share_this_category]]</li>
+	<!-- IF !config.disableSocialButtons -->
+	<li role="presentation">
+		<a role="menuitem" class="facebook-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-facebook"></i></span> Facebook</a>
+	</li>
+	<li role="presentation">
+		<a role="menuitem" class="twitter-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-twitter"></i></span> Twitter</a>
+	</li>
+	<li role="presentation">
+		<a role="menuitem" class="google-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-google-plus"></i></span> Google+</a>
+	</li>
+	<!-- ENDIF !config.disableSocialButtons -->
+	<li class="text-center">
+		<input id="category-link" type="text" value="" class="form-control post-link inline-block"></input>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/templates/partials/tags_list.tpl b/templates/partials/tags_list.tpl
new file mode 100644
index 0000000..975344c
--- /dev/null
+++ b/templates/partials/tags_list.tpl
@@ -0,0 +1,5 @@
+<!-- BEGIN tags -->
+<h3 class="pull-left tag-container">
+	<a href="{relative_path}/tags/{tags.value}" data-value="{tags.value}"><span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span><span class="tag-topic-count">{tags.score}</span></a>
+</h3>
+<!-- END tags -->
\ No newline at end of file
diff --git a/templates/partials/thread_sort.tpl b/templates/partials/thread_sort.tpl
new file mode 100644
index 0000000..2f68208
--- /dev/null
+++ b/templates/partials/thread_sort.tpl
@@ -0,0 +1,12 @@
+
+
+<!-- IF loggedIn -->
+<div class="btn-group thread-sort dropup">
+	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:sort_by]] <span class="caret"></span></button>
+	<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>
+</div>
+<!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/thread_tools.tpl b/templates/partials/thread_tools.tpl
new file mode 100644
index 0000000..2189c43
--- /dev/null
+++ b/templates/partials/thread_tools.tpl
@@ -0,0 +1,31 @@
+
+
+<!-- IF privileges.view_thread_tools -->
+<div class="btn-group thread-tools dropup">
+	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
+	<ul class="dropdown-menu pull-right">
+		<!-- IF privileges.editable -->
+		<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
+		<li><a href="#" class="pin_thread"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
+		<li><a href="#" class="lock_thread"><i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
+		<li class="divider"></li>
+		<li><a href="#" class="move_thread"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
+		<li><a href="#" class="fork_thread"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
+		<li class="divider"></li>
+		<!-- ENDIF privileges.editable -->
+
+		<!-- IF privileges.deletable -->
+		<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
+		<li><a href="#" class="purge_thread <!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><span class="text-error"><i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]</span></a></li>
+		<!-- ENDIF privileges.deletable -->
+
+		<!-- IF privileges.editable -->
+		<!-- BEGIN thread_tools -->
+		<li>
+			<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
+		</li>
+		<!-- END thread_tools -->
+		<!-- ENDIF privileges.editable -->
+	</ul>
+</div>
+<!-- ENDIF privileges.view_thread_tools -->
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
new file mode 100644
index 0000000..6c8770a
--- /dev/null
+++ b/templates/partials/topics_list.tpl
@@ -0,0 +1,58 @@
+		<ul id="topics-container" data-nextstart="{nextStart}">
+			<!-- BEGIN topics -->
+			<li class="category-item<!-- IF topics.deleted --> deleted<!-- ENDIF topics.deleted --><!-- IF topics.unread --> unread<!-- ENDIF topics.unread -->" data-tid="{topics.tid}" data-cid="{topics.cid}">
+				<div class="col-md-12 col-xs-12 panel panel-default topic-row">
+
+					<!-- IF showSelect -->
+					<i class="fa fa-fw fa-square-o pull-left select pointer"></i>
+					<!-- ENDIF showSelect -->
+
+					<a href="{relative_path}/user/{topics.user.userslug}" class="pull-left">
+						<img class="img-rounded user-img" src="{topics.user.picture}" title="{topics.user.username}" />
+					</a>
+
+					<h3>
+						<a href="{relative_path}/topic/{topics.slug}">
+							<strong><!-- IF topics.pinned --><i class="fa fa-thumb-tack"></i><!-- ENDIF topics.pinned --> <!-- IF topics.locked --><i class="fa fa-lock"></i><!-- ENDIF topics.locked --></strong>
+							<span class="topic-title">{topics.title}</span>
+						</a>
+					</h3>
+
+					<small>
+						<span class="topic-stats">
+							[[global:posts]]
+							<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
+						</span>
+						|
+						<span class="topic-stats">
+							[[global:views]]
+							<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
+						</span>
+						|
+						<span>
+							<!-- IF topics.user.userslug -->
+								[[global:posted_in_ago_by, <a href="{relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>, <span class="timeago" title="{topics.relativeTime}"></span>, {topics.user.username}]]
+							<!-- ELSE -->
+								[[global:posted_in_ago_by_guest, <a href="{relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>, <span class="timeago" title="{topics.relativeTime}"></span>]]
+							<!-- ENDIF topics.user.userslug -->
+						</span>
+
+
+						<span class="pull-right">
+							<!-- IF topics.unreplied -->
+							<a href="{relative_path}/topic/{topics.slug}" itemprop="url">[[category:no_replies]]</a>
+							<!-- ELSE -->
+							<a href="<!-- IF topics.teaser.user.userslug -->{relative_path}/user/{topics.teaser.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.teaser.user.userslug -->">
+								<img class="teaser-pic" src="{topics.teaser.user.picture}" title="{topics.teaser.user.username}"/>
+							</a>
+							<a href="{relative_path}/topic/{topics.slug}/{topics.teaser.index}">
+								[[global:replied_ago, <span class="timeago" title="{topics.teaser.timestamp}"></span>]]
+							</a>
+							<!-- ENDIF topics.unreplied -->
+						</span>
+						<!-- IMPORT partials/category_tags.tpl -->
+					</small>
+				</div>
+			</li>
+			<!-- END topics -->
+		</ul>
\ No newline at end of file
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
new file mode 100644
index 0000000..ec01c82
--- /dev/null
+++ b/templates/partials/users_list.tpl
@@ -0,0 +1,21 @@
+<!-- BEGIN users -->
+<li class="users-box registered-user" data-uid="{users.uid}">
+	<a href="{relative_path}/user/{users.userslug}"><img src="{users.picture}" class="img-thumbnail"/></a>
+	<br/>
+	<div class="user-info">
+		<span>
+			<i class="fa fa-circle status {users.status}" title="[[global:{users.status}]]"></i>
+			<a href="{relative_path}/user/{users.userslug}">{users.username}</a>
+		</span>
+		<br/>
+		<div title="reputation" class="reputation">
+			<i class='fa fa-star'></i>
+			<span class='formatted-number'>{users.reputation}</span>
+		</div>
+		<div title="post count" class="post-count">
+			<i class='fa fa-pencil'></i>
+			<span class='formatted-number'>{users.postcount}</span>
+		</div>
+	</div>
+</li>
+<!-- END users -->
\ No newline at end of file
diff --git a/templates/popular.tpl b/templates/popular.tpl
new file mode 100644
index 0000000..fa17476
--- /dev/null
+++ b/templates/popular.tpl
@@ -0,0 +1,25 @@
+<div class="popular">
+
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<ul class="nav nav-pills">
+		<li><a href='{relative_path}/popular/daily'>[[recent:day]]</a></li>
+		<li><a href='{relative_path}/popular/weekly'>[[recent:week]]</a></li>
+		<li><a href='{relative_path}/popular/monthly'>[[recent:month]]</a></li>
+		<li><a href='{relative_path}/popular/alltime'>[[recent:alltime]]</a></li>
+	</ul>
+
+	<br />
+
+	<!-- IF !topics.length -->
+	<div class="alert alert-warning" id="category-no-topics">
+		<strong>[[recent:no_popular_topics]]</strong>
+	</div>
+	<!-- ENDIF !topics.length -->
+
+	<div class="category row">
+		<div class="col-md-12">
+			<!-- IMPORT partials/topics_list.tpl -->
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/recent.tpl b/templates/recent.tpl
new file mode 100644
index 0000000..43a7e69
--- /dev/null
+++ b/templates/recent.tpl
@@ -0,0 +1,28 @@
+<div class="recent">
+
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<!-- IF loggedIn -->
+	<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+	<!-- ELSE -->
+	<a href="/login?next=recent" class="btn btn-primary">[[category:guest-login-post]]</a>
+	<!-- ENDIF loggedIn -->
+
+	<br/><br/>
+
+	<a href="{relative_path}/recent">
+		<div class="alert alert-warning hide" id="new-topics-alert"></div>
+	</a>
+
+	<!-- IF !topics.length -->
+	<div class="alert alert-warning" id="category-no-topics">
+		<strong>[[recent:no_recent_topics]]</strong>
+	</div>
+	<!-- ENDIF !topics.length -->
+
+	<div class="category row">
+		<div class="col-md-12">
+			<!-- IMPORT partials/topics_list.tpl -->
+		</div>
+	</div>
+</div>
\ No newline at end of file
