diff --git a/public/templates/account.tpl b/public/templates/account.tpl
deleted file mode 100644
index 24fc37573b..0000000000
--- a/public/templates/account.tpl
+++ /dev/null
@@ -1,165 +0,0 @@
-
-<div class="account-username-box" data-userslug="{userslug}">
-
-</div>
-
-<div class="account">
-
-	<div class="row">
-		<div class="col-md-5 account-block">
-
-			<div class="text-center account-picture-block panel panel-default">
-				<div class="panel-body">
-					<div>
-						<a href="{relative_path}/user/{userslug}"><img src="{picture}" class="user-profile-picture img-thumbnail"/></a>
-					</div>
-
-					<div>
-						<div>
-							<span>
-								<i class="account-online-status fa fa-circle status offline" title="[[global:{status}]]"></i>
-								<span class="account-username"> {username}</span>
-							</span>
-						</div>
-
-						<!-- IF banned -->
-						<div>
-							<span class="label label-danger">[[user:banned]]</span>
-						</div>
-						<!-- ENDIF banned -->
-						<div>
-							<a id="chat-btn" href="#" class="btn btn-primary hide">[[user:chat]]</a>
-							<a id="follow-btn" href="#" class="btn btn-success hide">[[user:follow]]</a>
-							<a id="unfollow-btn" href="#" class="btn btn-warning hide">[[user:unfollow]]</a>
-						</div>
-					</div>
-				</div>
-			</div>
-
-			<div class="text-center account-stats panel panel-default">
-				<div class="panel-body">
-					<div class="inline-block text-center">
-						<div class="human-readable-number" title="{reputation}">{reputation}</div>
-						<div class="account-bio-label">[[user:reputation]]</div>
-					</div>
-
-					<div class="inline-block text-center">
-						<div class="human-readable-number" title="{postcount}">{postcount}</div>
-						<div class="account-bio-label">[[user:posts]]</div>
-					</div>
-
-					<div class="inline-block text-center">
-						<div class="human-readable-number" title="{profileviews}">{profileviews}</div>
-						<div class="account-bio-label">[[user:profile_views]]</div>
-					</div>
-				</div>
-			</div>
-
-			<div class="panel panel-default">
-				<div class="panel-body">
-
-					<!-- IF email -->
-					<span class="account-bio-label">[[user:email]]</span>
-					<span class="account-bio-value"><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</span>
-					<!-- ENDIF email -->
-
-					<!-- IF fullname -->
-					<span class="account-bio-label">[[user:fullname]]</span>
-					<span class="account-bio-value">{fullname}</span>
-					<!-- ENDIF fullname -->
-
-					<!-- IF websiteName -->
-					<span class="account-bio-label">[[user:website]]</span>
-					<span class="account-bio-value"><a href="{website}">{websiteName}</a></span>
-					<!-- ENDIF websiteName -->
-
-					<!-- IF location -->
-					<span class="account-bio-label">[[user:location]]</span>
-					<span class="account-bio-value">{location}</span>
-					<!-- ENDIF location -->
-
-					<!-- IF age -->
-					<span class="account-bio-label">[[user:age]]</span>
-					<span class="account-bio-value">{age}</span>
-					<!-- ENDIF age -->
-
-
-					<span class="account-bio-label">[[user:followers]]</span>
-					<span class="human-readable-number account-bio-value" title="{followerCount}">{followerCount}</span>
-
-					<span class="account-bio-label">[[user:following]]</span>
-					<span class="human-readable-number account-bio-value"  title="{followingCount}">{followingCount}</span>
-
-					<span class="account-bio-label">[[user:joined]]</span>
-					<span class="timeago account-bio-value" title="{joindate}"></span>
-
-					<span class="account-bio-label">[[user:lastonline]]</span>
-					<span class="timeago account-bio-value" title="{lastonline}"></span>
-
-					<!-- IF !disableSignatures -->
-					<!-- IF signature -->
-					<hr/>
-					<span class="account-bio-label">[[user:signature]]</span>
-					<div class="post-signature">
-						<span id='signature'>{signature}</span>
-					</div>
-					<!-- ENDIF signature -->
-					<!-- ENDIF !disableSignatures -->
-				</div>
-			</div>
-
-			<!-- IF ips.length -->
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<h3 class="panel-title">[[global:recentips]]</h3>
-				</div>
-				<div class="panel-body">
-				<!-- BEGIN ips -->
-					<div>{ips.ip}</div>
-				<!-- END ips -->
-				</div>
-			</div>
-			<!-- ENDIF ips.length -->
-
-		</div>
-
-
-		<div class="col-md-7 user-recent-posts">
-			<div class="topic-row panel panel-default clearfix">
-				<div class="panel-heading">
-					<h3 class="panel-title">[[global:recentposts]]</h3>
-				</div>
-				<div class="panel-body">
-					<!-- IF !posts.length -->
-					<span>[[user:has_no_posts]]</span>
-					<!-- ENDIF !posts.length -->
-					<!-- BEGIN posts -->
-					<div class="clearfix">
-						<p>{posts.content}</p>
-						<small>
-							<span class="pull-right">
-								<a href="../../topic/{posts.tid}/#{posts.pid}">[[global:posted]]</a>
-								[[global:in]]
-								<a href="../../category/{posts.category.slug}">
-									<i class="fa {posts.category.icon}"></i> {posts.category.name}
-								</a>
-								<span class="timeago" title="{posts.relativeTime}"></span>
-							</span>
-						</small>
-					</div>
-					<hr/>
-					<!-- END posts -->
-				</div>
-			</div>
-
-		</div>
-	</div>
-
-	<br/>
-	<div id="user-action-alert" class="alert alert-success hide"></div>
-
-</div>
-
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
-<input type="hidden" template-type="boolean" template-variable="isFollowing" value="{isFollowing}" />
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
deleted file mode 100644
index 536943b7b5..0000000000
--- a/public/templates/accountedit.tpl
+++ /dev/null
@@ -1,156 +0,0 @@
-<div class="account-username-box" data-userslug="{userslug}">
-
-</div>
-
-<div class="account">
-
-	<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>
-				</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 -->
-
-	<div class="row">
-		<div class="col-md-2" style="text-align: center; margin-bottom:20px;">
-			<div class="account-picture-block text-center">
-				<img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br /><br />
-				<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
-			</div>
-		</div>
-
-		<div class="col-md-5">
-			<div>
-				<form class='form-horizontal'>
-
-					<div class="control-group">
-						<label class="control-label" for="inputUsername">[[user:username]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputUsername" placeholder="Username" value="{username}">
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputEmail">[[user:email]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputEmail" placeholder="Email" value="{email}">
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputFullname">[[user:fullname]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputWebsite">[[user:website]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputLocation">[[user:location]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputLocation" placeholder="Location" value="{location}">
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputBirthday">[[user:birthday]]</label>
-						<div class="controls">
-							<input class="form-control" type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
-						</div>
-					</div>
-
-					<!-- IF !disableSignatures -->
-					<div class="control-group">
-						<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
-						<div class="controls">
-							<textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea>
-						</div>
-					</div>
-					<!-- ENDIF !disableSignatures -->
-
-					<input type="hidden" id="inputUID" value="{uid}"><br />
-
-					<div class="form-actions">
-						<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
-					</div>
-
-				</form>
-			</div>
-
-			<hr class="visible-xs visible-sm"/>
-		</div>
-
-		<div class="col-md-5">
-			<div style="vertical-align:top;">
-				<form class='form-horizontal'>
-					<div class="control-group">
-						<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
-						<div class="controls">
-							<input class="form-control" type="password" id="inputCurrentPassword" placeholder="Current Password" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputNewPassword">[[user:password]]</label>
-						<div class="input-group">
-							<input class="form-control" type="password" id="inputNewPassword" placeholder="New Password" value="">
-							<span class="input-group-addon">
-								<span id="password-notify"><i class="fa fa-circle-o"></i></span>
-							</span>
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
-						<div class="input-group">
-							<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value="">
-							<span class="input-group-addon">
-								<span id="password-confirm-notify"><i class="fa fa-circle-o"></i></span>
-							</span>
-						</div>
-					</div>
-					<br/>
-					<div class="form-actions">
-						<a id="changePasswordBtn" href="#" class="btn btn-primary">[[user:change_password]]</a>
-					</div>
-
-				</form>
-			</div>
-		</div>
-
-	</div>
-</div>
-
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
-<input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />
-<input type="hidden" template-variable="uploadedpicture" value="{uploadedpicture}" />
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
deleted file mode 100644
index a407030ea3..0000000000
--- a/public/templates/accountposts.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
-
-</div>
-
-<div class="favourites">
-
-	<!-- IF !posts.length -->
-		<div class="alert alert-warning">[[user:has_no_posts]]</div>
-	<!-- ENDIF !posts.length -->
-
-	<div class="row">
-		<div class="col-md-12 user-favourite-posts" data-nextstart="{nextStart}">
-			<!-- BEGIN posts -->
-			<div class="topic-row panel panel-default clearfix">
-				<div class="panel-body">
-					<a href="../../user/{posts.userslug}">
-						<img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}">
-					</a>
-
-					<a href="../../user/{posts.userslug}">
-						<strong><span>{posts.username}</span></strong>
-					</a>
-					<p>{posts.content}</p>
-
-					<div>
-						<small>
-							<span class="pull-right">
-								<a href="../../topic/{posts.topic.slug}#{posts.pid}">[[global:posted]]</a>
-								[[global:in]]
-								<a href="../../category/{posts.category.slug}">
-									<i class="fa {posts.category.icon}"></i> {posts.category.name}
-								</a>
-								<span class="timeago" title="{posts.relativeTime}"></span>
-							</span>
-						</small>
-					</div>
-				</div>
-			</div>
-			<!-- END posts -->
-		</div>
-	</div>
-</div>
-
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
deleted file mode 100644
index d4d9bca105..0000000000
--- a/public/templates/category.tpl
+++ /dev/null
@@ -1,117 +0,0 @@
-
-<input type="hidden" template-variable="category_id" value="{cid}" />
-<input type="hidden" template-variable="category_name" value="{name}" />
-<input type="hidden" template-variable="currentPage" value="{currentPage}" />
-<input type="hidden" template-variable="pageCount" value="{pageCount}" />
-
-<ol class="breadcrumb">
-	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
-	</li>
-	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<span itemprop="title">{name} <a target="_blank" href="../{cid}.rss"><i class="fa fa-rss-square"></i></a></span>
-	</li>
-</ol>
-
-<div>
-	<!-- IF privileges.write -->
-	<button id="new_post" class="btn btn-primary">[[category:new_topic_button]]</button>
-	<!-- ENDIF privileges.write -->
-	<!-- IF !config.disableSocialButtons -->
-	<div class="inline-block pull-right">
-		<a href="#" id="facebook-share"><i class="fa fa-facebook-square fa-2x"></i></a>&nbsp;
-		<a href="#" id="twitter-share"><i class="fa fa-twitter-square fa-2x"></i></a>&nbsp;
-		<a href="#" id="google-share"><i class="fa fa-google-plus-square fa-2x"></i></a>&nbsp;
-	</div>
-	<!-- ENDIF !config.disableSocialButtons -->
-</div>
-
-<hr/>
-
-<!-- IF !topics.length -->
-<div class="alert alert-warning" id="category-no-topics">
-	[[category:no_topics]]
-</div>
-<!-- ENDIF !topics.length -->
-
-<div class="category row">
-	<div class="{topic_row_size}" no-widget-class="col-lg-12 col-sm-12">
-		<ul id="topics-container" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
-			<meta itemprop="itemListOrder" content="descending">
-			<!-- BEGIN topics -->
-			<li class="category-item <!-- IF topics.deleted -->deleted<!-- ENDIF topics.deleted --><!-- IF topics.unread -->unread<!-- ENDIF topics.unread -->" itemprop="itemListElement" data-tid="{topics.tid}" data-index="{topics.index}">
-
-				<div class="col-md-12 col-xs-12 panel panel-default topic-row">
-
-					<!--
-						todo: tidy this up, not sure what to do with the topic thumbs
-						todo: fix this nesting if issue#1065 is a win
-						todo: add a check for config.allowTopicsThumbnail if issue#1066 is a win
-					-->
-					<a href="../../user/{topics.user.userslug}" class="pull-left">
-						<img src="<!-- IF topics.thumb -->{topics.thumb}<!-- ELSE -->{topics.user.picture}<!-- ENDIF topics.thumb -->" class="img-rounded user-img" title="{topics.user.username}"/>
-					</a>
-
-					<h3>
-						<a href="../../topic/{topics.slug}" itemprop="url">
-							<meta itemprop="name" content="{topics.title}">
-
-							<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">
-							[[category:posts]]
-							<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
-						</span>
-						|
-						<span class="topic-stats">
-							[[category:views]]
-							<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
-						</span>
-						|
-						<span>
-							[[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span>
-						</span>
-
-						<span class="pull-right">
-							<!-- IF topics.unreplied -->
-							[[category:no_replies]]
-							<!-- ELSE -->
-							<a href="../../user/{topics.teaser.userslug}">
-								<img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
-							</a>
-							<a href="../../topic/{topics.slug}#{topics.teaser.pid}">
-								[[category:replied]]
-							</a>
-							<span class="timeago" title="{topics.teaser.timestamp}"></span>
-							<!-- ENDIF topics.unreplied -->
-						</span>
-					</small>
-
-				</div>
-
-			</li>
-			<!-- END topics -->
-		</ul>
-		<!-- IF config.usePagination -->
-		<div class="text-center">
-			<ul class="pagination">
-				<li class="previous pull-left"><a href="#"><i class="fa fa-chevron-left"></i> [[global:previouspage]]</a></li>
-				<li class="next pull-right"><a href="#">[[global:nextpage]] <i class="fa fa-chevron-right"></i></a></li>
-			</ul>
-		</div>
-		<!-- ENDIF config.usePagination -->
-	</div>
-
-	<!-- IF topics.length -->
-	<div widget-area="sidebar" class="col-md-3 col-xs-12 category-sidebar">
-		<!-- BEGIN widgets -->
-		{widgets.html}
-		<!-- END widgets -->
-	</div>
-	<!-- ENDIF topics.length -->
-</div>
-
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
deleted file mode 100644
index e793d0475b..0000000000
--- a/public/templates/favourites.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="account-username-box clearfix" data-userslug="{userslug}">
-
-</div>
-
-<div class="favourites">
-
-	<!-- IF !posts.length -->
-		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
-	<!-- ENDIF !posts.length -->
-
-	<div class="row">
-		<div class="col-md-12 user-favourite-posts" data-nextstart="{nextStart}">
-			<!-- BEGIN posts -->
-			<div class="topic-row panel panel-default clearfix">
-				<div class="panel-body">
-					<a href="../../user/{posts.userslug}">
-						<img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}">
-					</a>
-
-					<a href="../../user/{posts.userslug}">
-						<strong><span>{posts.username}</span></strong>
-					</a>
-					<div class="content">{posts.content}</div>
-
-					<div>
-						<small>
-							<span class="pull-right">
-								<a href="../../topic/{posts.topic.slug}#{posts.pid}">[[global:posted]]</a>
-								[[global:in]]
-								<a href="../../category/{posts.category.slug}">
-									<i class="fa {posts.category.icon}"></i> {posts.category.name}
-								</a>
-								<span class="timeago" title="{posts.relativeTime}"></span>
-							</span>
-						</small>
-					</div>
-				</div>
-			</div>
-			<!-- END posts -->
-		</div>
-	</div>
-</div>
-
-<input type="hidden" template-variable="yourid" value="{yourid}" />
-<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
deleted file mode 100644
index 25a5da4c57..0000000000
--- a/public/templates/header.tpl
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{browserTitle}</title>
-	<!-- BEGIN metaTags -->
-	<meta<!-- IF metaTags.name --> name="{metaTags.name}"<!-- ENDIF metaTags.name --><!-- IF metaTags.property --> property="{metaTags.property}"<!-- ENDIF metaTags.property --><!-- IF metaTags.content --> content="{metaTags.content}"<!-- ENDIF metaTags.content --> />
-	<!-- END metaTags -->
-	<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
-	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{cache-buster}" />
-	<!-- IF bootswatchCSS --><link href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
-	<!-- BEGIN linkTags -->
-	<link<!-- IF linkTags.link --> link="{linkTags.link}"<!-- ENDIF linkTags.link --><!-- IF linkTags.rel --> rel="{linkTags.rel}"<!-- ENDIF linkTags.rel --><!-- IF linkTags.type --> type="{linkTags.type}"<!-- ENDIF linkTags.type --><!-- IF linkTags.href --> href="{linkTags.href}"<!-- ENDIF linkTags.href --> />
-	<!-- END linkTags -->
-	<!-- IF useCustomCSS -->
-	<style type="text/css">{customCSS}</style>
-	<!-- ENDIF useCustomCSS -->
-
-	<!--[if lt IE 9]>
-  		<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/2.3.0/es5-shim.min.js"></script>
-  		<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
-  		<script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
-  		<script>__lt_ie_9__ = 1;</script>
-	<![endif]-->
-
-	<script>
-		var RELATIVE_PATH = "{relative_path}";
-	</script>
-	<script src="{relative_path}/socket.io/socket.io.js"></script>
-	<!-- BEGIN clientScripts -->
-	<script src="{relative_path}/{clientScripts.script}?{cache-buster}"></script>
-	<!-- END clientScripts -->
-	<script>
-		require.config({
-			baseUrl: "{relative_path}/src/modules",
-			waitSeconds: 3,
-			urlArgs: "{cache-buster}",
-			paths: {
-				"forum": '../forum'
-			}
-		});
-	</script>
-</head>
-
-<body>
-	<div class="navbar navbar-inverse navbar-fixed-top header" role="navigation" id="header-menu">
-		<div class="container">
-			<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>
-					<a href="{relative_path}/">
-						<h1 class="navbar-brand forum-title">{title}</h1>
-					</a>
-
-					<div class="header-topic-title visible-xs">
-						<span></span>
-					</div>
-
-				</div>
-			</div>
-
-			<div class="navbar-collapse collapse navbar-ex1-collapse">
-				<ul id="main-nav" class="nav navbar-nav pull-left">
-					<li class="nodebb-loggedin">
-						<a href="{relative_path}/unread"><i id="unread-count" class="fa fa-fw fa-inbox" data-content="0" title="[[global:header.unread]]"></i><span class="visible-xs-inline"> [[global:header.unread]]</span></a>
-					</li>
-					<li>
-						<a href="{relative_path}/recent"><i class="fa fa-fw fa-clock-o" title="[[global:header.recent]]"></i><span class="visible-xs-inline"> [[global:header.recent]]</span></a>
-					</li>
-					<li>
-						<a href="{relative_path}/popular"><i class="fa fa-fw fa-fire" title="[[global:header.popular]]"></i><span class="visible-xs-inline"> [[global:header.popular]]</span></a>
-					</li>
-					<li>
-						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> [[global:header.users]]</span></a>
-					</li>
-					<!-- IF isAdmin -->
-					<li>
-						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> [[global:header.admin]]</span></a>
-					</li>
-					<!-- ENDIF isAdmin -->
-
-					<!-- IF searchEnabled -->
-					<li class="visible-xs">
-						<a id="mobile-search-button" href="{relative_path}/search"><i class="fa fa-search fa-fw" title="[[global:header.search]]"></i> [[global:header.search]]</a>
-					</li>
-					<!-- ENDIF searchEnabled -->
-
-					<!-- BEGIN navigation -->
-					<li class="{navigation.class}">
-						<a href="{relative_path}{navigation.route}" title="{navigation.title}">
-							<!-- 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>
-					<!-- END navigation -->
-				</ul>
-
-				<ul id="logged-in-menu" class="nav navbar-nav navbar-right hide 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>
-
-					<li class="notifications dropdown text-center hidden-xs">
-						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="fa fa-fw fa-bell-o" data-content="0" title="[[global:header.notifications]]"></i></a>
-						<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
-							<li>
-								<a href="#"><i class="fa fa-refresh fa-spin"></i> [[global:notifications.loading]]</a>
-							</li>
-						</ul>
-					</li>
-					<li class="visible-xs">
-						<a href="{relative_path}/notifications"><i class="fa fa-exclamation-triangle fa-fw" title="[[notifications:title]]"></i> [[notifications:title]]</a>
-					</li>
-
-					<li class="chats dropdown">
-						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="chat_dropdown"><i class="fa fa-comment-o fa-fw" title="[[global:header.chats]]"></i> <span class="visible-xs-inline">[[global:header.chats]]</span></a>
-						<ul id="chat-list" class="dropdown-menu" aria-labelledby="chat_dropdown">
-							<li>
-								<a href="#"><i class="fa fa-refresh fa-spin"></i> [[global:chats.loading]]</a>
-							</li>
-						</ul>
-					</li>
-
-					<li id="user_label" class="dropdown">
-						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown" title="[[global:header.profile]]">
-							<img src=""/>
-						</a>
-						<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
-							<li>
-								<a id="user-profile-link" href=""><i class="fa fa-circle status-offline"></i><span>[[global:header.profile]]</span></a>
-							</li>
-							<li id="logout-link">
-								<a href="#">[[global:logout]]</a>
-							</li>
-							<li role="presentation" class="divider"></li>
-							<li>
-								<a href="#" class="user-status" data-status="online"><i class="fa fa-circle status online"></i><span> [[global:online]]</span></a>
-							</li>
-							<li>
-								<a href="#" class="user-status" data-status="away"><i class="fa fa-circle status away"></i><span> [[global:away]]</span></a>
-							</li>
-							<li>
-								<a href="#" class="user-status" data-status="dnd"><i class="fa fa-circle status dnd"></i><span> [[global:dnd]]</span></a>
-							</li>
-							<li>
-								<a href="#" class="user-status" data-status="offline"><i class="fa fa-circle status offline"></i><span> [[global:invisible]]</span></a>
-							</li>
-						</ul>
-					</li>
-				</ul>
-
-				<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>
-
-				<!-- IF searchEnabled -->
-				<ul id="logged-conditional-menu" 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 hide"><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 pagination-block hidden visible-lg visible-md">
-					<li class="active">
-						<a href="#">
-							<i class="fa fa-chevron-up pointer"></i>
-							<span id="pagination"></span>
-							<i class="fa fa-chevron-down pointer"></i>
-							<div class="progress-container">
-								<div class="progress-bar"></div>
-							</div>
-						</a>
-					</li>
-				</ul>
-
-				<div class="header-topic-title pull-right hidden-xs">
-					<span></span>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<input id="csrf_token" type="hidden" template-variable="csrf" value="{csrf}" />
-
-	<div class="container" id="content">
diff --git a/public/templates/popular.tpl b/public/templates/popular.tpl
deleted file mode 100644
index 912d2ea6e7..0000000000
--- a/public/templates/popular.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<ol class="breadcrumb">
-	<li><a href="{relative_path}/">[[global:home]]</a></li>
-	<li class="active">[[global:header.popular]] <a href="{relative_path}/popular.rss"><i class="fa fa-rss-square"></i></a></li>
-</ol>
-
-<ul class="nav nav-pills">
-	<li class=''><a href='{relative_path}/popular/posts'>[[global:posts]]</a></li>
-	<li class=''><a href='{relative_path}/popular/views'>[[global:views]]</a></li>
-</ul>
-
-<br />
-
-<a href="{relative_path}/popular">
-	<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>There are no popular topics.</strong>
-</div>
-<!-- ENDIF !topics.length -->
-
-<div class="category row">
-	<div class="col-md-12">
-		<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 -->">
-			<div class="col-md-12 col-xs-12 panel panel-default topic-row">
-				<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">
-						[[category:posts]]
-						<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
-					</span>
-					|
-					<span class="topic-stats">
-						[[category:views]]
-						<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
-					</span>
-					|
-					<span>
-						[[category:posted]] [[global:in]]
-						<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>
-						</span>
-					</span>
-
-					<span class="pull-right">
-						<!-- IF topics.unreplied -->
-						[[category:no_replies]]
-						<!-- ELSE -->
-						<a href="{relative_path}/user/{topics.teaser.userslug}">
-							<img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
-						</a>
-						<a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
-							[[category:replied]]
-						</a>
-						<span class="timeago" title="{topics.teaser.timestamp}"></span>
-						<!-- ENDIF topics.unreplied -->
-					</span>
-				</small>
-			</div>
-		</li>
-		<!-- END topics -->
-		</ul>
-	</div>
-</div>
diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
deleted file mode 100644
index a3b9ebde6b..0000000000
--- a/public/templates/recent.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<ol class="breadcrumb">
-	<li><a href="{relative_path}/">[[global:home]]</a></li>
-	<li class="active">[[recent:title]] <a href="{relative_path}/recent.rss"><i class="fa fa-rss-square"></i></a></li>
-</ol>
-
-<ul class="nav nav-pills">
-	<li class=''><a href='{relative_path}/recent/day'>[[recent:day]]</a></li>
-	<li class=''><a href='{relative_path}/recent/week'>[[recent:week]]</a></li>
-	<li class=''><a href='{relative_path}/recent/month'>[[recent:month]]</a></li>
-</ul>
-
-<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">
-		<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 -->">
-			<div class="col-md-12 col-xs-12 panel panel-default topic-row">
-				<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">
-						[[category:posts]]
-						<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
-					</span>
-					|
-					<span class="topic-stats">
-						[[category:views]]
-						<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
-					</span>
-					|
-					<span>
-						[[category:posted]] [[global:in]]
-						<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>
-						</span>
-					</span>
-
-					<span class="pull-right">
-						<!-- IF topics.unreplied -->
-						[[category:no_replies]]
-						<!-- ELSE -->
-						<a href="{relative_path}/user/{topics.teaser.userslug}">
-							<img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
-						</a>
-						<a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
-							[[category:replied]]
-						</a>
-						<span class="timeago" title="{topics.teaser.timestamp}"></span>
-						<!-- ENDIF topics.unreplied -->
-					</span>
-				</small>
-			</div>
-		</li>
-		<!-- END topics -->
-		</ul>
-	</div>
-</div>
diff --git a/public/templates/search.tpl b/public/templates/search.tpl
deleted file mode 100644
index f1bdd76006..0000000000
--- a/public/templates/search.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-<ol class="breadcrumb">
-	<li><a href="{relative_path}/">[[global:home]]</a></li>
-	<li class="active">[[global:search]]</li>
-</ol>
-
-
-<form id="mobile-search-form" class="navbar-form navbar-right visible-xs" role="search" method="GET" action="">
-	<div class="" 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>
-</form>
-
-<div class="search">
-	<div class="{show_results} row">
-
-		<div id="topic-results" class="col-md-12" data-search-query="{search_query}">
-
-			<h3>[[topic:topics]]</h3>
-
-			<!-- IF topic_matches -->
-			<small>{topic_matches} result(s) matching "{search_query}"</small>
-			<!-- ENDIF topic_matches -->
-			<div class="alert alert-info {show_no_topics}">[[topic:no_topics_found]]</div>
-
-			<!-- BEGIN topics -->
-			<div class="topic-row panel panel-default clearfix">
-				<div class="panel-body">
-
-
-					<a href="../../topic/{topics.slug}" class="search-result-text">
-						<h4>{topics.title}</h4>
-					</a>
-
-					<div>
-						<small>
-							<span class="pull-right">
-								<a href="../../user/{topics.userslug}"><img title="{topics.username}" class="img-rounded user-img" src="{topics.picture}"></a>
-								<a href="../../topic/{topics.slug}"> [[global:posted]]</a>
-								[[global:in]]
-								<a href="../../category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>
-								<span class="timeago" title="{topics.relativeTime}"></span>
-							</span>
-						</small>
-					</div>
-				</div>
-			</div>
-			<!-- END topics -->
-		</div>
-
-		<div id="post-results" class="col-md-12" data-search-query="{search_query}">
-			<h3>[[topic:posts]]</h3>
-
-			<!-- IF post_matches -->
-			<small>{post_matches} result(s) matching "{search_query}"</small>
-			<!-- ENDIF post_matches -->
-			<div class="alert alert-info {show_no_posts}">[[tropic:no_posts_found]]</div>
-
-			<!-- BEGIN posts -->
-			<div class="topic-row panel panel-default clearfix">
-				<div class="panel-body">
-
-					<a href="../../topic/{posts.topic.slug}#{posts.pid}" class="search-result-text">
-						<h4>{posts.topic.title}</h4>
-					</a>
-					<div class="search-result-text">
-						{posts.content}
-					</div>
-					<div>
-						<small>
-							<span class="pull-right">
-								<a href="../../user/{posts.userslug}">
-									<img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}">
-								</a>
-								<a href="../../topic/{posts.topic.slug}#{posts.pid}"> [[global:posted]]</a>
-								[[global:in]]
-								<a href="../../category/{posts.category.slug}">
-									<i class="fa {posts.category.icon}"></i> {posts.category.name}
-								</a>
-								<span class="timeago" title="{posts.relativeTime}"></span>
-							</span>
-						</small>
-					</div>
-				</div>
-			</div>
-			<!-- END posts -->
-		</div>
-	</div>
-</div>
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
deleted file mode 100644
index 201cf76f14..0000000000
--- a/public/templates/unread.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-<div class="unread">
-	<ol class="breadcrumb">
-		<li><a href="{relative_path}/">[[global:home]]</a></li>
-		<li class="active">[[unread:title]]</li>
-	</ol>
-
-
-	<div class="alert alert-warning {no_topics_message}" id="category-no-topics">
-		<strong>[[unread:no_unread_topics]]</strong>
-	</div>
-
-	<button id="mark-allread-btn" class="btn btn-primary {show_markallread_button}">[[unread:mark_all_read]]</button>
-
-	<a href="{relative_path}/unread">
-		<div class="alert alert-warning hide" id="new-topics-alert"></div>
-	</a>
-
-	<div class="category row">
-		<div class="col-md-12">
-			<ul id="topics-container" data-nextstart="{nextStart}">
-			<!-- BEGIN topics -->
-			<li class="category-item<!-- IF topics.deleted --> deleted<!-- ENDIF topics.deleted -->" data-tid="{topics.tid}">
-				<div class="col-md-12 col-xs-12 panel panel-default topic-row">
-					<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">
-							[[category:posts]]
-							<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
-						</span>
-						|
-						<span class="topic-stats">
-							[[category:views]]
-							<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
-						</span>
-						|
-						<span>
-							[[category:posted]] [[global:in]]
-							<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>
-							</span>
-						</span>
-
-						<span class="pull-right">
-							<!-- IF topics.unreplied -->
-							[[category:no_replies]]
-							<!-- ELSE -->
-							<a href="{relative_path}/user/{topics.teaser.userslug}">
-								<img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
-							</a>
-							<a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
-								[[category:replied]]
-							</a>
-							<span class="timeago" title="{topics.teaser.timestamp}"></span>
-							<!-- ENDIF topics.unreplied -->
-						</span>
-					</small>
-				</div>
-			</li>
-			<!-- END topics -->
-			</ul>
-			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
-		</div>
-	</div>
-</div>