diff --git a/colab/accounts/templates/registration/login.html b/colab/accounts/templates/registration/login.html
new file mode 100644
index 0000000..f6a8cca
--- /dev/null
+++ b/colab/accounts/templates/registration/login.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+
+
+<div class="row">
+  {% if form.errors %}
+  <div class="alert alert-danger">
+    <b>{% trans "Please correct the errors below and try again" %}</b>
+  </div>
+  {% endif %}
+
+  {% for error in form.non_field_errors %}
+  <div class="alert alert-danger">
+    {{ error }}
+  </div>
+  {% endfor %}
+</div>
+
+
+<br>
+<form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{% trans 'Login' %}</h3></div>
+
+        <div class="panel-body">
+          <div class="form-group{% if form.username.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.username.label_tag }}
+            <input class="form-control" id="id_username" maxlength="254" name="username" type="text">
+            {{ form.username.errors }}
+          </div>
+          <div class="form-group{% if form.password.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.password.label_tag }}
+            <input class="form-control" id="id_password" name="password" type="password">
+            {{ form.password.errors }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+      <input type="submit" value="{% trans 'Login' %}" class="btn btn-primary btn-lg btn-block">
+    </div>
+    <p class="text-center"><a href="{% url 'password_reset' %}">{% trans 'Forgot Password?' %}</a></p>
+  </div>
+
+</form>
+
+{% endblock %}
+
diff --git a/colab/accounts/templates/registration/password_change_form_custom.html b/colab/accounts/templates/registration/password_change_form_custom.html
new file mode 100644
index 0000000..7cdefc8
--- /dev/null
+++ b/colab/accounts/templates/registration/password_change_form_custom.html
@@ -0,0 +1,61 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+
+<div class="row">
+  {% if form.errors %}
+  <div class="alert alert-danger">
+    <b>
+      {% if form.errors.items|length == 1 %}
+        <!-- FIXME: This message was not translated yet -->
+        {% trans "Please correct the error below and try again." %}
+      {% else %}
+        {% trans "Please correct the errors below and try again." %}
+      {% endif %}
+    </b>
+  </div>
+  {% endif %}
+</div>
+
+<br>
+<form action="" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{% trans 'Change Password' %}</h3></div>
+
+        <div class="panel-body">
+          <div class="form-group{% if form.old_password.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.old_password.label_tag }}
+            <input class="form-control" id="id_old_password" maxlength="254" name="old_password" type="password">
+            {{ form.old_password.errors }}
+          </div>
+
+          <div class="form-group{% if form.new_password1.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.new_password1.label_tag }}
+            <input class="form-control" id="id_new_password1" maxlength="254" name="new_password1" type="password">
+            {{ form.new_password1.errors }}
+          </div>
+
+          <div class="form-group{% if form.new_password2.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.new_password2.label_tag }}
+            <input class="form-control" id="id_new_password2" maxlength="254" name="new_password2" type="password">
+            {{ form.new_password2.errors }}
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+      <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-lg btn-block">
+    </div>
+    <script type="text/javascript">document.getElementById("id_old_password").focus();</script>
+  </div>
+</form>
+
+{% endblock %}
diff --git a/colab/accounts/templates/registration/password_reset_complete_custom.html b/colab/accounts/templates/registration/password_reset_complete_custom.html
new file mode 100644
index 0000000..e115899
--- /dev/null
+++ b/colab/accounts/templates/registration/password_reset_complete_custom.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block title %}Password reset complete{% endblock %}
+
+{% block main-content %}
+<p>Your password has been set.  You may go ahead and log in now.</p>
+<p><a href="{{ login_url }}">Log in</a></p>
+{% endblock %}
diff --git a/colab/accounts/templates/registration/password_reset_confirm_custom.html b/colab/accounts/templates/registration/password_reset_confirm_custom.html
new file mode 100644
index 0000000..d7e267d
--- /dev/null
+++ b/colab/accounts/templates/registration/password_reset_confirm_custom.html
@@ -0,0 +1,64 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Setting New password" %}{% endblock %}
+{% block main-content %}
+  {% if validlink %}
+
+  <div class="row">
+    {% if form.errors %}
+    <div class="alert alert-danger">
+      <b>
+        {% if form.errors.items|length == 1 %}
+          {% trans "Please correct the error below and try again." %}
+        {% else %}
+          <!-- FIXME: This message was not translated yet -->
+          {% trans "Please correct the errors below and try again." %}
+        {% endif %}
+      </b>
+    </div>
+    {% endif %}
+  </div>
+
+  <br>
+  <form action="" method="post" role="form" class="form-horizontal signup">
+    {% csrf_token %}
+
+    <div class="row">
+      <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4 col-sm-8 col-sm-offset-2 col-xs-12">
+        <div class="panel panel-default">
+          <div class="panel-heading"><h3 class="panel-title">{% trans 'Change Password' %}</h3></div>
+
+          <div class="panel-body">
+
+            <div class="form-group{% if form.new_password1.errors %} alert alert-danger has-error{% endif %}">
+              {{ form.new_password1.label_tag }}
+              <input class="form-control" id="id_new_password1" maxlength="254" name="new_password1" type="password">
+              {{ form.new_password1.errors }}
+            </div>
+
+            <div class="form-group{% if form.new_password2.errors %} alert alert-danger has-error{% endif %}">
+              {{ form.new_password2.label_tag }}
+              <input class="form-control" id="id_new_password2" maxlength="254" name="new_password2" type="password">
+              {{ form.new_password2.errors }}
+            </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="submit">
+        <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-lg btn-block">
+      </div>
+      <script type="text/javascript">document.getElementById("id_new_password1").focus();</script>
+    </div>
+  </form>
+  {% else %}
+    <h1>Password reset unsuccessful</h1>
+    <p>The password reset link was invalid, <br />
+    possibly because it has already been used. <br />
+    Please request a new password reset.</p>
+  {% endif %}
+
+{% endblock %}
diff --git a/colab/accounts/templates/registration/password_reset_done_custom.html b/colab/accounts/templates/registration/password_reset_done_custom.html
new file mode 100644
index 0000000..fac48c0
--- /dev/null
+++ b/colab/accounts/templates/registration/password_reset_done_custom.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block title %}Password reset successful{% endblock %}
+
+{% block main-content %}
+<p>We've e-mailed you instructions for setting your password to the e-mail address you submitted.</p>
+<p>You should be receiving it shortly.</p>
+{% endblock %}
diff --git a/colab/accounts/templates/registration/password_reset_email_custom.html b/colab/accounts/templates/registration/password_reset_email_custom.html
new file mode 100644
index 0000000..1c712cf
--- /dev/null
+++ b/colab/accounts/templates/registration/password_reset_email_custom.html
@@ -0,0 +1,15 @@
+{% autoescape off %}
+You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.
+
+Please go to the following page and choose a new password:
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb64=uid, token=token %}
+{% endblock %}
+
+Your username, in case you've forgotten: {{ user.username }}
+
+Thanks for using our site!
+
+The {{ site_name }} team.
+
+{% endautoescape %}
diff --git a/colab/accounts/templates/registration/password_reset_form_custom.html b/colab/accounts/templates/registration/password_reset_form_custom.html
new file mode 100644
index 0000000..359478a
--- /dev/null
+++ b/colab/accounts/templates/registration/password_reset_form_custom.html
@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+
+
+<div class="row">
+  {% if form.errors %}
+  <div class="alert alert-danger">
+    <b>{% trans "Please correct the errors below and try again" %}</b>
+  </div>
+  {% endif %}
+</div>
+
+<br>
+<form action="" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-6 col-lg-offset-3 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{{ title }}</h3></div>
+        <div class="panel-body">
+        <div class=  >{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</div>
+          <br>
+          <div class="form-group{% if form.email.errors %} alert alert-danger has-error{% endif %}">
+            <label>{% trans 'Email address:' %}</label> 
+            <input class="form-control" id="id_email" maxlength="254" name="email" type="email">
+            {{ form.email.errors }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+       <input class="btn btn-primary btn-lg btn-block"  type="submit" value="Reset password" /></p>
+    </div>
+  </div>
+
+</form>
+
+{% endblock %}
+
+
+
+
+
+
+
+
+
diff --git a/src/accounts/templates/registration/login.html b/src/accounts/templates/registration/login.html
deleted file mode 100644
index f6a8cca..0000000
--- a/src/accounts/templates/registration/login.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block main-content %}
-
-
-<div class="row">
-  {% if form.errors %}
-  <div class="alert alert-danger">
-    <b>{% trans "Please correct the errors below and try again" %}</b>
-  </div>
-  {% endif %}
-
-  {% for error in form.non_field_errors %}
-  <div class="alert alert-danger">
-    {{ error }}
-  </div>
-  {% endfor %}
-</div>
-
-
-<br>
-<form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup">
-  {% csrf_token %}
-
-  <div class="row">
-    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12">
-      <div class="panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title">{% trans 'Login' %}</h3></div>
-
-        <div class="panel-body">
-          <div class="form-group{% if form.username.errors %} alert alert-danger has-error{% endif %}">
-            {{ form.username.label_tag }}
-            <input class="form-control" id="id_username" maxlength="254" name="username" type="text">
-            {{ form.username.errors }}
-          </div>
-          <div class="form-group{% if form.password.errors %} alert alert-danger has-error{% endif %}">
-            {{ form.password.label_tag }}
-            <input class="form-control" id="id_password" name="password" type="password">
-            {{ form.password.errors }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="submit">
-      <input type="submit" value="{% trans 'Login' %}" class="btn btn-primary btn-lg btn-block">
-    </div>
-    <p class="text-center"><a href="{% url 'password_reset' %}">{% trans 'Forgot Password?' %}</a></p>
-  </div>
-
-</form>
-
-{% endblock %}
-
diff --git a/src/accounts/templates/registration/password_change_form_custom.html b/src/accounts/templates/registration/password_change_form_custom.html
deleted file mode 100644
index 7cdefc8..0000000
--- a/src/accounts/templates/registration/password_change_form_custom.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block main-content %}
-
-<div class="row">
-  {% if form.errors %}
-  <div class="alert alert-danger">
-    <b>
-      {% if form.errors.items|length == 1 %}
-        <!-- FIXME: This message was not translated yet -->
-        {% trans "Please correct the error below and try again." %}
-      {% else %}
-        {% trans "Please correct the errors below and try again." %}
-      {% endif %}
-    </b>
-  </div>
-  {% endif %}
-</div>
-
-<br>
-<form action="" method="post" role="form" class="form-horizontal signup">
-  {% csrf_token %}
-
-  <div class="row">
-    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4 col-sm-8 col-sm-offset-2 col-xs-12">
-      <div class="panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title">{% trans 'Change Password' %}</h3></div>
-
-        <div class="panel-body">
-          <div class="form-group{% if form.old_password.errors %} alert alert-danger has-error{% endif %}">
-            {{ form.old_password.label_tag }}
-            <input class="form-control" id="id_old_password" maxlength="254" name="old_password" type="password">
-            {{ form.old_password.errors }}
-          </div>
-
-          <div class="form-group{% if form.new_password1.errors %} alert alert-danger has-error{% endif %}">
-            {{ form.new_password1.label_tag }}
-            <input class="form-control" id="id_new_password1" maxlength="254" name="new_password1" type="password">
-            {{ form.new_password1.errors }}
-          </div>
-
-          <div class="form-group{% if form.new_password2.errors %} alert alert-danger has-error{% endif %}">
-            {{ form.new_password2.label_tag }}
-            <input class="form-control" id="id_new_password2" maxlength="254" name="new_password2" type="password">
-            {{ form.new_password2.errors }}
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="submit">
-      <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-lg btn-block">
-    </div>
-    <script type="text/javascript">document.getElementById("id_old_password").focus();</script>
-  </div>
-</form>
-
-{% endblock %}
diff --git a/src/accounts/templates/registration/password_reset_complete_custom.html b/src/accounts/templates/registration/password_reset_complete_custom.html
deleted file mode 100644
index e115899..0000000
--- a/src/accounts/templates/registration/password_reset_complete_custom.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Password reset complete{% endblock %}
-
-{% block main-content %}
-<p>Your password has been set.  You may go ahead and log in now.</p>
-<p><a href="{{ login_url }}">Log in</a></p>
-{% endblock %}
diff --git a/src/accounts/templates/registration/password_reset_confirm_custom.html b/src/accounts/templates/registration/password_reset_confirm_custom.html
deleted file mode 100644
index d7e267d..0000000
--- a/src/accounts/templates/registration/password_reset_confirm_custom.html
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block title %}{% trans "Setting New password" %}{% endblock %}
-{% block main-content %}
-  {% if validlink %}
-
-  <div class="row">
-    {% if form.errors %}
-    <div class="alert alert-danger">
-      <b>
-        {% if form.errors.items|length == 1 %}
-          {% trans "Please correct the error below and try again." %}
-        {% else %}
-          <!-- FIXME: This message was not translated yet -->
-          {% trans "Please correct the errors below and try again." %}
-        {% endif %}
-      </b>
-    </div>
-    {% endif %}
-  </div>
-
-  <br>
-  <form action="" method="post" role="form" class="form-horizontal signup">
-    {% csrf_token %}
-
-    <div class="row">
-      <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-4 col-sm-8 col-sm-offset-2 col-xs-12">
-        <div class="panel panel-default">
-          <div class="panel-heading"><h3 class="panel-title">{% trans 'Change Password' %}</h3></div>
-
-          <div class="panel-body">
-
-            <div class="form-group{% if form.new_password1.errors %} alert alert-danger has-error{% endif %}">
-              {{ form.new_password1.label_tag }}
-              <input class="form-control" id="id_new_password1" maxlength="254" name="new_password1" type="password">
-              {{ form.new_password1.errors }}
-            </div>
-
-            <div class="form-group{% if form.new_password2.errors %} alert alert-danger has-error{% endif %}">
-              {{ form.new_password2.label_tag }}
-              <input class="form-control" id="id_new_password2" maxlength="254" name="new_password2" type="password">
-              {{ form.new_password2.errors }}
-            </div>
-
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="submit">
-        <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-lg btn-block">
-      </div>
-      <script type="text/javascript">document.getElementById("id_new_password1").focus();</script>
-    </div>
-  </form>
-  {% else %}
-    <h1>Password reset unsuccessful</h1>
-    <p>The password reset link was invalid, <br />
-    possibly because it has already been used. <br />
-    Please request a new password reset.</p>
-  {% endif %}
-
-{% endblock %}
diff --git a/src/accounts/templates/registration/password_reset_done_custom.html b/src/accounts/templates/registration/password_reset_done_custom.html
deleted file mode 100644
index fac48c0..0000000
--- a/src/accounts/templates/registration/password_reset_done_custom.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Password reset successful{% endblock %}
-
-{% block main-content %}
-<p>We've e-mailed you instructions for setting your password to the e-mail address you submitted.</p>
-<p>You should be receiving it shortly.</p>
-{% endblock %}
diff --git a/src/accounts/templates/registration/password_reset_email_custom.html b/src/accounts/templates/registration/password_reset_email_custom.html
deleted file mode 100644
index 1c712cf..0000000
--- a/src/accounts/templates/registration/password_reset_email_custom.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% autoescape off %}
-You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.
-
-Please go to the following page and choose a new password:
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb64=uid, token=token %}
-{% endblock %}
-
-Your username, in case you've forgotten: {{ user.username }}
-
-Thanks for using our site!
-
-The {{ site_name }} team.
-
-{% endautoescape %}
diff --git a/src/accounts/templates/registration/password_reset_form_custom.html b/src/accounts/templates/registration/password_reset_form_custom.html
deleted file mode 100644
index 359478a..0000000
--- a/src/accounts/templates/registration/password_reset_form_custom.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block main-content %}
-
-
-<div class="row">
-  {% if form.errors %}
-  <div class="alert alert-danger">
-    <b>{% trans "Please correct the errors below and try again" %}</b>
-  </div>
-  {% endif %}
-</div>
-
-<br>
-<form action="" method="post" role="form" class="form-horizontal signup">
-  {% csrf_token %}
-
-  <div class="row">
-    <div class="col-md-4 col-md-offset-4 col-lg-6 col-lg-offset-3 col-sm-8 col-sm-offset-2 col-xs-12">
-      <div class="panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title">{{ title }}</h3></div>
-        <div class="panel-body">
-        <div class=  >{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</div>
-          <br>
-          <div class="form-group{% if form.email.errors %} alert alert-danger has-error{% endif %}">
-            <label>{% trans 'Email address:' %}</label> 
-            <input class="form-control" id="id_email" maxlength="254" name="email" type="email">
-            {{ form.email.errors }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="submit">
-       <input class="btn btn-primary btn-lg btn-block"  type="submit" value="Reset password" /></p>
-    </div>
-  </div>
-
-</form>
-
-{% endblock %}
-
-
-
-
-
-
-
-
-
--
libgit2 0.21.2