diff --git a/templates/register.tpl b/templates/register.tpl
new file mode 100644
index 0000000..ce7553d
--- /dev/null
+++ b/templates/register.tpl
@@ -0,0 +1,107 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="row">
+	<div class="{register_window:spansize}">
+		<div class="well well-lg">
+			<div class="alert alert-danger" id="register-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
+				<button type="button" class="close" data-dismiss="alert">&times;</button>
+				<strong>[[error:registration-error]]</strong>
+				<p>{error}</p>
+			</div>
+			<form class="form-horizontal" role="form" action="{relative_path}/register" method="post">
+				<div class="form-group">
+					<label for="email" class="col-lg-4 control-label">[[register:email_address]]</label>
+					<div class="col-lg-8">
+						<div class="input-group">
+							<input class="form-control" type="text" placeholder="[[register:email_address_placeholder]]" name="email" id="email" autocorrect="off" autocapitalize="off" />
+							<span class="input-group-addon">
+								<span id="email-notify"><i class="fa fa-circle-o"></i></span>
+							</span>
+						</div>
+						<span class="help-block">[[register:help.email]]</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="username" class="col-lg-4 control-label">[[register:username]]</label>
+					<div class="col-lg-8">
+						<div class="input-group">
+							<input class="form-control" type="text" placeholder="[[register:username_placeholder]]" name="username" id="username" autocorrect="off" autocapitalize="off" />
+							<span class="input-group-addon">
+								<span id="username-notify"><i class="fa fa-circle-o"></i></span>
+							</span>
+						</div>
+						<span class="help-block">[[register:help.username_restrictions, {minimumUsernameLength}, {maximumUsernameLength}]]</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="password" class="col-lg-4 control-label">[[register:password]]</label>
+					<div class="col-lg-8">
+						<div class="input-group">
+							<input class="form-control" type="password" placeholder="[[register:password_placeholder]]" name="password" id="password" />
+							<span class="input-group-addon">
+								<span id="password-notify"><i class="fa fa-circle-o"></i></span>
+							</span>
+						</div>
+						<span class="help-block">[[register:help.minimum_password_length, {minimumPasswordLength}]]</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="password-confirm" class="col-lg-4 control-label">[[register:confirm_password]]</label>
+					<div class="col-lg-8">
+						<div class="input-group">
+							<input class="form-control" type="password" placeholder="[[register:confirm_password_placeholder]]" name="password-confirm" id="password-confirm" />
+							<span class="input-group-addon">
+								<span id="password-confirm-notify"><i class="fa fa-circle-o"></i></span>
+							</span>
+						</div>
+					</div>
+				</div>
+
+				<!-- BEGIN regFormEntry -->
+				<div class="form-group">
+					<label for="register-{regFormEntry.styleName}" class="col-lg-4 control-label">{regFormEntry.label}</label>
+					<div id="register-{regFormEntry.styleName}" class="col-lg-8">
+						{regFormEntry.html}
+					</div>
+				</div>
+				<!-- END regFormEntry -->
+
+				<!-- IF termsOfUse -->
+				<div class="form-group">
+					<label class="col-lg-4 control-label">&nbsp;</label>
+					<div class="col-lg-8">
+						<hr />
+						<strong>[[register:terms_of_use]]</strong>
+						<textarea readonly class="form-control" rows=6>{termsOfUse}</textarea>
+						<div class="checkbox">
+							<label>
+								<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
+							</label>
+						</div>
+					</div>
+				</div>
+				<!-- ENDIF termsOfUse -->
+				<div class="form-group">
+					<div class="col-lg-offset-4 col-lg-8">
+						<hr />
+						<button class="btn btn-primary btn-lg btn-block" id="register" type="submit">[[register:register_now_button]]</button>
+					</div>
+				</div>
+				<input id="referrer" type="hidden" name="referrer" value="" />
+			</form>
+		</div>
+	</div>
+
+	<!-- IF alternate_logins -->
+	<div class="col-md-6">
+		<div class="well well-lg">
+			<h4>[[register:alternative_registration]]</h4>
+			<ul class="alt-logins">
+				<!-- BEGIN authentication -->
+				<li class="{authentication.name}"><a rel="nofollow" target="_top" href="{relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></i></a></li>
+				<!-- END authentication -->
+			</ul>
+		</div>
+	</div>
+	<!-- ENDIF alternate_logins -->
+</div>
diff --git a/templates/reset.tpl b/templates/reset.tpl
new file mode 100644
index 0000000..5e93591
--- /dev/null
+++ b/templates/reset.tpl
@@ -0,0 +1,23 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+
+<div class="alert alert-info">
+	[[reset_password:enter_email]]
+</div>
+
+<div class="well">
+	<div class="alert alert-success" id="success" style="display:none">
+		<button type="button" class="close" data-dismiss="alert">&times;</button>
+		<strong>[[reset_password:password_reset_sent]]</strong>
+	</div>
+	<div class="alert alert-danger" id="error" style="display:none">
+		<button type="button" class="close" data-dismiss="alert">&times;</button>
+		<strong>[[reset_password:invalid_email]]</strong>
+	</div>
+	<form onsubmit="return false;">
+		<input type="text" class="form-control input-block input-lg" placeholder="[[reset_password:enter_email_address]]" id="email" />
+
+		<br />
+		<button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">[[reset_password:reset_password]]</button>
+	</form>
+</div>
diff --git a/templates/reset_code.tpl b/templates/reset_code.tpl
new file mode 100644
index 0000000..e9e46c1
--- /dev/null
+++ b/templates/reset_code.tpl
@@ -0,0 +1,37 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<!-- IF valid -->
+<div class="well">
+	<div class="alert alert-success" id="success" style="display:none">
+		<button type="button" class="close" data-dismiss="alert">&times;</button>
+		<strong>[[reset_password:password_changed.title]]</strong>
+		<p>[[reset_password:password_changed.message]]</p>
+	</div>
+	<div class="alert alert-warning" id="notice" style="display:none">
+		<strong></strong>
+		<p></p>
+	</div>
+	<form onsubmit="return false;" id="reset-form" class="row">
+		<div class="col-sm-6">
+			<label for="password">[[reset_password:new_password]]</label>
+			<input class="form-control" type="password" placeholder="[[reset_password:new_password]]" id="password" /><br />
+		</div>
+		<div class="col-sm-6">
+			<label for="repeat">[[reset_password:repeat_password]]</label>
+			<input class="form-control" type="password" placeholder="[[reset_password:repeat_password]]" id="repeat" /><br />
+		</div>
+
+		<button class="btn btn-primary btn-block" id="reset" type="submit">[[reset_password:reset_password]]</button>
+	</form>
+</div>
+<input type="hidden" template-variable="reset_code" value="{reset_code}" />
+<!-- ELSE -->
+<div class="panel panel-default panel-danger">
+	<div class="panel-heading">
+		<h3 class="panel-title">[[reset_password:wrong_reset_code.title]]</h3>
+	</div>
+	<div class="panel-body">
+		<p>[[reset_password:wrong_reset_code.message]]</p>
+	</div>
+</div>
+<!-- ENDIF valid -->
\ No newline at end of file
diff --git a/templates/search.tpl b/templates/search.tpl
new file mode 100644
index 0000000..0afb0d3
--- /dev/null
+++ b/templates/search.tpl
@@ -0,0 +1,178 @@
+<!-- IMPORT partials/breadcrumbs.tpl -->
+
+<div class="search">
+	<div class="row">
+		<div class="col-xs-12">
+			<div class="panel panel-default">
+				<div class="panel-heading" data-toggle="collapse" data-target=".search-options">
+					<h3 class="panel-title"><i class="fa fa-caret-down"></i> [[global:search]]</h3>
+				</div>
+				<div class="panel-body search-options collapse <!-- IF expandSearch -->in<!-- ENDIF expandSearch -->">
+					<form id="advanced-search">
+						<div class="form-group">
+							<div class="row">
+								<div class="col-md-6">
+									<label>[[global:search]]</label>
+									<input type="text" class="form-control" id="search-input" placeholder="[[global:search]]">
+								</div>
+								<div class="col-md-6">
+									<label>[[search:in]]</label>
+									<select id="search-in" class="form-control">
+										<option value="titlesposts">[[search:titles-posts]]</option>
+										<option value="titles">[[search:titles]]</option>
+										<option value="posts">[[global:posts]]</option>
+										<option value="users">[[global:users]]</option>
+										<option value="tags">[[tags:tags]]</option>
+									</select>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:by]]</label>
+							<input type="text" class="form-control" id="posted-by-user" placeholder="[[search:posted-by]]">
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:in-categories]]</label>
+							<select multiple class="form-control" id="posted-in-categories">
+								<option value="all">All Categories</option>
+								<option value="watched">Watched Categories</option>
+								<!-- BEGIN categories -->
+								<option value="{categories.cid}">{categories.name}</option>
+								<!-- END categories -->
+							</select>
+							<input type="checkbox" id="search-children"> [[search:search-child-categories]]
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:reply-count]]</label>
+							<div class="row">
+								<div class="col-md-6">
+									<select id="reply-count-filter" class="form-control">
+										<option value="atleast">[[search:at-least]]</option>
+										<option value="atmost">[[search:at-most]]</option>
+									</select>
+								</div>
+								<div class="col-md-6">
+									<input type="text" class="form-control" id="reply-count">
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:post-time]]</label>
+							<div class="row">
+								<div class="col-md-6">
+									<select id="post-time-filter" class="form-control">
+										<option value="newer">[[search:newer-than]]</option>
+										<option value="older">[[search:older-than]]</option>
+									</select>
+								</div>
+								<div class="col-md-6">
+									<select id="post-time-range" class="form-control">
+										<option value="">[[search:any-date]]</option>
+										<option value="86400">[[search:yesterday]]</option>
+										<option value="604800">[[search:one-week]]</option>
+										<option value="1209600">[[search:two-weeks]]</option>
+										<option value="2592000">[[search:one-month]]</option>
+										<option value="7776000">[[search:three-months]]</option>
+										<option value="15552000">[[search:six-months]]</option>
+										<option value="31104000">[[search:one-year]]</option>
+									</select>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:sort-by]]</label>
+							<div class="row">
+								<div class="col-md-6">
+									<select id="post-sort-by" class="form-control">
+										<option value="timestamp">[[search:post-time]]</option>
+										<option value="teaser.timestamp">[[search:last-reply-time]]</option>
+										<option value="topic.title">[[search:topic-title]]</option>
+										<option value="topic.postcount">[[search:number-of-replies]]</option>
+										<option value="topic.viewcount">[[search:number-of-views]]</option>
+										<option value="topic.timestamp">[[search:topic-start-date]]</option>
+										<option value="user.username">[[search:username]]</option>
+										<option value="category.name">[[search:category]]</option>
+									</select>
+								</div>
+								<div class="col-md-6">
+									<select id="post-sort-direction" class="form-control">
+										<option value="desc">[[search:descending]]</option>
+										<option value="asc">[[search:ascending]]</option>
+									</select>
+								</div>
+							</div>
+						</div>
+
+						<div class="form-group post-search-item">
+							<label>[[search:show-results-as]]</label>
+							<div class="btn-group" data-toggle="buttons" id="show-results-as">
+								<label class="btn btn-primary active">
+									<input type="radio" name="options" id="show-as-posts" autocomplete="off" checked> [[global:posts]]
+								</label>
+								<label class="btn btn-primary">
+									<input type="radio" name="options" id="show-as-topics" autocomplete="off"> [[global:topics]]
+								</label>
+							</div>
+						</div>
+
+
+						<button type="submit" class="btn btn-default">[[global:search]]</button>
+						<a id="save-preferences" href="#">[[search:save-preferences]]</a>
+						<a id="clear-preferences" href="#">[[search:clear-preferences]]</a>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+		<div id="results" class="col-md-12" data-search-query="{search_query}">
+			<!-- IF matchCount -->
+			<div class="alert alert-info">[[search:results_matching, {matchCount}, {search_query}, {time}]] </div>
+			<!-- ELSE -->
+			<div class="alert alert-warning">[[search:no-matches]]</div>
+			<!-- ENDIF matchCount -->
+
+			<!-- BEGIN posts -->
+			<div class="topic-row panel panel-default clearfix">
+				<div class="panel-body">
+
+					<a href="{relative_path}/topic/{posts.topic.slug}/{posts.index}" class="search-result-text">
+						<h4>{posts.topic.title}</h4>
+					</a>
+					<!-- IF showAsPosts -->
+					<div class="search-result-text">
+						{posts.content}
+						<p class="fade-out"></p>
+					</div>
+					<!-- ENDIF showAsPosts -->
+
+					<small>
+						<span class="pull-right post-preview-footer">
+							<a href="{relative_path}/user/{posts.user.userslug}"><img class="user-img" title="{posts.user.username}" src="{posts.user.picture}"/></a>
+							[[global:posted_in_ago, <a href="{relative_path}/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>
+			<!-- END posts -->
+
+			<!-- IF users.length -->
+			<ul id="users-container" class="users-container">
+			<!-- IMPORT partials/users_list.tpl -->
+			</ul>
+			<!-- ENDIF users.length -->
+
+			<!-- IF tags.length -->
+			<!-- IMPORT partials/tags_list.tpl -->
+			<!-- ENDIF tags.length -->
+
+			<!-- IMPORT partials/paginator.tpl -->
+		</div>
+	</div>
+</div>
diff --git a/templates/tag.tpl b/templates/tag.tpl
new file mode 100644
index 0000000..bba196a
--- /dev/null
+++ b/templates/tag.tpl
@@ -0,0 +1,19 @@
+
+<input type="hidden" template-variable="tag" value="{tag}" />
+
+<div class="tag">
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<!-- IF !topics.length -->
+	<div class="alert alert-warning">
+		<strong>[[tags:no_tag_topics]]</strong>
+	</div>
+	<!-- ENDIF !topics.length -->
+
+	<div class="category row">
+		<div class="col-md-12">
+			<!-- IMPORT partials/topics_list.tpl -->
+			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/tags.tpl b/templates/tags.tpl
new file mode 100644
index 0000000..e0cde4e
--- /dev/null
+++ b/templates/tags.tpl
@@ -0,0 +1,18 @@
+<div class="tags">
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<!-- IF !tags.length -->
+	<div class="alert alert-warning">
+		<strong>[[tags:no_tags]]</strong>
+	</div>
+	<!-- ENDIF !tags.length -->
+
+	<input class="form-control" type="text" id="tag-search" placeholder="[[global:search]]"/>
+	<br/>
+
+	<div class="category row">
+		<div class="col-md-12 clearfix tag-list" data-nextstart="{nextStart}">
+			<!-- IMPORT partials/tags_list.tpl -->
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
new file mode 100644
index 0000000..4aaf7e6
--- /dev/null
+++ b/templates/topic.tpl
@@ -0,0 +1,182 @@
+<input type="hidden" template-variable="topic_id" value="{tid}" />
+<input type="hidden" template-variable="topic_slug" value="{slug}" />
+<input type="hidden" template-variable="category_id" value="{category.cid}" />
+<input type="hidden" template-variable="currentPage" value="{currentPage}" />
+<input type="hidden" template-variable="pageCount" value="{pageCount}" />
+<input type="hidden" template-variable="locked" template-type="boolean" value="{locked}" />
+<input type="hidden" template-variable="deleted" template-type="boolean" value="{deleted}" />
+<input type="hidden" template-variable="pinned" template-type="boolean" value="{pinned}" />
+<input type="hidden" template-variable="topic_name" value="{title}" />
+<input type="hidden" template-variable="postcount" value="{postcount}" />
+<input type="hidden" template-variable="viewcount" value="{viewcount}" />
+
+<div class="topic">
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<ul id="post-container" class="posts" data-tid="{tid}">
+		<!-- BEGIN posts -->
+			<li class="post-row<!-- IF posts.deleted --> deleted<!-- ENDIF posts.deleted -->" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}" data-index="{posts.index}" data-timestamp="{posts.timestamp}" data-votes="{posts.votes}" itemscope itemtype="http://schema.org/Comment">
+				<a id="post_anchor_{posts.index}" name="{posts.index}"></a>
+
+				<meta itemprop="datePublished" content="{posts.relativeTime}">
+				<meta itemprop="dateModified" content="{posts.relativeEditTime}">
+
+				<div class="col-md-1 profile-image-block hidden-xs hidden-sm sub-post">
+					<a href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->">
+						<img src="{posts.user.picture}" align="left" class="img-thumbnail" itemprop="image" />
+						<!-- IF posts.user.banned -->
+						<span class="label label-danger">[[user:banned]]</span>
+						<!-- ENDIF posts.user.banned -->
+					</a>
+				</div>
+
+				<div class="col-md-11 panel panel-default post-block topic-item">
+
+					<a class="main-post avatar" href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->">
+						<img itemprop="image" src="{posts.user.picture}" align="left" class="img-thumbnail" width=150 height=150 />
+					</a>
+					<h3 class="main-post">
+						<p id="topic_title_{posts.pid}" class="topic-title" itemprop="name"><i class="fa fa-thumb-tack hide"></i> <i class="fa fa-lock hide"></i> {title}</p>
+					</h3>
+
+					<div class="topic-buttons">
+
+						<div class="btn-group">
+
+							<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="<!-- IF posts.user.userslug -->[[topic:posted_by, {posts.user.username}]]<!-- ELSE -->[[topic:posted_by_guest]]<!-- ENDIF posts.user.userslug -->">
+								<i class="fa fa-circle status {posts.user.status}" title="[[global:{posts.user.status}]]"></i>
+								<span class="visible-xs visible-md"><img class="" src="{posts.user.picture}" width=18 height=18 />&nbsp;</span>
+								<span class="username-field" href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}&nbsp;</span>
+								<span class="caret"></span>
+							</button>
+
+						    <ul class="dropdown-menu">
+								<li><a href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->"><i class="fa fa-user"></i> [[topic:profile]]</a></li>
+								<!-- IF !posts.selfPost -->
+								<!-- IF posts.user.userslug -->
+								<!-- IF loggedIn -->
+								<!-- IF !config.disableChat -->
+								<li><a href="#" class="chat"><i class="fa fa-comment"></i> [[topic:chat]]</a></li>
+								<!-- ENDIF !config.disableChat -->
+								<!-- ENDIF loggedIn -->
+								<!-- ENDIF posts.user.userslug -->
+								<!-- ENDIF !posts.selfPost -->
+						    </ul>
+						</div>
+
+						<div class="btn-group">
+							<!-- IF !posts.index -->
+							<button class="btn btn-sm btn-default follow" type="button" title="[[topic:notify_me]]"><!-- IF isFollowing --><i class="fa fa-eye-slash"><!-- ELSE --><i class="fa fa-eye"><!-- ENDIF isFollowing --></i></button>
+							<!-- ENDIF !posts.index -->
+							<!-- IF !posts.selfPost -->
+							<button class="btn btn-sm btn-default flag" type="button" title="[[topic:flag_title]]"><i class="fa fa-flag-o"></i></button>
+							<!-- ENDIF !posts.selfPost -->
+							<button data-favourited="{posts.favourited}" class="favourite favourite-tooltip btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
+								<span class="favourite-text">[[topic:favourite]]</span>
+								<span class="favouriteCount" data-favourites="{posts.reputation}">{posts.reputation}</span>&nbsp;
+								<!-- IF posts.favourited -->
+								<i class="fa fa-star"></i>
+								<!-- ELSE -->
+								<i class="fa fa-star-o"></i>
+								<!-- ENDIF posts.favourited -->
+							</button>
+						</div>
+
+						<!-- IF !reputation:disabled -->
+						<div class="btn-group">
+							<button class="upvote btn btn-sm btn-default <!-- IF posts.upvoted --> upvoted btn-primary <!-- ENDIF posts.upvoted -->">
+								<i class="fa fa-chevron-up"></i>
+							</button>
+							<button class="votes btn btn-sm btn-default" data-votes="{posts.votes}">{posts.votes}</button>
+							<!-- IF !downvote:disabled -->
+							<button class="downvote btn btn-sm btn-default <!-- IF posts.downvoted --> downvoted btn-primary <!-- ENDIF posts.downvoted -->">
+								<i class="fa fa-chevron-down"></i>
+							</button>
+							<!-- ENDIF !downvote:disabled -->
+						</div>
+						<!-- ENDIF !reputation:disabled -->
+
+						<!-- IF privileges.topics:reply -->
+						<div class="btn-group">
+							<button class="btn btn-sm btn-default quote" type="button" title="[[topic:quote]]"><i class="fa fa-quote-left"></i></button>
+							<button class="btn btn-sm btn-primary btn post_reply" type="button">[[topic:reply]] <i class="fa fa-reply"></i></button>
+						</div>
+						<!-- ENDIF privileges.topics:reply -->
+
+						<div class="pull-right">
+							<div class="btn-group post-tools">
+								<div class="dropdown share-dropdown pull-right">
+									<button title="[[topic:share]]"class="btn btn-sm btn-default share" data-toggle="dropdown" href="#"><i class="fa fa-share-square-o"></i></button>
+									<!-- IMPORT partials/share_dropdown.tpl -->
+								</div>
+							</div>
+
+							<!-- IF posts.display_moderator_tools -->
+							<div class="btn-group post-tools">
+								<div class="dropdown">
+									<button title="[[topic:tools]]" class="btn btn-sm btn-default" data-toggle="dropdown" href="#"><i class="fa fa-gear"></i></button>
+									<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel">
+										<button class="btn btn-sm btn-default edit" type="button" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button>
+										<button class="btn btn-sm btn-default delete" type="button" title="[[topic:delete]]"><i class="fa fa-trash-o"></i></button>
+										<button class="btn btn-sm btn-default purge <!-- IF !posts.deleted -->none<!-- ENDIF !posts.deleted -->" type="button" title="[[topic:purge]]"><i class="fa fa-eraser"></i></button>
+
+										<!-- IF posts.display_move_tools -->
+										<button class="btn btn-sm btn-default move" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
+										<!-- ENDIF posts.display_move_tools -->
+									</ul>
+								</div>
+							</div>
+							<!-- ENDIF posts.display_moderator_tools -->
+						</div>
+					</div>
+
+					<div id="content_{posts.pid}" class="post-content" itemprop="text">{posts.content}</div>
+					<!-- IF posts.user.signature -->
+					<div class="post-signature">{posts.user.signature}</div>
+					<!-- ENDIF posts.user.signature -->
+
+					<div class="post-info">
+						<span class="pull-right">
+							[[global:posted_ago, <span class="timeago" title="{posts.relativeTime}"></span>]]
+							<!-- IF posts.editor.username -->
+							<span>| [[global:last_edited_by_ago, <strong><a href="{relative_path}/user/{posts.editor.userslug}">{posts.editor.username}</a></strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</span>
+							<!-- ENDIF posts.editor.username -->
+						</span>
+						<span class="pull-left">
+							[[global:reputation]]: <i class='fa fa-star'></i> <span data-reputation="{posts.user.reputation}" data-uid="{posts.uid}" class='formatted-number reputation'>{posts.user.reputation}</span>&nbsp;|&nbsp;[[global:posts]]: <i class='fa fa-pencil'></i> <span class='formatted-number user_postcount_{posts.uid}'>{posts.user.postcount}</span>
+							<!-- IF posts.user.custom_profile_info.length -->
+								<!-- BEGIN custom_profile_info -->
+								| {posts.user.custom_profile_info.content}
+								<!-- END custom_profile_info -->
+							<!-- ENDIF posts.user.custom_profile_info.length -->
+						</span>
+						<div style="clear:both;"></div>
+					</div>
+				</div>
+				<div style="clear:both;"></div>
+			</li>
+
+			<!-- IF !posts.index -->
+			<li class="well post-bar" data-index="{posts.index}">
+				<!-- IMPORT partials/post_bar.tpl -->
+			</li>
+			<!-- ENDIF !posts.index -->
+		<!-- END posts -->
+	</ul>
+
+	<div class="well col-md-11 col-xs-12 pull-right post-bar bottom-post-bar hide">
+		<!-- IMPORT partials/post_bar.tpl -->
+	</div>
+
+	<!-- IF config.usePagination -->
+		<!-- IMPORT partials/paginator.tpl -->
+	<!-- ENDIF config.usePagination -->
+
+	<!-- IMPORT partials/move_thread_modal.tpl -->
+	<!-- IMPORT partials/fork_thread_modal.tpl -->
+	<!-- IMPORT partials/move_post_modal.tpl -->
+</div>
+
+<div widget-area="footer" class="col-xs-12"></div>
+
+<!-- IMPORT partials/noscript/paginator.tpl -->
\ No newline at end of file
diff --git a/templates/tos.tpl b/templates/tos.tpl
new file mode 100644
index 0000000..dcf6813
--- /dev/null
+++ b/templates/tos.tpl
@@ -0,0 +1,4 @@
+<h3>[[register:terms_of_use]]</h3>
+<hr/>
+
+{termsOfUse}
diff --git a/templates/unread.tpl b/templates/unread.tpl
new file mode 100644
index 0000000..9347209
--- /dev/null
+++ b/templates/unread.tpl
@@ -0,0 +1,36 @@
+<div class="unread">
+
+	<!-- IMPORT partials/breadcrumbs.tpl -->
+
+	<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
+		<strong>[[unread:no_unread_topics]]</strong>
+	</div>
+
+	<div class="markread btn-group <!-- IF !topics.length -->hidden<!-- ENDIF !topics.length -->">
+		<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+			[[unread:mark_as_read]] <span class="caret"></span>
+		</button>
+		<ul class="dropdown-menu" role="menu">
+
+			<li role="presentation">
+				<a id="markSelectedRead" role="menuitem" tabindex="-1" href="#">[[unread:selected]]</a>
+			</li>
+
+			<li role="presentation">
+				<a id="markAllRead" role="menuitem" tabindex="-1" href="#">[[unread:all]]</a>
+			</li>
+			<li class="divider"></li>
+		</ul>
+	</div>
+
+	<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">
+			<!-- IMPORT partials/topics_list.tpl -->
+			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
+		</div>
+	</div>
+</div>
diff --git a/templates/users.tpl b/templates/users.tpl
new file mode 100644
index 0000000..8b98bcf
--- /dev/null
+++ b/templates/users.tpl
@@ -0,0 +1,36 @@
+<div class="users">
+	<ul class="nav nav-pills">
+		<li class=''><a href='{relative_path}/users/online'>[[global:online]]</a></li>
+		<li class=''><a href='{relative_path}/users/latest'>[[users:latest_users]]</a></li>
+		<li class=''><a href='{relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
+		<li class=''><a href='{relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
+		<li class=''><a href='{relative_path}/users/search'>[[users:search]]</a></li>
+	</ul>
+
+	<br />
+
+	<div class="search {search_display} well">
+		<div class="input-group">
+			<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
+			<span class="input-group-addon">
+				<span id="user-notfound-notify"><i class="fa fa-search"></i></span>
+			</span>
+		</div>
+	</div>
+
+	<ul id="users-container" class="users-container">
+		<!-- IMPORT partials/users_list.tpl -->
+		<li class="users-box {show_anon} anon-user">
+			<img src="https://secure.gravatar.com/avatar/" class="img-thumbnail"/>
+			<br/>
+			<div class="user-info">
+				<span id="online_anon_count">{anonymousUserCount}</span>
+				<span>[[global:guests]]</span>
+			</div>
+		</li>
+	</ul>
+
+	<div class="text-center {loadmore_display}">
+		<button id="load-more-users-btn" class="btn btn-primary">[[users:load_more]]</button>
+	</div>
+</div>
diff --git a/theme.json b/theme.json
new file mode 100644
index 0000000..0d136e6
--- /dev/null
+++ b/theme.json
@@ -0,0 +1,7 @@
+{
+    "id": "nodebb-theme-persona",
+    "name": "Persona",
+    "description": "Persona Theme for NodeBB",
+    "url": "https://github.com/psychobunny/nodebb-theme-persona",
+    "screenshot": "screenshot.png"
+}
\ No newline at end of file
diff --git a/theme.less b/theme.less
new file mode 100644
index 0000000..8999b9d
--- /dev/null
+++ b/theme.less
@@ -0,0 +1,3 @@
+@import "./less/bootstrap/bootstrap";
+@import "./less/persona";
+@import "modules";
\ No newline at end of file