diff --git a/contrib/templates/bootstrap/404.mustache b/contrib/templates/bootstrap/404.mustache
index 724ee46..91e9b6d 100644
--- a/contrib/templates/bootstrap/404.mustache
+++ b/contrib/templates/bootstrap/404.mustache
@@ -8,14 +8,15 @@
   <head>
     <title> 404 </title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="{{prefix}}static/site.css" />
+    <link rel="stylesheet" href="{{prefix}}static/css/bootstrap.min.css" />
     <link id="current_theme" rel="stylesheet" href="{{prefix}}static/user.css" />
-    <script type="text/javascript" src="{{prefix}}static/nntpchan.js"></script>
+    <script type="text/javascript" src="{{prefix}}static/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="{{prefix}}static/js/nntpchan.js"></script>
   </head>
   <body>
     <center>
       <div class="not_found">
-        <img src="{{prefix}}static/404.png"></img>
+        <img src="{{prefix}}static/img/404.png"></img>
         <div class="not_found_message">
           {{#i18n.Translations}}{{resource_not_found}}{{/i18n.Translations}}
         </div>
diff --git a/contrib/templates/bootstrap/board.mustache b/contrib/templates/bootstrap/board.mustache
index efb834d..51621e7 100644
--- a/contrib/templates/bootstrap/board.mustache
+++ b/contrib/templates/bootstrap/board.mustache
@@ -16,8 +16,9 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="initial-scale=1" />
-    <link rel="stylesheet" href="{{board.Prefix}}static/css/site.css" />
-    <link id="current_theme" rel="stylesheet" href="{{board.Prefix}}static/css/user.css" />
+    <link rel="stylesheet" href="{{board.Prefix}}static/css/bootstrap.min.css" />
+    <link id="current_theme" rel="stylesheet" href="{{board.Prefix}}static/user.css" />
+    <script type="text/javascript" src="{{board.Prefix}}static/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="{{board.Prefix}}static/js/nntpchan.js"></script>
     <title>{{board.Board}}</title>
   </head>
@@ -36,16 +37,19 @@
       {{{form}}}
     </div>
     <hr />
-    <div id="threads_container">
+    <div id="container">
       {{#board.Threads}}
-        <div class="thread" id="thread_{{OP.PostHash}}">
+        <div class="row" id="thread_{{OP.PostHash}}">
           <div class="thread_header">
           </div>
-          {{{OP.Truncate.RenderPost}}}
+          <div class="row">
+            {{{OP.Truncate.RenderPost}}}
+          </div>
           {{#Truncate.Replies}}
-            {{{Truncate.RenderPost}}}
+            <div class="row">
+              {{{Truncate.RenderPost}}}
+            </div>
           {{/Truncate.Replies}}
-          <hr />
         </div>
       {{/board.Threads}}
     </div>
diff --git a/contrib/templates/bootstrap/post.mustache b/contrib/templates/bootstrap/post.mustache
index eec5924..37829b2 100644
--- a/contrib/templates/bootstrap/post.mustache
+++ b/contrib/templates/bootstrap/post.mustache
@@ -1,5 +1,5 @@
 <div id="{{post.PostHash}}" class="{{post.CSSClass}}">
-  <legend class="postheader">
+  <div class="postheader">
     <span class="origin">
   {{#post.IsI2P}}
     <img src="{{post.Prefix}}static/img/i2p.png" title="{{#i18n.Translations}}{{from_i2p}}{{/i18n.Translations}}" />
@@ -17,7 +17,7 @@
     <a href="#" class="postnol">No.</a><a class="postno" onclick="nntpchan_reply(this, '{{post.ShortHash}}');" title="{{post.MessageID}}" root="{{post.Reference}}" boardname="{{post.Board}}">{{post.ShortHash}}</a>
     <a href="{{post.PostURL}}">[{{#i18n.Translations}}{{reply_label}}{{/i18n.Translations}}]</a>
     <span class="tripcode">{{{post.Pubkey}}}</span>  
-  </legend>
+  </div>
   <div class="attachments">
   {{#post.Attachments}}
     <figure>
diff --git a/contrib/templates/bootstrap/thread.mustache b/contrib/templates/bootstrap/thread.mustache
index 8b0bf68..1e1f5aa 100644
--- a/contrib/templates/bootstrap/thread.mustache
+++ b/contrib/templates/bootstrap/thread.mustache
@@ -15,9 +15,10 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="initial-scale=1" />
-    <link rel="stylesheet" href="{{thread.Prefix}}static/css/site.css" />
-    <link id="current_theme" rel="stylesheet" href="{{thread.Prefix}}static/css/user.css" />
-    <script src="{{thread.Prefix}}static/js/nntpchan.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="{{thread.Prefix}}static/css/bootstrap.min.css" />
+    <link id="current_theme" rel="stylesheet" href="{{thread.Prefix}}static/user.css" />
+    <script type="text/javascript" src="{{thread.Prefix}}static/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="{{thread.Prefix}}static/js/nntpchan.js"></script>
     <title> {{thread.OP.Subject}} </title>
   </head>
   <body>
@@ -33,16 +34,18 @@
     <div id="postform_container">
       {{{form}}}
     </div>
-    <hr />
-    <div class="thread" id="thread_{{thread.OP.PostHash}}">
+    <div class="container" id="thread_{{thread.OP.PostHash}}">
       <div class="thread_header">
       </div>
-      {{{thread.OP.RenderPost}}}
+      <div class="row">
+        {{{thread.OP.RenderPost}}}
+      </div>
       {{# thread.Replies}}
-        {{{RenderPost}}}
+        <div class="row">
+          {{{RenderPost}}}
+        </div>
       {{/ thread.Replies}}
     </div>
-    <hr/>
     <div class="navLinks">[<a href="{{thread.BoardURL}}" accesskey="a">{{#i18n.Translations}}{{return}}{{/i18n.Translations}}</a>] [<a href="{{thread.Prefix}}catalog-{{thread.Board}}.html" accesskey="r">{{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}}</a>] [<a href="#thread_{{thread.OP.PostHash}}">{{#i18n.Translations}}{{to_top_label}}{{/i18n.Translations}}</a>] [<a href="#navlinks" accesskey="r" onclick="location.reload();">{{#i18n.Translations}}{{update}}{{/i18n.Translations}}</a>]</div>
       <script type="text/javascript">
           var prefix = "{{thread.Prefix}}";
diff --git a/contrib/templates/bootstrap/ukko.mustache b/contrib/templates/bootstrap/ukko.mustache
index f438864..9ba67a8 100644
--- a/contrib/templates/bootstrap/ukko.mustache
+++ b/contrib/templates/bootstrap/ukko.mustache
@@ -9,8 +9,9 @@
   <head>
     <title> {{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}} </title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="{{prefix}}static/css/site.css" />
-    <link id="current_theme" rel="stylesheet" href="{{prefix}}static/css/user.css" />
+    <link rel="stylesheet" href="{{prefix}}static/css/bootstrap.min.css" />
+    <link id="current_theme" rel="stylesheet" href="{{prefix}}static/user.css" />
+    <script type="text/javascript" src="{{prefix}}static/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="{{prefix}}static/js/nntpchan.js"></script>
   </head>
   <body>
@@ -22,10 +23,10 @@
     {{{navbar}}}
     <!-- end navbar -->
     <div class="board_header"> {{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}} </div>
-      <div id="ukko_threads">
+      <div id="ukko_threads" class="container">
         <pre><a href="#" onclick="ukko_livechan('{{prefix}}')">livechan</a></pre>
       {{#threads}}
-        <div class="thread" id="thread_{{OP.PostHash}}">
+        <div class="row" id="thread_{{OP.PostHash}}">
 	        <div class="ukko_thread_header">
           <p>{{#i18n.Translations}}{{posted_on_label}}{{/i18n.Translations}} <a href="{{{BoardURL}}}"><span class="ukko_boardname">{{OP.Board}}</span></a></p>
         </div>
diff --git a/contrib/templates/default/404.mustache b/contrib/templates/default/404.mustache
index 724ee46..901b482 100644
--- a/contrib/templates/default/404.mustache
+++ b/contrib/templates/default/404.mustache
@@ -8,14 +8,14 @@
   <head>
     <title> 404 </title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="{{prefix}}static/site.css" />
-    <link id="current_theme" rel="stylesheet" href="{{prefix}}static/user.css" />
-    <script type="text/javascript" src="{{prefix}}static/nntpchan.js"></script>
+    <link rel="stylesheet" href="{{prefix}}static/css/site.css" />
+    <link id="current_theme" rel="stylesheet" href="{{prefix}}static/css/user.css" />
+    <script type="text/javascript" src="{{prefix}}static/js/nntpchan.js"></script>
   </head>
   <body>
     <center>
       <div class="not_found">
-        <img src="{{prefix}}static/404.png"></img>
+        <img src="{{prefix}}static/img/404.png"></img>
         <div class="not_found_message">
           {{#i18n.Translations}}{{resource_not_found}}{{/i18n.Translations}}
         </div>
