diff --git a/generator.py b/generator.py
index 2059d95..f33576b 100755
--- a/generator.py
+++ b/generator.py
@@ -30,7 +30,7 @@ def tohtml(value):
     value = re.sub(r'\[url=\/user\/(.*?)\](.*?)\[\/url\]', user_replacer, value)
     value = re.sub(r'\[url=(.*?)\](.*?)\[/url\]', r'<a href="\1">\2</a>', value)
     value = re.sub(r'\[video\](.*?)\[/video\]', r'<a href="\1">\1</a>', value)
-    value = re.sub(r'\[color=(.*?)\](.*?)\[/color\]', r'<font color="\1">\2</font>', value)
+    value = re.sub(r'\[colour=(.*?)\](.*?)\[/colour\]', r'<font color="\1">\2</font>', value)
     value = re.sub(r'\[b\](.*?)\[/b\]', r'<b>\1</b>', value)
     value = re.sub(r'\[i\](.*?)\[/i\]', r'<i>\1</i>', value)
     value = re.sub(r'\[u\](.*?)\[/u\]', r'<u>\1</u>', value)
@@ -77,7 +77,7 @@ def render_boards(boards, template_board, template_thread, outpath, title):
         write_render(rendered_board, os.path.join('board', url_replacer(board['title']) + '.html'), outpath)
 
         for thread in board['threads']:
-            rendered_thread = template_thread.render(thread=thread, title=title + ' - ' + thread['title'])
+            rendered_thread = template_thread.render(board=board, thread=thread, title=title + ' - ' + thread['title'])
             write_render(rendered_thread, os.path.join('board', 'thread', url_replacer(thread['title']) + '.html'), outpath)
 
         render_boards(board['boards'], template_board, template_thread, outpath, title)
diff --git a/templates/board.html.j2 b/templates/board.html.j2
index 9b0e63f..b279fc9 100644
--- a/templates/board.html.j2
+++ b/templates/board.html.j2
@@ -7,6 +7,10 @@
     <title>{{ title }}</title>
   </head>
   <body>
+      <ul>
+          <li><a href="../boards.html">Boards</a></li>
+      </ul>
+      <hr>
       {% if board.boards |length > 0 %}
       <ul>
           {% for board in board.boards %}
diff --git a/templates/boards.html.j2 b/templates/boards.html.j2
index 8976959..c342a01 100644
--- a/templates/boards.html.j2
+++ b/templates/boards.html.j2
@@ -14,7 +14,7 @@
       <ul>
           {% for board in boards %}
           <li>
-              <b><a href={{ "board/" + board.title.replace('/', '_').replace(' ', '_').replace('?', '') + ".html" }}>{{ board.title }}</a></b>
+              <a href={{ "board/" + board.title |url_replacer + ".html" }}>{{ board.title }}</a><br>
               <i>{{ board.description }}</i>
           </li>
           {% endfor %}
diff --git a/templates/thread.html.j2 b/templates/thread.html.j2
index 016818f..5382ad9 100644
--- a/templates/thread.html.j2
+++ b/templates/thread.html.j2
@@ -7,10 +7,14 @@
     <title>{{ title }}</title>
   </head>
   <body>
+      <ul>
+          <li><a href={{ "../" + board.title |url_replacer + ".html" }}>{{ board.title }}</a></li>
+      </ul>
+      <hr>
       <h1>{{ thread.title }}</h1>
       {% for post in thread.posts %}
-      <a href="#{{ loop.index }}">{{ loop.index }} - </a>
-      <b><a name="{{ loop.index }}" href={{ "../../user/" + post.user.name |url_replacer + ".html" }}>{{ post.user.name }}</a></b>
+      <a href="#{{ loop.index }}">{{ loop.index }} </a><i>by </i>
+      <a name="{{ loop.index }}" href={{ "../../user/" + post.user.name |url_replacer + ".html" }}>{{ post.user.name }}</a>
       <i>({{ post.timestamp | fromunixtime }})</i>
       <p>{{ post.message | tohtml }}</p>
       {% for attachment in post.attachments %}
diff --git a/templates/user.html.j2 b/templates/user.html.j2
index f3ec4ef..068b3cb 100644
--- a/templates/user.html.j2
+++ b/templates/user.html.j2
@@ -1,22 +1,23 @@
 <!doctype html>
 <html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width">
-    <link href="../board/thread/static/styles.css" rel="stylesheet" type="text/css" />
-    <title>{{ title }}</title>
-</head>
-
-<body>
-    <h1>{{ user.name }}</h1>
-    <h3>{{ user.status }}</h3>
-    <p>
-        {% if user.registered %} registered {{ user.registered | fromunixtime }} {% else %} unregistered {% endif %}
-    </p>
-    {% if user.signature %}
-    <hr>
-    <i>{{ user.signature | tohtml }}</i> {% endif %}
-</body>
-
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width">
+        <link href="../board/thread/static/styles.css" rel="stylesheet" type="text/css" />
+        <title>{{ title }}</title>
+    </head>
+    <body>
+        <ul>
+            <li><a href="../users.html">Users</a></li>
+        </ul>
+        <hr>
+        <h1>{{ user.name }}</h1>
+        <h3>{{ user.status }}</h3>
+        <p>
+            {% if user.registered %} registered {{ user.registered | fromunixtime }} {% else %} unregistered {% endif %}
+        </p>
+        {% if user.signature %}
+        <hr>
+        <i>{{ user.signature | tohtml }}</i> {% endif %}
+    </body>
 </html>
diff --git a/templates/users.html.j2 b/templates/users.html.j2
index 8a816be..44706e5 100644
--- a/templates/users.html.j2
+++ b/templates/users.html.j2
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width">
-    <link href="../../board/thread/static/styles.css" rel="stylesheet" type="text/css" />
+    <link href="board/thread/static/styles.css" rel="stylesheet" type="text/css" />
     <title>{{ title }}</title>
   </head>
   <body>
