diff --git a/contrib/templates/chen-chan/board.mustache b/contrib/templates/chen-chan/board.mustache
index f4cb076..265c9f6 100644
--- a/contrib/templates/chen-chan/board.mustache
+++ b/contrib/templates/chen-chan/board.mustache
@@ -11,24 +11,17 @@
   - Navbar ( a function that renders the navbar, should not be escaped )
   - Threads ( a list of Thread Models with the last few replies )
 }}
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="/static/user.css">
-    <title>{{board.Board}}</title>
-  </head>
-  <body>
-    {{{board.Navbar}}}
-    {{{form}}}
-    <dl>
-      <hr>
+<!doctype html><html><head><link rel="stylesheet" href="/static/chen-chan.css"><title>{{board.Board}}</title></head><body>
+  {{{board.Navbar}}}
+  {{{form}}}
+  <dl>
+    <hr>
     {{#board.Threads}}
-        {{{OP.Truncate.RenderPost}}}
-        {{#Truncate.Replies}}
-          {{{Truncate.RenderPost}}}
-        {{/Truncate.Replies}}
-        <hr>
+      {{{OP.Truncate.RenderPost}}}
+      {{#Truncate.Replies}}
+        {{{Truncate.RenderPost}}}
+      {{/Truncate.Replies}}
+      <hr>
     {{/board.Threads}}
-    </dl>
-  </body>
-</html>
+  </dl>
+</body></html>
diff --git a/contrib/templates/chen-chan/boardlist.mustache b/contrib/templates/chen-chan/boardlist.mustache
index e6f0144..27bfd7f 100644
--- a/contrib/templates/chen-chan/boardlist.mustache
+++ b/contrib/templates/chen-chan/boardlist.mustache
@@ -5,36 +5,29 @@
   - frontend ( the name of the frontend )
   - prefix ( the site's prefix )
 }}
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="/static/user.css">
-    <title>{{frontend}} boards</title>
-  </head>
-  <body>
-    <table border="1">
+<!doctype html><html><head><link rel="stylesheet" type="text/css" href="/static/chen-chan.css"><title>{{frontend}} boards</title></head><body>
+  <table>
+    <tr>
+      <th>board</th>
+      <th>posts per hour</th>
+      <th>posts per day</th>
+      <th>total</th>
+    </tr>
+    {{# graph}}
       <tr>
-        <th>board</th>
-        <th>posts per hour</th>
-        <th>posts per day</th>
-        <th>total</th>
+        <td>
+          <a href="{{prefix}}{{Board}}-0.html">{{Board}}</a>
+        </td>
+        <td>
+          {{Hour}}
+        </td>
+        <td>
+          {{Day}}
+        </td>
+        <td>
+          {{All}}
+        </td>
       </tr>
-      {{# graph}}
-        <tr>
-          <td>
-            <a href="{{prefix}}{{Board}}-0.html">{{Board}}</a>
-          </td>
-          <td>
-            {{Hour}}
-          </td>
-          <td>
-            {{Day}}
-          </td>
-          <td>
-            {{All}}
-          </td>
-        </tr>
-      {{/ graph}}
-    </table>
-  </body>
-</html>
+    {{/ graph}}
+  </table>
+</body></html>
diff --git a/contrib/templates/chen-chan/frontpage.mustache b/contrib/templates/chen-chan/frontpage.mustache
index 1f11e02..a8c3215 100644
--- a/contrib/templates/chen-chan/frontpage.mustache
+++ b/contrib/templates/chen-chan/frontpage.mustache
@@ -8,4 +8,4 @@
   - frontend ( the name of the frontend )
   - prefix ( the site's prefix )
 }}
-<!doctype html><html><head><link rel="stylesheet" href="/static/user.css"><title>{{frontend}} on nntpchan</title></head><body><p>{{frontend}} on nntpchan</p><p><a href="ukko.html">overboard</a> <a href="{{prefix}}boards.html">boards</a> <a href="{{prefix}}static/faq.html">faq</a></p><dl><dt>last posts:</dt><dd>{{{overview.Render}}}</dd></dl><dl><dt>board stats:</dt><dd><table><tr><th>board</th><th>posts this hour</th><th>posts today</th><th>total</th></tr>{{# boardgraph}}<tr><td><a href="{{prefix}}{{Board}}-0.html">{{Board}}</a></td><td>{{Hour}}</td><td>{{Day}}</td><td>{{All}}</td></tr>{{/ boardgraph}}</table></dd></dl><dl><dt>total stats:</dt><dd>{{{postsgraph.Render}}}</dd></dl><p>{{totalposts}} posts total</p></body></html>
+<!doctype html><html><head><link rel="stylesheet" href="/static/chen-chan.css"><title>{{frontend}} on nntpchan</title></head><body><p>{{frontend}} on nntpchan</p><p><a href="ukko.html">overboard</a> <a href="{{prefix}}boards.html">boards</a> <a href="{{prefix}}static/faq.html">faq</a></p><dl><dt>last posts:</dt><dd>{{{overview.Render}}}</dd></dl><dl><dt>board stats:</dt><dd><table><tr><th>board</th><th>posts this hour</th><th>posts today</th><th>total</th></tr>{{# boardgraph}}<tr><td><a href="{{prefix}}{{Board}}-0.html">{{Board}}</a></td><td>{{Hour}}</td><td>{{Day}}</td><td>{{All}}</td></tr>{{/ boardgraph}}</table></dd></dl><dl><dt>total stats:</dt><dd>{{{postsgraph.Render}}}</dd></dl><p>{{totalposts}} posts total</p></body></html>
diff --git a/contrib/templates/chen-chan/keygen.mustache b/contrib/templates/chen-chan/keygen.mustache
index 2a8e6ab..8b41aea 100644
--- a/contrib/templates/chen-chan/keygen.mustache
+++ b/contrib/templates/chen-chan/keygen.mustache
@@ -5,9 +5,9 @@
  - public ( the public key in hex )
  - secret ( the secret key in hex )
  - tripcode ( html version of the public key )
-                                   }}
+}}
 <!doctype html><html><head><title>new tripcode</title></head><body><pre>
-new tripcode:
+new tripcode
 
 secret: {{secret}}
 public: {{public}}
diff --git a/contrib/templates/chen-chan/modlogin.mustache b/contrib/templates/chen-chan/modlogin.mustache
index fb8e584..a75e478 100644
--- a/contrib/templates/chen-chan/modlogin.mustache
+++ b/contrib/templates/chen-chan/modlogin.mustache
@@ -1,14 +1,10 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="{{prefix}}static/site.css" />
-    <link rel="stylesheet" href="{{prefix}}static/user.css" />
-    <title>login</title>
-  </head>
-  <body>
-    <form action="login" method="POST" name="modlogin">
-      <label for="mod_key">secret</label>
-      <input type="password" id="mod_key" name="privkey" />
-      <input type="submit" value="login" />
-    </form>
-  </body>
-</html>
+<!doctype html><html><head>
+  <link rel="stylesheet" href="{{prefix}}static/chen-chan.css">
+  <title>login</title>
+</head><body>
+  <form action="login" method="POST" name="modlogin">
+    <label for="mod_key">secret</label>
+    <input type="password" id="mod_key" name="privkey">
+    <input type="submit" value="login">
+  </form>
+</body></html>
diff --git a/contrib/templates/chen-chan/modlogin_result.mustache b/contrib/templates/chen-chan/modlogin_result.mustache
index 55cbaa2..a86984b 100644
--- a/contrib/templates/chen-chan/modlogin_result.mustache
+++ b/contrib/templates/chen-chan/modlogin_result.mustache
@@ -6,14 +6,4 @@
  - message ( the message returned from the login attempt )
  - fail ( present if the login failed ) // not yet added
 }}
-<html>
-  <head>
-    <link rel="stylesheet" href="{{prefix}}static/site.css" />
-    <link rel="stylesheet" href="{{prefix}}static/user.css" />
-    <meta http-equiv="refresh" content="1; {{mod_prefix}}"></meta>
-    <title>login</title>
-  </head>
-  <body>
-    <p>{{message}}</p>
-  </body>
-</html>
\ No newline at end of file
+<!doctype html><html><head><meta http-equiv="refresh" content="1; {{mod_prefix}}"><title>login</title></head><body><p>{{message}}</p></body></html>
diff --git a/contrib/templates/chen-chan/modpage.mustache b/contrib/templates/chen-chan/modpage.mustache
index dd2976c..34fd157 100644
--- a/contrib/templates/chen-chan/modpage.mustache
+++ b/contrib/templates/chen-chan/modpage.mustache
@@ -2,33 +2,30 @@
  modpage.mustache -- the moderator panel when logged in
  template parameters:
  - prefix ( the site's prefix )
-
 }}
-<html>
-  <head>
-    <link rel="stylesheet" href="{{prefix}}static/site.css" />
-    <link rel="stylesheet" href="{{prefix}}static/user.css" />
+<!doctype html><html><head>
+    <link rel="stylesheet" href="{{prefix}}static/chen-chan.css">
     <!-- yes it uses js -->
-    <script type="text/javascript" src="{{prefix}}static/mod.js"></script>
-    <title> nntpchan mod page </title>
-  </head>
-  <body>
-    <div>
-      <div> post actions </div>
-      <hr />
+    <script src="{{prefix}}static/mod.js"></script>
+    <title>nntpchan mod page</title>
+</head><body>
+  <dl>
+    <dt>post actions</dt>
+    <dd>
       <div>
         <label for="nntpchan_mod_target">target</label>
-        <input id="nntpchan_mod_target" type="text" />
+        <input id="nntpchan_mod_target" type="text">
       </div>
       <div>
         <button onclick="nntpchan_ban()">ban (url)</button>
         <button onclick="nntpchan_delete()">delete (url)</button>
         <button onclick="nntpchan_unban()">unban (ip)</button>
       </div>
-    </div>
-    <hr />
-    <div>
-      <div> key actions </div>
+    </dd>
+  </dl>
+  <dl>
+    <dt>key actions</dt>
+    <dd>
       <div>
         <label for="nntpchan_board_target">pubkey:</label>
         <input type="text" id="nntpchan_key_target" />
@@ -37,13 +34,14 @@
         <button onclick="nntpchan_key_add()">add key</button>
         <button onclick="nntpchan_key_del()">remove key</button>
       </div>
-    </div>
-    <hr />
-    <div>
-      <div> board actions </div>
+    </dd>
+  </dl>
+  <dl>
+    <dt>board actions</dt>
+    <dd>
       <div>
         <label for="nntpchan_board_target">board name:</label>
-        <input type="text" id="nntpchan_board_target" />
+        <input type="text" id="nntpchan_board_target">
       </div>
       <div>
         <button onclick="nntpchan_admin_board('frontend.add')">add board</button>
@@ -58,27 +56,30 @@
       <div>
         <button onclick="nntpchan_admin_board('frontend.nuke')">nuke</button>
       </div>
-    </div>
-    <hr />
-    <div>
-      <div>
-        lightweight actions
-      </div>
-      <div>
-        <button onclick="nntpchan_admin('template.reload')">reload all templates</button>
-      </div>
-    </div>
-    <hr />
-    <div>
-      <label>very load heavy actions, use with care</label>
+    </dd>
+  </dl>
+  <dl>
+    <dt>lightweight actions</dt>
+    <dd>
+      <button onclick="nntpchan_admin('template.reload')">reload all templates</button>
+    </dd>
+  </dl>
+  <dl>
+    <dt>very load heavy actions, use with care</dt>
+    <dd>
       <div>
         <button onclick="nntpchan_admin('frontend.regen')">regenerate all pages</button>
         <button onclick="nntpchan_admin('thumbnail.regen')">regenerate all thumbnails</button>
       </div>
-    </div>  
-    <div id="nntpchan_mod_result"></div>
-    <noscript>
-      <b>enable js to use the mod panel kthx</b>
-    </noscript>
-  </body>
-</html>
+    </dd>
+  </dl>
+  <dl>
+    <dt>status</dt>
+    <dd>
+      <div id="nntpchan_mod_result"></div>
+      <noscript>
+        <b>enable js to use the mod panel kthx</b>
+      </noscript>
+    </dd>
+  </dl>
+</body></html>
diff --git a/contrib/templates/chen-chan/post_fail.mustache b/contrib/templates/chen-chan/post_fail.mustache
index fe6b0ae..25085d0 100644
--- a/contrib/templates/chen-chan/post_fail.mustache
+++ b/contrib/templates/chen-chan/post_fail.mustache
@@ -1,7 +1,3 @@
-<!doctype html>
-<html>
-  <meta http-equiv="refresh" content="1; {{redirect_url}}" />
-  <body>
-    <p>fail: {{reason}}</p>
-  </body>
-</html>
+<!doctype html><html><head>
+  <meta http-equiv="refresh" content="1; {{redirect_url}}"></head>
+  <body><p>fail: {{reason}}</p></body></html>
diff --git a/contrib/templates/chen-chan/post_success.mustache b/contrib/templates/chen-chan/post_success.mustache
index 13ff141..2db06f4 100644
--- a/contrib/templates/chen-chan/post_success.mustache
+++ b/contrib/templates/chen-chan/post_success.mustache
@@ -4,12 +4,4 @@
  - redirect_url ( the url of the next page we should redirect to )
  - message_id ( the value of the Message-ID header in the post we made, the truncated sha1 of this is the >>posthash )
 }}
-<!doctype html>
-<html>
-  <head>
-    <meta http-equiv="refresh" content="2; {{redirect_url}}">
-  </head>
-  <body>
-    <pre>posted as {{message_id}}</pre>
-  </body>
-</html>
+<!doctype html><html><head><meta http-equiv="refresh" content="2; {{redirect_url}}"></head><body><pre>posted as {{message_id}}</pre></body></html>
diff --git a/contrib/templates/chen-chan/postform.mustache b/contrib/templates/chen-chan/postform.mustache
index 17a569a..243d595 100644
--- a/contrib/templates/chen-chan/postform.mustache
+++ b/contrib/templates/chen-chan/postform.mustache
@@ -5,7 +5,7 @@
  - post_url ( the url of the post form )
  - reference ( the post we are replying to, or empty string if it's an op )
  - button ( the text for the reply button )
-                }}
+}}
 <form action="{{post_url}}" enctype="multipart/form-data" name="post" method="post" style="overflow:auto">
   <input type="hidden" name="reference" value="{{reference}}">
   <textarea id="postform_message" name="message" placeholder="text" cols="40" rows="10" style="float:left" ></textarea><br>
