diff --git a/page.hbs b/page.hbs
new file mode 100644
index 00000000..7c9e31e2
--- /dev/null
+++ b/page.hbs
@@ -0,0 +1,22 @@
+{{!< default}}
+
+{{! This is a page template. A page outputs content just like any other post, and has all the same
+    attributes by default, but you can also customise it to behave differently if you prefer. }}
+
+<main class="content" role="main">
+
+    <article class="{{post_class}}">
+
+        {{#post}}
+
+            <h1 class="post-title">{{{title}}}</h1>
+
+            <section class="post-content">
+                {{content}}
+            </section>
+
+        {{/post}}
+
+    </article>
+
+</main>
diff --git a/pagination.hbs b/pagination.hbs
new file mode 100644
index 00000000..7f16ae6f
--- /dev/null
+++ b/pagination.hbs
@@ -0,0 +1,9 @@
+<nav class="pagination" role="navigation">
+    {{#if prev}}
+      <a href="{{page_url prev}}"" class="tiny secondary button fi-arrow-left"></a>
+    {{/if}}
+    <span class="page-number">Page {{page}} of {{pages}}</span>
+    {{#if next}}
+      <a href="{{page_url next}}"" class="tiny secondary button fi-arrow-right"></a>
+    {{/if}}
+</nav>
diff --git a/tag.hbs b/tag.hbs
new file mode 100644
index 00000000..24b6330e
--- /dev/null
+++ b/tag.hbs
@@ -0,0 +1,54 @@
+{{!< default}}
+
+{{! The comment above "< default" means - insert everything in this file into
+    the {body} of the default.hbs template, which contains our header/footer. }}
+
+{{! The big featured header on the homepage, with the site logo and description }}
+<header id="site-head" {{#if @blog.cover}}style="background-image: url({{@blog.cover}})"{{/if}}>
+    <div class="vertical animated bounceInDown">
+        <div id="site-head-content" class="inner">
+          <h1 class="page-title">{{tag.name}}</h1>
+          <h2 class="page-description">
+              {{#if tag.description}}
+                  {{tag.description}}
+              {{else}}
+                  A {{pagination.total}}-post collection
+              {{/if}}
+          </h2>
+        </div>
+    </div>
+</header>
+
+{{! The main content area on the homepage }}
+<main class="content" role="main">
+
+    {{! Each post will be output using this markup }}
+    {{#foreach posts}}
+
+    <article class="{{post_class}}">
+        <header class="post-header">
+            <span class="post-meta"><time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{#if tags}}on {{tags}}{{/if}}</span>
+            <h2 class="post-title"><a href="{{url}}">{{{title}}}</a></h2>
+
+            <!--<a href="{{url}}#disqus_thread"></a>-->
+        </header>
+        <section class="post-excerpt">
+            <p>{{excerpt}}&hellip;</p>
+        </section>
+    </article>
+
+    {{/foreach}}
+
+    {{!! After all the posts, we have the previous/next pagination links }}
+    {{pagination}}
+
+    <script type="text/javascript">
+    var disqus_shortname = '{{@blog.disqus}}'; // required: replace example with your forum shortname
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+      dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+    </script>
+</main>
diff --git a/theme.json b/theme.json
new file mode 100644
index 00000000..29e3fbb6
--- /dev/null
+++ b/theme.json
@@ -0,0 +1,11 @@
+{
+  "files": {
+    "default": "default.hbs",
+    "index": "index.hbs",
+    "page": "page.hbs",
+    "post": "post.hbs",
+    "tag": "tag.hbs",
+    "pagination": "pagination.hbs"
+  },
+  "version":"0.1.2"
+}