diff --git a/Makefile b/Makefile
index 44e101f..1fca162 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ else
 	cd $(OUTPUTDIR) && $(PY) -m pelican.server 8000
 endif
 
-devserver:
+devserver: html
 ifdef PORT
 	$(BASEDIR)/develop_server.sh restart $(PORT)
 else
diff --git a/README.md b/README.md
index 804ed13..f475993 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,15 @@ Now you should be able to run the blog and see it in your browser:
 
 
 ## How to write a new article
-This blog uses [pelican](http://docs.getpelican.com/)
+This blog uses [pelican](http://docs.getpelican.com/).
 
 
 # Publishing
 
 Publishing is done automatically for all commits in the master branch.  Most of
-the time, just push your changes and have them deployed.
+the time, just push your changes and have them deployed. 
 
 It is also possible to deploy directly from your local machine by
 running `make publish`.
+
+If you don't want to check out the repository, you can use the Github web interface to add a new file under a subdirectory of "content".
\ No newline at end of file
diff --git a/content/2015/we-have-a-blog.md b/content/2015/we-have-a-blog.md
deleted file mode 100644
index f8d9856..0000000
--- a/content/2015/we-have-a-blog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: My super title
-Date: 2015-07-25 22:00
-Category: Python
-Tags: blog
-Authors: pelme
-Summary: Short version for index and feeds
-
-And we have a blog.
-
-This was a nice hacking day.
-
-![We're legion]({filename}/2015/images/legion.jpg){.img-rounded}
diff --git a/content/2015/images/legion.jpg b/content/posts/2015/images/legion.jpg
similarity index 100%
rename from content/2015/images/legion.jpg
rename to content/posts/2015/images/legion.jpg
diff --git a/content/posts/2015/we-have-a-blog.md b/content/posts/2015/we-have-a-blog.md
new file mode 100644
index 0000000..3e4bc8a
--- /dev/null
+++ b/content/posts/2015/we-have-a-blog.md
@@ -0,0 +1,11 @@
+Title: We have a blog
+Date: 2015-07-25 22:00
+Tags: meta, europython
+Authors: pelme
+Summary: Short version for index and feeds
+
+And we have a blog.
+
+This was a nice hacking day! A photo from the EuroPython 2015 sprints in Bilbao.
+
+![We're legion]({attach}images/legion.jpg){.img-rounded}
diff --git a/content/posts/2016/welcome-to-the-official-pytest-blog.md b/content/posts/2016/welcome-to-the-official-pytest-blog.md
new file mode 100644
index 0000000..ec90b8e
--- /dev/null
+++ b/content/posts/2016/welcome-to-the-official-pytest-blog.md
@@ -0,0 +1,17 @@
+Title: Blog 1.0
+Date: 2016-06-24 12:00
+Tags: meta, sprint2016
+Authors: pfctdayelise
+Summary: Launch of the pytest blog
+
+Welcome to the launch of the official pytest blog!
+
+Pytest has grown from strength to strength over the past few years, and it's overdue that we have an official blog for releases and other project announcements.
+
+There is now a [pytest planet](http://planet.pytest.org/), which is a blog aggregator. If you have your own blog and can tag some entries as 'pytest', we invite you to [add your RSS feed there](https://github.com/fschulze/planet.pytest.org/blob/master/feeds.cfg).
+
+There is also the [pytest tricks](http://hackebrot.github.io/pytest-tricks/) blog, so if you have a small demonstration of how to use a cool pytest feature, that might be the place for it. If you don't have your own blog, you can submit a guest post to either pytest-tricks or the main pytest blog.
+
+It might be obvious that we're not the most gifted web designers, so we definitely welcome improvements at [the Github repository](https://github.com/pytest-dev/blog.pytest.org). This blog was first talked about at EuroPython 2015, so 11 months later, we thought it was more important to get it out there than to perfect the theme. Thanks to Javier Gonel and Andreas Pelme for their work to get it started.
+
+In upcoming months there are lots of things happening, with wrapping up the pytest development sprint and preparing for pytest 3.0. Stay tuned!
diff --git a/pelicanconf.py b/pelicanconf.py
index 82168b5..8a8c993 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -9,7 +9,7 @@
 EMAIL = 'pytest-dev@python.org'
 
 PATH = 'content'
-STATIC_PATHS = ('extra/favicon.ico', 'CNAME')
+STATIC_PATHS = ('extra/favicon.ico', 'CNAME', 'posts')
 EXTRA_PATH_METADATA = {
     'extra/favicon.ico': {'path': 'favicon.ico'},
     'CNAME': {'path': 'CNAME'},
@@ -35,6 +35,7 @@
 PLUGIN_PATHS = ['pelican-plugins']
 PLUGINS = ['assets', 'sitemap']
 
+ARTICLE_PATHS = ['posts']
 ARTICLE_URL = '{date:%Y}/{slug}/'
 ARTICLE_SAVE_AS = '{date:%Y}/{slug}/index.html'
 PAGE_URL = '{slug}/'
@@ -45,5 +46,6 @@
 
 
 RESOURCE_LINKS = [
-    ('http://pytest.org/latest/', 'Documentation'),
+    ('http://planet.pytest.org', 'Planet Pytest'),
+    ('http://pytest.org/latest/', 'pytest.org'),
 ]
diff --git a/theme/static/css/style.css b/theme/static/css/style.css
index e5f4ee3..e8a77e8 100644
--- a/theme/static/css/style.css
+++ b/theme/static/css/style.css
@@ -16,3 +16,8 @@
     margin-left: auto;
     margin-right: auto;
 }
+
+abbr {
+    color: gray;
+    font-size: 80%;
+}
\ No newline at end of file
diff --git a/theme/templates/archives.html b/theme/templates/archives.html
index f47fc65..ff8adf0 100644
--- a/theme/templates/archives.html
+++ b/theme/templates/archives.html
@@ -6,8 +6,8 @@ <h2>Archives:</h2>
 <table class="archives">
 {% for article in dates %}
     <tr>
-        <td>{{ article.locale_date }}</td>
-        <td><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></td>
+        <td class="archivedate">{{ article.locale_date }}</td>
+        <td class="archivetitle"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></td>
     </tr>
 {% endfor %}
 </table>
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 848c76d..f62eb7d 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -19,25 +19,24 @@
         <div class="row">
             <div class="col-md-offset-1 col-md-3">
                 <p class="logo">
-                    <a href="{{ SITEURL }}"><img src="{{ SITEURL }}/theme/img/pytest1.png"></a>
+                    <a href="{{ SITEURL }}/"><img src="{{ SITEURL }}/theme/img/pytest1.png"></a>
                 </p>
-                <h3>About pytest</h3>
+                <h3>about</h3>
                 <p>
                     pytest is a mature full-featured Python testing tool that helps
-                    you write better programs.
+                    you write better programs. 
                 </p>
 
-                <h3>Categories</h3>
-                <ul>
-                {% for cat, null in categories %}
-                    <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
-                {% endfor %}
-                </ul>
-
-                <h3>Resources</h3>
+                <h3>blog resources</h3>
                 <ul>
+                    <li><a href="{{ SITEURL }}/">Front page</a></live>
+                    <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
                     <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
                     <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS</a> </li>
+                    <li><a href="https://github.com/pytest-dev/blog.pytest.org">On Github</a>
+                </ul>
+                <h3>pytest resources</h3>
+                <ul>
                     {% for url, title in RESOURCE_LINKS %}
                     <li><a href="{{ url }}">{{ title }}</a></li>
                     {% endfor %}
diff --git a/theme/templates/page.html b/theme/templates/page.html
deleted file mode 100644
index 48a12e7..0000000
--- a/theme/templates/page.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-{% block navigation %}
-     <div class="navigation">
-        <ol class="nav">
-          <li><a href="{{ SITEURL }}">Blog</a> </li>
-          <li><a href="{{ SITEURL }}/archives.html">Archive</a></li>
-          <li><a href="{{ SITEURL }}/tags.html">Tags</a> </li>
-          <li><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> </li>
-        </ol>
-      </div>
-    {% endblock navigation %}
-{% block title %}{{ page.title }}{%endblock%}
-{% block content %}
-<div class="body">
-    <h1>{{ page.title }}</h1>
-    {{ page.content }}
-    </div>
-{% endblock %}
diff --git a/theme/templates/parts/article.html b/theme/templates/parts/article.html
index 448febe..120c6d7 100644
--- a/theme/templates/parts/article.html
+++ b/theme/templates/parts/article.html
@@ -1,13 +1,22 @@
 {% block content %}
 <div class="section">
     <h1 class="entry-title">
-      {{ article.title }}
+      <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
     </h1>
     <abbr>
-      {{ article.date.strftime('%Y-%m-%d %H:%M') }}
+      <div class="date">
+      published {{ article.date.strftime('%Y-%m-%d %H:%M') }}
+      </div>
+      <div class="author">
       {% if article.author %}
-         by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+         written by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
       {% endif %}
+      </div>
+      <div class="tagslist">
+      {% if article.tags %}
+        tags: {{ article.tags|join(', ')|striptags }}
+      {% endif %}
+      </div>
     </abbr>
       <div class="entry-content">
         {{ article.content }}
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index f9ab7f8..8ab1d23 100644
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -9,4 +9,7 @@
         </ol>
       </div>
 {% endblock navigation %}
-{% block title %}{{ SITENAME }} <small>{{ tag }}</small>{% endblock %}
\ No newline at end of file
+{% block title %}{{ SITENAME }} {% endblock %}
+<small>{{ tag }}</small>
+
+