diff --git a/Makefile b/Makefile
index 6fb56e8..c6b86b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PY=/usr/bin/env python3
+PY=/usr/bin/env python
 PELICAN=$(CURDIR)/bin/pelican
 PELICANOPTS=
 
@@ -13,10 +13,13 @@ ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
 endif
 
+all: bootstrap devserver
+
 help:
 	@echo 'Makefile for a pelican Web site                                        '
 	@echo '                                                                       '
 	@echo 'Usage:                                                                 '
+	@echo '   make                             install deps and start devserver   '
 	@echo '   make html                        (re)generate the web site          '
 	@echo '   make clean                       remove the generated files         '
 	@echo '   make regenerate                  regenerate files upon modification '
@@ -26,6 +29,7 @@ help:
 	@echo '   make stopserver                  stop local server                  '
 	@echo '   make ssh_upload                  upload the web site via SSH        '
 	@echo '   make github                      upload the web site via gh-pages   '
+	@echo '   make bootstrap                   install and build dependencies     '
 	@echo '                                                                       '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
 	@echo '                                                                       '
diff --git a/pelicanconf.py b/pelicanconf.py
index f1add9e..d7b43be 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -28,7 +28,7 @@
 
 sys.path.append('src/pelican_extended_authors')
 
-PLUGIN_PATHS = ['src/pelican-plugins']
+PLUGIN_PATH = 'src/pelican-plugins'
 PLUGINS = (
     'pelican_edit_url',
     'pelican_extended_authors',
@@ -38,6 +38,9 @@
 SUMMARY_BEGIN_MARKER = '-- PELICAN_BEGIN_SUMMARY --'
 SUMMARY_END_MARKER = '-- PELICAN_END_SUMMARY --'
 
+# Default to first paragraph if no marker in article
+SUMMARY_USE_FIRST_PARAGRAPH = True
+
 # Menu
 DISPLAY_CATEGORIES_ON_MENU = False
 MENUITEMS = (
diff --git a/theme/static/img/credit-digitalocean.png b/theme/static/img/credit-digitalocean.png
deleted file mode 100644
index 4f82598..0000000
Binary files a/theme/static/img/credit-digitalocean.png and /dev/null differ
diff --git a/theme/static/img/psd/credit-skogmo.psd b/theme/static/img/psd/credit-skogmo.psd
deleted file mode 100644
index 5edf8fa..0000000
Binary files a/theme/static/img/psd/credit-skogmo.psd and /dev/null differ
diff --git a/theme/static/img/psd/event-raspberry.psd b/theme/static/img/psd/event-raspberry.psd
deleted file mode 100644
index 17200d4..0000000
Binary files a/theme/static/img/psd/event-raspberry.psd and /dev/null differ
diff --git a/theme/static/img/psd/footer-logo.psd b/theme/static/img/psd/footer-logo.psd
deleted file mode 100644
index aa21bec..0000000
Binary files a/theme/static/img/psd/footer-logo.psd and /dev/null differ
diff --git a/theme/static/img/psd/header-small.psd b/theme/static/img/psd/header-small.psd
deleted file mode 100644
index 7085005..0000000
Binary files a/theme/static/img/psd/header-small.psd and /dev/null differ
diff --git a/theme/static/img/psd/header.psd b/theme/static/img/psd/header.psd
deleted file mode 100644
index 1949758..0000000
Binary files a/theme/static/img/psd/header.psd and /dev/null differ
diff --git a/theme/static/img/psd/hero.psd b/theme/static/img/psd/hero.psd
deleted file mode 100644
index da329ab..0000000
Binary files a/theme/static/img/psd/hero.psd and /dev/null differ
diff --git a/theme/static/img/psd/profile.psd b/theme/static/img/psd/profile.psd
deleted file mode 100644
index 744dc01..0000000
Binary files a/theme/static/img/psd/profile.psd and /dev/null differ
diff --git a/theme/static/img/psd/profile2.psd b/theme/static/img/psd/profile2.psd
deleted file mode 100644
index d640a3a..0000000
Binary files a/theme/static/img/psd/profile2.psd and /dev/null differ
diff --git a/theme/templates/archives.html b/theme/templates/archives.html
index 09763b9..e517699 100644
--- a/theme/templates/archives.html
+++ b/theme/templates/archives.html
@@ -1 +1,16 @@
-{% extends "index.html" %}
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}
+
+  {% block featured %}{% endblock %}
+
+  <section class="post-list">
+    {% for article in (articles_page.object_list if articles_page else articles) %}
+      {% include 'article_summary.html' %}
+    {% endfor%}
+  </section>
+
+  {% include 'pagination.html' %}
+  {#{> footer this}#}
+
+{% endblock content %}
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 8c803fa..d8883ca 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -57,11 +57,12 @@
               <!-- Collection of nav links and other content for toggling -->
               <div id="navbarCollapse" class="collapse navbar-collapse">
                 <ul id="menu-pane" class="nav navbar-nav">
-                    <li class="active"><a href="#">Home</a></li>
+                    <li class="active"><a href="/">Home</a></li>
                     <li><a href="#">Groups</a></li>
                     <li><a href="#">Events</a></li>
-                    <li><a href="#">People</a></li>
-                    <li><a href="#">Get Involved</a></li>
+                    <li><a href="/authors">People</a></li>
+                    <li><a href="/archives">Blog</a></li>
+                    <li><a href="/engage">Get Involved</a></li>
                 </ul>
               </div>
             </nav>
@@ -105,7 +106,6 @@ <h1>Follow Us</h1>
     <div class="container footer-credits">
       <div class="row">
         <div class="col-sm-4"><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/footer-logo.png"/></div>
-        <div class="col-sm-4"><h1>Hosting by</h1><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/credit-digitalocean.png" height="30px"/></div>
         <div class="col-sm-4"><h1>Design by<h1/><img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/credit-skogmo.png" height="30px"></div>
       </div>
       <div class="row">