diff --git a/demo/settings.py b/demo/settings.py
index c1a2476..58b7f3d 100644
--- a/demo/settings.py
+++ b/demo/settings.py
@@ -60,7 +60,7 @@ STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 ]
-SECRET_KEY = os.environ.get("SECRET_KEY", "")
+SECRET_KEY = os.environ.get("SECRET_KEY", "change-me")
 TEMPLATE_LOADERS = [
     "django.template.loaders.filesystem.Loader",
     "django.template.loaders.app_directories.Loader",
@@ -74,7 +74,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [
     "django.core.context_processors.tz",
     "django.core.context_processors.request",
     "django.contrib.messages.context_processors.messages",
-    "pinax_utils.context_processors.settings",
+    "pinax_theme_bootstrap.context_processors.theme",
     "account.context_processors.account",
 ]
 MIDDLEWARE_CLASSES = [
@@ -99,7 +99,6 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
     
     # theme
-    "pinax_theme_bootstrap_account",
     "pinax_theme_bootstrap",
     "django_forms_bootstrap",
     
diff --git a/demo/templates/_complete_count.html b/demo/templates/_complete_count.html
index 2c8535a..43be836 100644
--- a/demo/templates/_complete_count.html
+++ b/demo/templates/_complete_count.html
@@ -1,3 +1,3 @@
-<div class="well" id="done-count" data-refresh-url="{% url task_complete_count_fragment %}">
+<div class="well" id="done-count" data-refresh-url="{% url "task_complete_count_fragment" %}">
     <h2>{{ done_count }} task{{ done_count|pluralize }} completed</h2>
 </div>
\ No newline at end of file
diff --git a/demo/templates/_task.html b/demo/templates/_task.html
index 9a5c79c..129abed 100644
--- a/demo/templates/_task.html
+++ b/demo/templates/_task.html
@@ -3,11 +3,11 @@
         <div class="btn-toolbar">
             <div class="btn-group">
                 {% if task.done %}
-                    <a href="{% url task_mark_undone task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-remove"></i></a>
+                    <a href="{% url "task_mark_undone" task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-remove"></i></a>
                 {% else %}
-                    <a href="{% url task_mark_done task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-ok"></i></a>
+                    <a href="{% url "task_mark_done" task.pk %}" class="btn ajax" data-method="post" data-refresh="#done-count" data-replace-closest="tr"><i class="icon-ok"></i></a>
                 {% endif %}
-                <a href="{% url task_delete task.pk %}" class="btn ajax" data-method="post" data-replace-inner="#message" data-remove-closest="tr" data-refresh="#done-count"><i class="icon-trash"></i></a>
+                <a href="{% url "task_delete" task.pk %}" class="btn ajax" data-method="post" data-replace-inner="#message" data-remove-closest="tr" data-refresh="#done-count"><i class="icon-trash"></i></a>
             </div>
         </div>
     </td>
diff --git a/demo/templates/homepage.html b/demo/templates/homepage.html
index 7a1c9a8..4278c3f 100644
--- a/demo/templates/homepage.html
+++ b/demo/templates/homepage.html
@@ -19,7 +19,7 @@
                     bootstrap-ajax
                 </a>
             </p>
-            <form class="form-inline ajax" method="post" action="{% url task_add %}" data-append="#tasks">
+            <form class="form-inline ajax" method="post" action="{% url "task_add" %}" data-append="#tasks">
                 {% csrf_token %}
                 <div class="input-append">
                     <input type="text" class="span4" name="label" placeholder="Enter a task...">
diff --git a/demo/templates/site_base.html b/demo/templates/site_base.html
index 96081a2..eaeef40 100644
--- a/demo/templates/site_base.html
+++ b/demo/templates/site_base.html
@@ -1,7 +1,6 @@
 {% extends "theme_base.html" %}
 
 {% load metron_tags %}
-{% load i18n %}
 
 {% block extra_head_base %}
     <style type="text/css">
diff --git a/demo/wsgi.py b/demo/wsgi.py
index a49af33..e69252b 100644
--- a/demo/wsgi.py
+++ b/demo/wsgi.py
@@ -1,28 +1,6 @@
-"""
-WSGI config for demo project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
 import os
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
 
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
\ No newline at end of file
diff --git a/manage.py b/manage.py
index d39c6bb..d90a8b3 100755
--- a/manage.py
+++ b/manage.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-import os, sys
+import os
+import sys
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
-    
     from django.core.management import execute_from_command_line
-    
     execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
index 61c8eb6..ccb2c83 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,7 @@
---extra-index-url=http://dist.pinaxproject.com/dev/
---extra-index-url=http://dist.pinaxproject.com/alpha/
-
-Django==1.4.2
-pinax-theme-bootstrap==2.2.0
-pinax-theme-bootstrap-account==1.0b2
-django-user-accounts==1.0b3
-django-forms-bootstrap==2.0.3.post1
-metron==1.0
-pinax-utils==1.0b1.dev3
-
-gondor==1.1.5
-psycopg2==2.4.5
-gunicorn==0.14.5
+Django==1.5.1
+pinax-theme-bootstrap==3.0a11
+django-user-accounts==1.0b14
+metron==1.1
+gondor==1.2.4
+psycopg2==2.5.1
+gunicorn==17.5