diff --git a/templates/filerevision-gitweb.tmpl b/templates/filerevision-gitweb.tmpl
--- a/templates/filerevision-gitweb.tmpl
+++ b/templates/filerevision-gitweb.tmpl
@@ -10,13 +10,12 @@
 </div>
 
 <div class="page_nav">
-<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=manifest;manifest=#manifest#;path=#path#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a><br/>
+<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?mf=#manifest|short#;path=#path#;style=gitweb">manifest</a> | <a href="?cmd=changeset;node=#node#;style=gitweb">changeset</a> | file | <a href="?cmd=filelog;file=#file#;filenode=#filenode#;style=gitweb">revisions</a> | <a href="?cmd=annotate;file=#file#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a><br/>
 </div>
 
-<div><a class="title" href="?cmd=FIXME;style=gitweb">#desc|firstline|escape#</a></div>
-<div class="page_path"><b>#file#</b></div>
+<div class="title">#file#</div>
 <div class="page_body">
-#text#
+#text%fileline#
 </div>
 
 #footer#
diff --git a/templates/header-gitweb.tmpl b/templates/header-gitweb.tmpl
--- a/templates/header-gitweb.tmpl
+++ b/templates/header-gitweb.tmpl
@@ -37,16 +37,16 @@ a.list { text-decoration:none; color:#00
 a.list:hover { text-decoration:underline; color:#880000; }
 table { padding:8px 4px; }
 th { padding:2px 5px; font-size:12px; text-align:left; }
-tr.light:hover, tr.parity0:hover { background-color:#edece6; }
-tr.dark, tr.parity1 { background-color:#f6f6f0; }
-tr.dark:hover, tr.parity1:hover { background-color:#edece6; }
+tr.light:hover, .parity0:hover { background-color:#edece6; }
+tr.dark, .parity1 { background-color:#f6f6f0; }
+tr.dark:hover, .parity1:hover { background-color:#edece6; }
 td { padding:2px 5px; font-size:12px; vertical-align:top; }
 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
 div.pre { font-family:monospace; font-size:12px; white-space:pre; }
 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
 div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
-a.linenr { color:#999999; text-decoration:none }
+.linenr { color:#999999; text-decoration:none }
 a.rss_logo {
 	float:right; padding:3px 0px; width:35px; line-height:10px;
 	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
diff --git a/templates/map-gitweb b/templates/map-gitweb
--- a/templates/map-gitweb
+++ b/templates/map-gitweb
@@ -20,7 +20,7 @@ filerevision = filerevision-gitweb.tmpl
 fileannotate = fileannotate-gitweb.tmpl
 filediff = filediff-gitweb.tmpl
 filelog = filelog-gitweb.tmpl
-fileline = "<div class="pre"><a id="l#linenumber#" href="#l#linenumber#" class="linenr">   #linenumber#</a> #line|escape#</div>"
+fileline = "<div style="font-family:monospace; white-space: pre;" class="parity#parity#"><span class="linenr">   #linenumber#</span> #line|escape#</div>"
 filelogentry = filelogentry-gitweb.tmpl
 annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#;style=gitweb">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
 difflineplus = "<div class="pre" style="color:#008800;">#line|escape#</div>"