diff --git a/MANIFEST.in b/MANIFEST.in
index 4dc39a85..996b1814 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include pelican *.html
+recursive-include pelican *.html *.css *png
 include LICENSE
diff --git a/bin/pelican b/bin/pelican
index d85eaf3c..e39d8c3a 100755
--- a/bin/pelican
+++ b/bin/pelican
@@ -10,7 +10,7 @@ parser.add_argument(dest='path',
     help='Path where to find the content files (default is "content").')
 parser.add_argument('-t', '--theme-path', dest='theme',
     help='Path where to find the theme templates. If not specified, it will'
-         'use the ones included with pelican.')
+         'use the default one included with pelican.')
 parser.add_argument('-o', '--output', dest='output',
     help='Where to output the generated files. If not specified, a directory'
          ' will be created, named "output" in the current path.')
diff --git a/pelican/contents.py b/pelican/contents.py
index a805efc2..0038b2fa 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -8,7 +8,7 @@ class Page(object):
     :param string: the string to parse, containing the original content.
     :param markup: the markup language to use while parsing.
     """
-    mandatory_properties = ('author', 'title')
+    mandatory_properties = ('title')
 
     def __init__(self, content, metadatas={}, settings={}):
         self.content = content
@@ -35,7 +35,7 @@ class Page(object):
 
 
 class Article(Page):
-    mandatory_properties = ('author', 'title', 'date', 'category')
+    mandatory_properties = ('title', 'date', 'category')
 
 
 class Quote(Page):
diff --git a/pelican/settings.py b/pelican/settings.py
index c7e60dc3..670584be 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -1,7 +1,7 @@
 import os
 
 _DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
-                              "themes"])
+                              "themes/notmyidea"])
 _DEFAULT_CONFIG = {'PATH': None,
                    'THEME': _DEFAULT_THEME,
                    'OUTPUT_PATH': 'output/',
diff --git a/samples/themes/notmyidea/css/main.css b/pelican/themes/notmyidea/css/main.css
similarity index 100%
rename from samples/themes/notmyidea/css/main.css
rename to pelican/themes/notmyidea/css/main.css
diff --git a/samples/themes/notmyidea/css/pygment.css b/pelican/themes/notmyidea/css/pygment.css
similarity index 100%
rename from samples/themes/notmyidea/css/pygment.css
rename to pelican/themes/notmyidea/css/pygment.css
diff --git a/samples/themes/notmyidea/css/reset.css b/pelican/themes/notmyidea/css/reset.css
similarity index 100%
rename from samples/themes/notmyidea/css/reset.css
rename to pelican/themes/notmyidea/css/reset.css
diff --git a/samples/themes/notmyidea/images/icons/delicious.png b/pelican/themes/notmyidea/images/icons/delicious.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/delicious.png
rename to pelican/themes/notmyidea/images/icons/delicious.png
diff --git a/samples/themes/notmyidea/images/icons/lastfm.png b/pelican/themes/notmyidea/images/icons/lastfm.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/lastfm.png
rename to pelican/themes/notmyidea/images/icons/lastfm.png
diff --git a/samples/themes/notmyidea/images/icons/rss.png b/pelican/themes/notmyidea/images/icons/rss.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/rss.png
rename to pelican/themes/notmyidea/images/icons/rss.png
diff --git a/samples/themes/notmyidea/images/icons/twitter.png b/pelican/themes/notmyidea/images/icons/twitter.png
similarity index 100%
rename from samples/themes/notmyidea/images/icons/twitter.png
rename to pelican/themes/notmyidea/images/icons/twitter.png
diff --git a/samples/themes/notmyidea/templates/archives.html b/pelican/themes/notmyidea/templates/archives.html
similarity index 100%
rename from samples/themes/notmyidea/templates/archives.html
rename to pelican/themes/notmyidea/templates/archives.html
diff --git a/samples/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
similarity index 79%
rename from samples/themes/notmyidea/templates/article.html
rename to pelican/themes/notmyidea/templates/article.html
index 4aed28f4..63384b9c 100644
--- a/samples/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -9,9 +9,12 @@
                 <abbr class="published" title="{{ article.date.isoformat() }}">
                     {{ article.date.strftime('%a %d %B %Y') }}
                 </abbr>
+                {% if article.author %}
                 <address class="vcard author">
                         By <a class="url fn" href="#">{{ article.author }}</a>
-                </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                </address>
+                {% endif %}
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/samples/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
similarity index 92%
rename from samples/themes/notmyidea/templates/base.html
rename to pelican/themes/notmyidea/templates/base.html
index a9572db8..4552016d 100644
--- a/samples/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -20,7 +20,9 @@
 </head>
 
 <body id="index" class="home">
-<a href="http://github.com/ametaireau"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+{% if GITHUB_URL %}
+<a href="{{ GITHUB_URL }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
+{% endif %}
 
         <header id="banner" class="body">
                 <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
diff --git a/pelican/themes/templates/categories.html b/pelican/themes/notmyidea/templates/categories.html
similarity index 100%
rename from pelican/themes/templates/categories.html
rename to pelican/themes/notmyidea/templates/categories.html
diff --git a/samples/themes/notmyidea/templates/category.html b/pelican/themes/notmyidea/templates/category.html
similarity index 100%
rename from samples/themes/notmyidea/templates/category.html
rename to pelican/themes/notmyidea/templates/category.html
diff --git a/samples/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
similarity index 91%
rename from samples/themes/notmyidea/templates/index.html
rename to pelican/themes/notmyidea/templates/index.html
index 3ee1edb1..69ae66f8 100644
--- a/samples/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -10,9 +10,11 @@
                                 {{ article.date.strftime('%a %d %B %Y') }}
                         </abbr>
 
+                        {% if article.author %}
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                        </address>
+                        {% endif %}<p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
diff --git a/pelican/themes/templates/tag.html b/pelican/themes/notmyidea/templates/tag.html
similarity index 100%
rename from pelican/themes/templates/tag.html
rename to pelican/themes/notmyidea/templates/tag.html
diff --git a/pelican/themes/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
similarity index 100%
rename from pelican/themes/templates/tags.html
rename to pelican/themes/notmyidea/templates/tags.html
diff --git a/pelican/themes/templates/archives.html b/pelican/themes/simple/templates/archives.html
similarity index 100%
rename from pelican/themes/templates/archives.html
rename to pelican/themes/simple/templates/archives.html
diff --git a/pelican/themes/templates/article.html b/pelican/themes/simple/templates/article.html
similarity index 100%
rename from pelican/themes/templates/article.html
rename to pelican/themes/simple/templates/article.html
diff --git a/pelican/themes/templates/base.html b/pelican/themes/simple/templates/base.html
similarity index 100%
rename from pelican/themes/templates/base.html
rename to pelican/themes/simple/templates/base.html
diff --git a/samples/themes/notmyidea/templates/categories.html b/pelican/themes/simple/templates/categories.html
similarity index 100%
rename from samples/themes/notmyidea/templates/categories.html
rename to pelican/themes/simple/templates/categories.html
diff --git a/pelican/themes/templates/category.html b/pelican/themes/simple/templates/category.html
similarity index 100%
rename from pelican/themes/templates/category.html
rename to pelican/themes/simple/templates/category.html
diff --git a/pelican/themes/templates/index.html b/pelican/themes/simple/templates/index.html
similarity index 100%
rename from pelican/themes/templates/index.html
rename to pelican/themes/simple/templates/index.html
diff --git a/samples/themes/notmyidea/templates/tag.html b/pelican/themes/simple/templates/tag.html
similarity index 100%
rename from samples/themes/notmyidea/templates/tag.html
rename to pelican/themes/simple/templates/tag.html
diff --git a/samples/themes/notmyidea/templates/tags.html b/pelican/themes/simple/templates/tags.html
similarity index 100%
rename from samples/themes/notmyidea/templates/tags.html
rename to pelican/themes/simple/templates/tags.html
diff --git a/samples/test_settings.py b/samples/test_settings.py
index 7c0ffd4f..85729eb7 100644
--- a/samples/test_settings.py
+++ b/samples/test_settings.py
@@ -3,11 +3,11 @@ PATH = 'samples/content'
 THEME = 'samples/themes/notmyidea'
 AUTHOR = u'Alexis Métaireau'
 
-BLOGNAME = 'NotMyIdea.org'
-BLOGSUBTITLE = u"%s's weblog" % AUTHOR
-BLOGURL = 'http://blog.notmyidea.org'
+SITENAME = 'Pelican'
+SITESUBTITLE = u"%s's weblog" % AUTHOR
+SITEURL = 'http://blog.notmyidea.org'
 
-BLOGROLL = (('Biologeek', 'http://biologeek.org'),
+SITEROLL = (('Biologeek', 'http://biologeek.org'),
             ('Filyb', "http://filyb.info/"),
             ('Libert-fr', "http://www.libert-fr.com"),
             ('N1k0', "http://prendreuncafe.com/blog/"),
diff --git a/setup.py b/setup.py
index b6be0012..4d7e6c89 100644
--- a/setup.py
+++ b/setup.py
@@ -7,14 +7,14 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.0',
+    version = '2.1',
     url = 'http://hg.lolnet.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',
     description = "A tool to generate a static blog, with restructured text input files.",
     long_description=open('README.rst').read(),
     packages = ['pelican'],
-    package_data = {'pelican': ['themes/templates/*']},
+    include_package_data = True,
     install_requires = requires, 
     scripts = ['bin/pelican'],
     classifiers = ['Development Status :: 5 - Production/Stable',