diff --git a/templates/thread.html b/templates/thread.html
index 65f87f07..ff727f27 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -56,9 +56,12 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<div class="threadlinks-noup">
-		<span class="threadlink">[ <a href="{{ return }}">{% trans %}Return{% endtrans %}</a> /</span>
-		<span class="threadlink"><a href="#bottom" style="padding-left: 10px"> {% trans %}Go to bottom{% endtrans %}</a> ]</span>
+	<div class="threadlinks">
+		<span class="threadlink"><a href="{{ return }}">{% trans %}Return{% endtrans %}</a></span>
+		{% if config.catalog_link %}
+		<span class="threadlink"><a href="#top">{% trans %}Top{% endtrans %}</a></span>
+		{% endif %}
+		<span class="threadlink"><a href="#bottom">{% trans %}Bottom{% endtrans %}</a></span>
 	</div>
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
@@ -68,15 +71,19 @@
 		{{ body }}
 		
 		<div id="thread-interactions">
-			<span id="thread-links">
-				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
-                		{% if config.catalog_link %}
-					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-		                {% endif %}
-				{% if config.home_link %}
-				|  <a id="thread-home" href="{{ config.root }}">[{% trans %}Home{% endtrans %}]</a>
-				{% endif %}
+			<span class="indielinks-row">
+				<span class="indielinks" id="thread-indielinks-l">
+					<span class="indielink"><a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a></span>
+					{% if config.catalog_link %}
+					<span class="indielink"><a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a></span>
+					{% endif %}
+					<span class="indielink"><a href="#top">[{% trans %}Top{% endtrans %}]</a></span>
+				</span>
+				<span class="lcn-indielinks" id="thread-indielinks-r">
+					{% if config.home_link %}
+					<span class="indielink"><a href="{{ config.root }}">[{% trans %}Home{% endtrans %}]</a></span>
+					{% endif %}
+				</span>
 			</span>
 			
 			<span id="thread-quick-reply">
@@ -104,12 +111,24 @@
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
         </div>
-	<div class="bar bottom">
-		<div class="threadlinks">
-			<span class="threadlink">[ <a href="{{ return }}">{% trans %}Return{% endtrans %}</a> /</span>
-        		<span class="threadlink"><a href="#" style="padding-left: 10px"> {% trans %}Go to top{% endtrans %}</a> /</span>
-		</div>
-		<div class=pages></div>
+	<div class="bar lcn-bar bottom">
+		<span class="bar-collection" id="bar-bottom-l">
+			<span class="threadlinks">
+				<span class="threadlink"><a href="{{ return }}">{% trans %}Return{% endtrans %}</a></span>
+				{% if config.catalog_link %}
+				<span class="threadlink"><a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">{% trans %}Catalog{% endtrans %}</a></span>
+				{% endif %}
+				<span class="threadlink"><a href="#top">{% trans %}Top{% endtrans %}</a></span>
+				<span class="threadlink"><a href="#bottom">{% trans %}Bottom{% endtrans %}</a></span>
+			</span>
+		</span>
+		<span class="bar-collection" id="bar-bottom-r">
+			<span class="threadlinks">
+				{% if config.home_link %}
+				<span class="threadlink"><a href="{{ config.root }}">{% trans %}Home{% endtrans %}</a></span>
+				{% endif %}
+			</span>
+		</span>
 	</div>
 	<script type="text/javascript">{% verbatim %}
 		ready();