diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl
--- a/templates/changeset.tmpl
+++ b/templates/changeset.tmpl
@@ -39,7 +39,7 @@
 </tr>
 </table>
 
-<div id="changesetDiff" class="pre">
+<div id="changesetDiff">
 #diff#
 </div>
 
diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl
--- a/templates/filediff.tmpl
+++ b/templates/filediff.tmpl
@@ -23,7 +23,7 @@
 #parent#
 </table>
 
-<div id="fileDiff" class="pre">
+<div id="fileDiff">
 #diff#
 </div>
 
diff --git a/templates/header.tmpl b/templates/header.tmpl
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -27,7 +27,8 @@ a { text-decoration:none; }
 }
 
 /* Common */
-.pre { font-family: monospace; white-space: pre; }
+pre { margin: 0; }
+
 
 /* Changelog entries */
 .changelogEntry { width: 100%; }
@@ -44,11 +45,10 @@ a { text-decoration:none; }
 #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,17 +19,17 @@ 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 = "<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>"
+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 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 = "<ul class="parity#parity#">#lines#</ul>"
+diffblock = "<pre class="parity#parity#">#lines#</pre>"
 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>"