diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl
--- a/templates/changeset.tmpl
+++ b/templates/changeset.tmpl
@@ -12,34 +12,38 @@
 
 <h2>changeset: #desc|escape|firstline#</h2>
 
-<table>
+<table id="changesetEntry">
 <tr>
- <td class="metatag">changeset #rev#:</td>
- <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
+ <th class="changeset">changeset #rev#:</th>
+ <td class="changeset"><a href="?cmd=changeset;node=#node#">#node|short#</a></td>
+</tr>
 #parent#
 #changesettag#
 <tr>
- <td class="metatag">manifest:</td>
- <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td></tr>
+ <th class="manifest">manifest:</th>
+ <td class="manifest"><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest|short#</a></td>
+</tr>
 <tr>
- <td class="metatag">author:</td>
- <td>#author|obfuscate#</td></tr>
+ <th class="author">author:</th>
+ <td class="author">#author|obfuscate#</td>
+</tr>
 <tr>
- <td class="metatag">date:</td>
- <td>#date|date# (#date|age# ago)</td></tr>
+ <th class="date">date:</th>
+ <td class="date">#date|date# (#date|age# ago)</td></tr>
 <tr>
- <td class="metatag" valign="top">files:</td>
- <td>#files#</td></tr>
+ <th class="files">files:</th>
+ <td class="files">#files#</td></tr>
 <tr>
- <td class="metatag" valign="top">description:</td>
- <td>#desc|escape|addbreaks#</td></tr>
+ <th class="description">description:</th>
+ <td class="description">#desc|escape|addbreaks#</td>
+</tr>
 </table>
 
-<pre>
+<div id="changesetDiff" class="pre">
 #diff#
-</pre>
+</div>
 
 </body>
-</html
+</html>
 
 
diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl
--- a/templates/filediff.tmpl
+++ b/templates/filediff.tmpl
@@ -15,16 +15,17 @@
 
 <h2>#file#</h2>
 
-<table>
+<table id="filediffEntry">
 <tr>
- <td class="metatag">revision #rev#:</td>
- <td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>
+ <th class="revision">revision #rev#:</th>
+ <td class="revision"><a href="?cmd=changeset;node=#node#">#node|short#</a></td>
+</tr>
 #parent#
 </table>
 
-<pre>
+<div id="fileDiff" class="pre">
 #diff#
-</pre>
+</div>
 
 #footer#
 
diff --git a/templates/header.tmpl b/templates/header.tmpl
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -26,6 +26,9 @@ a { text-decoration:none; }
   text-align: right; 
 }
 
+/* Common */
+.pre { font-family: monospace; white-space: pre; }
+
 /* Changelog entries */
 .changelogEntry { width: 100%; }
 .changelogEntry th { font-weight: normal; text-align: right; vertical-align: top; width: 15%;}
@@ -36,5 +39,16 @@ a { text-decoration:none; }
 #tagEntries { list-style: none; margin: 0; padding: 0; }
 #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
 #tagEntries .tagEntry span.node { font-family: monospace; }
+
+/* Changeset entry */
+#changesetEntry { }
+#changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
+#changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
+#changesetDiff ul, #changesetDiff li { list-style: none; margin: 0; padding: 0; }
+
+/* File diff view */
+#filediffEntry { }
+#filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
+#fileDiff ul, #fileDiff li { list-style: none; margin: 0; padding: 0; }
 -->
 </style>
diff --git a/templates/map b/templates/map
--- a/templates/map
+++ b/templates/map
@@ -19,18 +19,18 @@ filelog = filelog.tmpl
 fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>"
 filelogentry = filelogentry.tmpl
 annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
-difflineplus = "<span class="plusline">#line|escape#</span>"
-difflineminus = "<span class="minusline">#line|escape#</span>"
-difflineat = "<span class="atline">#line|escape#</span>"
-diffline = "#line|escape#"
-changelogparent = "<tr><th class="parent">parent #rev#:</th><td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
-changesetparent = "<tr><td class="metatag">parent #rev#:</td><td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
+difflineplus = "<li class="plusline">#line|escape#</li>"
+difflineminus = "<li class="minusline">#line|escape#</li>"
+difflineat = "<li class="atline">#line|escape#</li>"
+diffline = "<li>#line|escape#</li>"
+changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
+changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
 filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
 fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
 tags = tags.tmpl
 tagentry = "<li class="tagEntry parity#parity#"><span class="node">#node#</span> <a href="?cmd=changeset;node=#node#">#tag#</a></li>"
-diffblock = "<div class="parity#parity#">#lines#</div>"
-changelogtag = "<tr><td align="right">tag:&nbsp;</td><td>#tag#</td></tr>"
-changesettag = "<tr><td class="metatag">tag:&nbsp;</td><td>#tag#</td></tr>"
-filediffparent = "<tr><td class="metatag">parent #rev#:</td><td><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
+diffblock = "<ul class="parity#parity#">#lines#</ul>"
+changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
+changesettag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
+filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
 filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"