diff --git a/contrib/templates/default/board.mustache b/contrib/templates/default/board.mustache
index dce6874..0d071fe 100644
--- a/contrib/templates/default/board.mustache
+++ b/contrib/templates/default/board.mustache
@@ -32,11 +32,11 @@
         <div class="thread" id="thread_{{OP.PostHash}}">
           <div clsss="thread_header">
           </div>
-          {{{OP.RenderPost}}}
-          {{#Replies}}
-            {{{RenderPost}}}
+          {{{OP.Truncate.RenderPost}}}
+          {{#Truncate.Replies}}
+            {{{Truncate.RenderPost}}}
             <br />
-          {{/Replies}}
+          {{/Truncate.Replies}}
         </div>
         <br/>
         <hr/>
diff --git a/contrib/templates/default/ukko.mustache b/contrib/templates/default/ukko.mustache
index 479b535..c1a1a0a 100644
--- a/contrib/templates/default/ukko.mustache
+++ b/contrib/templates/default/ukko.mustache
@@ -11,9 +11,6 @@
     <link rel="stylesheet" href="{{prefix}}static/site.css"></link>
   </head>
   <body>
-    <div id="ukko-topbar">
-      <a href="{{prefix}}">Front Page</a>
-    </div>
     <div id="ukko_threads" class="threads_container">
       {{#threads}}
         <div class="ukko_thread_header">
@@ -22,11 +19,11 @@
         <div class="thread" id="thread_{{OP.PostHash}}">
           <div clsss="thread_header">
           </div>
-          {{{OP.RenderPost}}}
-          {{#Replies}}
-            {{{RenderPost}}}
+          {{{OP.Truncate.RenderPost}}}
+          {{#Truncate.Replies}}
+            {{{Truncate.RenderPost}}}
             <br />
-          {{/Replies}}
+          {{/Truncate.Replies}}
         </div>
         <hr/>
       {{/threads}}