diff --git a/contrib/templates/chen-chan/thread.mustache b/contrib/templates/chen-chan/thread.mustache
index 0517cca..4451b21 100644
--- a/contrib/templates/chen-chan/thread.mustache
+++ b/contrib/templates/chen-chan/thread.mustache
@@ -10,12 +10,11 @@
  - Replies , a list of all the replies or empty if none
  - Board , the name of the Board this thread is on
  - BoardURL , the url that points to the board index page
-                                   }}
-<!doctype html><html><head><link rel="stylesheet" type="text/css" href="/static/user.css">
+}}
+<!doctype html><html><head><link rel="stylesheet" href="/static/chen-chan.css">
   <title>{{thread.OP.Subject}}</title>
   <script type="text/javascript" src="{{thread.Prefix}}static/nntpchan.js"></script>
-</head>
-<body>
+</head><body>
   {{{thread.Navbar}}}
   {{{form}}}
   <dl>
diff --git a/contrib/templates/chen-chan/ukko.mustache b/contrib/templates/chen-chan/ukko.mustache
index bd92b99..22915ac 100644
--- a/contrib/templates/chen-chan/ukko.mustache
+++ b/contrib/templates/chen-chan/ukko.mustache
@@ -3,24 +3,20 @@
   template parameters:
   - prefix ( site prefix )
   - threads ( a list of Thread Models that represent the latest threads )
-                                   }}
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="/static/user.css">
-    <title>ukko/overboard</title>
-  </head>
-  <body>
-    <a href="/">frontpage</a>
-    {{#threads}}
-      <hr>
-      <p>posted on <a href="{{{BoardURL}}}">{{OP.Board}}</a></p>
-      <dl>
+}}
+<!doctype html><html><head>
+  <link rel="stylesheet" href="/static/chen-chan.css">
+  <title>ukko/overboard</title>
+</head><body>
+  <a href="/">frontpage</a>
+  {{#threads}}
+    <hr>
+    <p>posted on <a href="{{{BoardURL}}}">{{OP.Board}}</a></p>
+    <dl>
       {{{OP.Truncate.RenderPost}}}
       {{#Truncate.Replies}}
         {{{Truncate.RenderPost}}}
       {{/Truncate.Replies}}
-      </dl>
-    {{/threads}}
-  </body>
-</html>
+    </dl>
+  {{/threads}}
+</body></html>

board	posts per hour	posts per day	total
board	posts per hour	posts per day	total	+ {{Board}} +	+ {{Hour}} +	+ {{Day}} +	+ {{All}} +
- {{Board}} -	- {{Hour}} -	- {{Day}} -	- {{All}} -