diff --git a/colab_spb/templates/discussion-message-preview.html b/colab_spb/templates/discussion-message-preview.html
new file mode 100644
index 0000000..ecab598
--- /dev/null
+++ b/colab_spb/templates/discussion-message-preview.html
@@ -0,0 +1,71 @@
+{% load i18n tz highlight %}
+
+{% if result.fullname or result.modified or result.modified_by %}
+  <div class="quiet">
+    {% if result.modified %}
+      <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span>
+    {% endif %}
+
+    {% if result.modified_by %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.modified_by_url %}
+          <a href="{{ result.modified_by_url }}">
+        {% else %}
+          <span>
+        {% endif %}
+
+        {% if query %}
+          {% highlight result.modified_by with query %}
+        {% else %}
+          {{ result.modified_by }}
+        {% endif %}
+
+        {% if result.modified_by_url %}
+          </a>
+        {% else %}
+          </span>
+        {% endif %}
+      </span>
+    {% else %}
+      <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
+    {% endif %}
+  </div>
+{% endif %}
+
+{% if result.title %}
+  <a href="{{ result.url }}
+   {% if result.type == 'thread' and result.latest_message_pk %}
+        #msg-{{ result.latest_message_pk }}
+   {% elif result.type == 'thread' and result.pk %}
+        #msg-{{ result.pk }}
+   {% endif %}" 
+
+   {% if result.latest_description %}
+     title="{{ result.latest_description|escape|truncatechars:150 }}"
+   {% elif result.description %}
+     title="{{ result.description|escape|truncatechars:150 }}"
+   {% endif %}>
+    <span class="subject">
+      <!-- a striptags filter was raising an error here because using with highlight -->
+      {% if query %}
+        {% highlight result.title with query max_length "1000" %}
+      {% else %}
+        {{ result.title }}
+      {% endif %}
+    </span>
+  </a>
+{% endif %}
+
+{% if result.description %}
+  <!-- a striptags filter was raising an error here because using with highlight -->
+  <span class="quiet"> - {% if query %}
+    {% highlight result.description with query max_length "110" %}
+  {% else %}
+    {% if result.latest_description %}
+      {{ result.latest_description|striptags|escape|truncatechars:110 }}
+    {% elif result.description %}
+      {{ result.description|striptags|escape|truncatechars:110 }}
+    {% endif %}
+  {% endif %}
+  </span>
+{% endif %}
diff --git a/colab_spb/templates/discussion.html b/colab_spb/templates/discussion.html
new file mode 100644
index 0000000..c2fbb92
--- /dev/null
+++ b/colab_spb/templates/discussion.html
@@ -0,0 +1,36 @@
+  {% load i18n %}
+  {% for listname, description, latest, most_relevant, number_of_users in lists %}
+    {% if latest or most_relevant %}
+      <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+          <h4>{% trans 'latest'|title %}</h4>
+          <hr />
+            {% for thread in latest %}
+              {% include "discussion-message-preview.html" with result=thread.latest_message %}
+              <hr />
+            {% endfor %}
+          <div class="text-right">
+            <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
+              {% trans "see all discussions" %}
+            </a>
+          </div>
+        </div>
+
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+          <h4>{% trans 'most relevant'|title %}</h4>
+          <hr />
+            {% for thread in most_relevant %}
+              {% include "discussion-message-preview.html" with result=thread %}
+              <hr />
+            {% endfor %}
+          <div class="text-right">
+            <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
+              {% trans "see all discussions" %}
+            </a>
+          </div>
+        </div>
+      </div>
+
+
+    {% endif %}
+  {% endfor %}
diff --git a/templates/discussion-message-preview.html b/templates/discussion-message-preview.html
deleted file mode 100644
index ecab598..0000000
--- a/templates/discussion-message-preview.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{% load i18n tz highlight %}
-
-{% if result.fullname or result.modified or result.modified_by %}
-  <div class="quiet">
-    {% if result.modified %}
-      <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span>
-    {% endif %}
-
-    {% if result.modified_by %}
-      <span class="pull-left">{% trans "by" %}
-        {% if result.modified_by_url %}
-          <a href="{{ result.modified_by_url }}">
-        {% else %}
-          <span>
-        {% endif %}
-
-        {% if query %}
-          {% highlight result.modified_by with query %}
-        {% else %}
-          {{ result.modified_by }}
-        {% endif %}
-
-        {% if result.modified_by_url %}
-          </a>
-        {% else %}
-          </span>
-        {% endif %}
-      </span>
-    {% else %}
-      <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
-    {% endif %}
-  </div>
-{% endif %}
-
-{% if result.title %}
-  <a href="{{ result.url }}
-   {% if result.type == 'thread' and result.latest_message_pk %}
-        #msg-{{ result.latest_message_pk }}
-   {% elif result.type == 'thread' and result.pk %}
-        #msg-{{ result.pk }}
-   {% endif %}" 
-
-   {% if result.latest_description %}
-     title="{{ result.latest_description|escape|truncatechars:150 }}"
-   {% elif result.description %}
-     title="{{ result.description|escape|truncatechars:150 }}"
-   {% endif %}>
-    <span class="subject">
-      <!-- a striptags filter was raising an error here because using with highlight -->
-      {% if query %}
-        {% highlight result.title with query max_length "1000" %}
-      {% else %}
-        {{ result.title }}
-      {% endif %}
-    </span>
-  </a>
-{% endif %}
-
-{% if result.description %}
-  <!-- a striptags filter was raising an error here because using with highlight -->
-  <span class="quiet"> - {% if query %}
-    {% highlight result.description with query max_length "110" %}
-  {% else %}
-    {% if result.latest_description %}
-      {{ result.latest_description|striptags|escape|truncatechars:110 }}
-    {% elif result.description %}
-      {{ result.description|striptags|escape|truncatechars:110 }}
-    {% endif %}
-  {% endif %}
-  </span>
-{% endif %}
diff --git a/templates/discussion.html b/templates/discussion.html
deleted file mode 100644
index c2fbb92..0000000
--- a/templates/discussion.html
+++ /dev/null
@@ -1,36 +0,0 @@
-  {% load i18n %}
-  {% for listname, description, latest, most_relevant, number_of_users in lists %}
-    {% if latest or most_relevant %}
-      <div class="row">
-        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-          <h4>{% trans 'latest'|title %}</h4>
-          <hr />
-            {% for thread in latest %}
-              {% include "discussion-message-preview.html" with result=thread.latest_message %}
-              <hr />
-            {% endfor %}
-          <div class="text-right">
-            <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
-              {% trans "see all discussions" %}
-            </a>
-          </div>
-        </div>
-
-        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-          <h4>{% trans 'most relevant'|title %}</h4>
-          <hr />
-            {% for thread in most_relevant %}
-              {% include "discussion-message-preview.html" with result=thread %}
-              <hr />
-            {% endfor %}
-          <div class="text-right">
-            <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
-              {% trans "see all discussions" %}
-            </a>
-          </div>
-        </div>
-      </div>
-
-
-    {% endif %}
-  {% endfor %}
--
libgit2 0.21.2