diff --git a/CHANGELOG b/CHANGELOG
index 46aa68a5..373892cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,18 @@
-X.X
+3.0 - XX/XX/XXXX
 
 * Refactored the way URL are handled.
 * Improved the english documentation
 * Fixed packaging using setuptools entrypoints
 * Added typogrify support
 * Added a way to disable feed generation
+* Added support for DIRECT_TEMPLATES
+* Allow multiple extensions for content files
+* Added less support
+* Improved the import script
+* Fixed a bunch of bugs :-)
+* Added functional tests
+* Rsync support in the generated Makefile
+* Improved feed support (easily pluggable with feedburner for instance)
 
 2.8
 
diff --git a/pelican/themes/notmyidea/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
deleted file mode 100644
index e29be0ca..00000000
--- a/pelican/themes/notmyidea/templates/categories.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-<ul>
-{% for category, articles in categories %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
-{% endfor %}
-</ul>
-{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/pelican/themes/simple/templates/base.html b/pelican/themes/simple/templates/base.html
index a1017219..ad2723fd 100644
--- a/pelican/themes/simple/templates/base.html
+++ b/pelican/themes/simple/templates/base.html
@@ -21,7 +21,7 @@
           {% endfor %}
         {% else %}
           {% for cat, null in categories %}
-            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+            <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
           {% endfor %}
         {% endif %}
         </ul></nav><!-- /#menu -->
diff --git a/pelican/themes/simple/templates/index.html b/pelican/themes/simple/templates/index.html
index ad2a3b2e..dfdb0b45 100644
--- a/pelican/themes/simple/templates/index.html
+++ b/pelican/themes/simple/templates/index.html
@@ -17,18 +17,6 @@
         </article></li>
 {% endfor %}
 </ol><!-- /#posts-list -->
-<p class="paginator">
-    {% if articles_page.has_previous() %}
-        {% if articles_page.previous_page_number() == 1 %}
-            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo;</a>
-        {% else %}
-            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo;</a>
-        {% endif %}
-    {% endif %}
-    Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
-    {% if articles_page.has_next() %}
-        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&raquo;</a>
-    {% endif %}
-</p>
+{% include 'pagination.html' %}
 </section><!-- /#content -->
 {% endblock content %}
diff --git a/pelican/themes/notmyidea/templates/pagination.html b/pelican/themes/simple/templates/pagination.html
similarity index 100%
rename from pelican/themes/notmyidea/templates/pagination.html
rename to pelican/themes/simple/templates/pagination.html