diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 9589177..8f44327 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,8 +1,10 @@
 " Vim syntax support file
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 30
+" Last Change: 2007 Mar 10
 "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
 "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
+"	       (made w3 compliant by Edd Barrett <vext01@gmail.com>)
+"	       (added html_font. Edd Barrett <vext01@gmail.com>)
 
 " Transform a file into HTML, using the current syntax highlighting.
 
@@ -13,50 +15,47 @@
   let s:numblines = &number
 endif
 
+" Font
+if exists("html_font")
+  let s:htmlfont = html_font . ", monospace"
+else
+  let s:htmlfont = "monospace"
+endif
+
 " When not in gui we can only guess the colors.
 if has("gui_running")
   let s:whatterm = "gui"
 else
   let s:whatterm = "cterm"
   if &t_Co == 8
-    let s:cterm_color0  = "#808080"
-    let s:cterm_color1  = "#ff6060"
-    let s:cterm_color2  = "#00ff00"
-    let s:cterm_color3  = "#ffff00"
-    let s:cterm_color4  = "#8080ff"
-    let s:cterm_color5  = "#ff40ff"
-    let s:cterm_color6  = "#00ffff"
-    let s:cterm_color7  = "#ffffff"
+    let s:cterm_color = {0: "#808080", 1: "#ff6060", 2: "#00ff00", 3: "#ffff00", 4: "#8080ff", 5: "#ff40ff", 6: "#00ffff", 7: "#ffffff"}
   else
-    let s:cterm_color0  = "#000000"
-    let s:cterm_color1  = "#c00000"
-    let s:cterm_color2  = "#008000"
-    let s:cterm_color3  = "#804000"
-    let s:cterm_color4  = "#0000c0"
-    let s:cterm_color5  = "#c000c0"
-    let s:cterm_color6  = "#008080"
-    let s:cterm_color7  = "#c0c0c0"
-    let s:cterm_color8  = "#808080"
-    let s:cterm_color9  = "#ff6060"
-    let s:cterm_color10 = "#00ff00"
-    let s:cterm_color11 = "#ffff00"
-    let s:cterm_color12 = "#8080ff"
-    let s:cterm_color13 = "#ff40ff"
-    let s:cterm_color14 = "#00ffff"
-    let s:cterm_color15 = "#ffffff"
+    let s:cterm_color = {0: "#000000", 1: "#c00000", 2: "#008000", 3: "#804000", 4: "#0000c0", 5: "#c000c0", 6: "#008080", 7: "#c0c0c0", 8: "#808080", 9: "#ff6060", 10: "#00ff00", 11: "#ffff00", 12: "#8080ff", 13: "#ff40ff", 14: "#00ffff", 15: "#ffffff"}
+
+    " Colors for 88 and 256 come from xterm.
+    if &t_Co == 88
+      call extend(s:cterm_color, {16: "#000000", 17: "#00008b", 18: "#0000cd", 19: "#0000ff", 20: "#008b00", 21: "#008b8b", 22: "#008bcd", 23: "#008bff", 24: "#00cd00", 25: "#00cd8b", 26: "#00cdcd", 27: "#00cdff", 28: "#00ff00", 29: "#00ff8b", 30: "#00ffcd", 31: "#00ffff", 32: "#8b0000", 33: "#8b008b", 34: "#8b00cd", 35: "#8b00ff", 36: "#8b8b00", 37: "#8b8b8b", 38: "#8b8bcd", 39: "#8b8bff", 40: "#8bcd00", 41: "#8bcd8b", 42: "#8bcdcd", 43: "#8bcdff", 44: "#8bff00", 45: "#8bff8b", 46: "#8bffcd", 47: "#8bffff", 48: "#cd0000", 49: "#cd008b", 50: "#cd00cd", 51: "#cd00ff", 52: "#cd8b00", 53: "#cd8b8b", 54: "#cd8bcd", 55: "#cd8bff", 56: "#cdcd00", 57: "#cdcd8b", 58: "#cdcdcd", 59: "#cdcdff", 60: "#cdff00", 61: "#cdff8b", 62: "#cdffcd", 63: "#cdffff", 64: "#ff0000"})
+      call extend(s:cterm_color, {65: "#ff008b", 66: "#ff00cd", 67: "#ff00ff", 68: "#ff8b00", 69: "#ff8b8b", 70: "#ff8bcd", 71: "#ff8bff", 72: "#ffcd00", 73: "#ffcd8b", 74: "#ffcdcd", 75: "#ffcdff", 76: "#ffff00", 77: "#ffff8b", 78: "#ffffcd", 79: "#ffffff", 80: "#2e2e2e", 81: "#5c5c5c", 82: "#737373", 83: "#8b8b8b", 84: "#a2a2a2", 85: "#b9b9b9", 86: "#d0d0d0", 87: "#e7e7e7"})
+    elseif &t_Co == 256
+      call extend(s:cterm_color, {16: "#000000", 17: "#00005f", 18: "#000087", 19: "#0000af", 20: "#0000d7", 21: "#0000ff", 22: "#005f00", 23: "#005f5f", 24: "#005f87", 25: "#005faf", 26: "#005fd7", 27: "#005fff", 28: "#008700", 29: "#00875f", 30: "#008787", 31: "#0087af", 32: "#0087d7", 33: "#0087ff", 34: "#00af00", 35: "#00af5f", 36: "#00af87", 37: "#00afaf", 38: "#00afd7", 39: "#00afff", 40: "#00d700", 41: "#00d75f", 42: "#00d787", 43: "#00d7af", 44: "#00d7d7", 45: "#00d7ff", 46: "#00ff00", 47: "#00ff5f", 48: "#00ff87", 49: "#00ffaf", 50: "#00ffd7", 51: "#00ffff", 52: "#5f0000", 53: "#5f005f", 54: "#5f0087", 55: "#5f00af", 56: "#5f00d7", 57: "#5f00ff", 58: "#5f5f00", 59: "#5f5f5f", 60: "#5f5f87", 61: "#5f5faf", 62: "#5f5fd7", 63: "#5f5fff", 64: "#5f8700"})
+      call extend(s:cterm_color, {65: "#5f875f", 66: "#5f8787", 67: "#5f87af", 68: "#5f87d7", 69: "#5f87ff", 70: "#5faf00", 71: "#5faf5f", 72: "#5faf87", 73: "#5fafaf", 74: "#5fafd7", 75: "#5fafff", 76: "#5fd700", 77: "#5fd75f", 78: "#5fd787", 79: "#5fd7af", 80: "#5fd7d7", 81: "#5fd7ff", 82: "#5fff00", 83: "#5fff5f", 84: "#5fff87", 85: "#5fffaf", 86: "#5fffd7", 87: "#5fffff", 88: "#870000", 89: "#87005f", 90: "#870087", 91: "#8700af", 92: "#8700d7", 93: "#8700ff", 94: "#875f00", 95: "#875f5f", 96: "#875f87", 97: "#875faf", 98: "#875fd7", 99: "#875fff", 100: "#878700", 101: "#87875f", 102: "#878787", 103: "#8787af", 104: "#8787d7", 105: "#8787ff", 106: "#87af00", 107: "#87af5f", 108: "#87af87", 109: "#87afaf", 110: "#87afd7", 111: "#87afff", 112: "#87d700"})
+      call extend(s:cterm_color, {113: "#87d75f", 114: "#87d787", 115: "#87d7af", 116: "#87d7d7", 117: "#87d7ff", 118: "#87ff00", 119: "#87ff5f", 120: "#87ff87", 121: "#87ffaf", 122: "#87ffd7", 123: "#87ffff", 124: "#af0000", 125: "#af005f", 126: "#af0087", 127: "#af00af", 128: "#af00d7", 129: "#af00ff", 130: "#af5f00", 131: "#af5f5f", 132: "#af5f87", 133: "#af5faf", 134: "#af5fd7", 135: "#af5fff", 136: "#af8700", 137: "#af875f", 138: "#af8787", 139: "#af87af", 140: "#af87d7", 141: "#af87ff", 142: "#afaf00", 143: "#afaf5f", 144: "#afaf87", 145: "#afafaf", 146: "#afafd7", 147: "#afafff", 148: "#afd700", 149: "#afd75f", 150: "#afd787", 151: "#afd7af", 152: "#afd7d7", 153: "#afd7ff", 154: "#afff00", 155: "#afff5f", 156: "#afff87", 157: "#afffaf", 158: "#afffd7"})
+      call extend(s:cterm_color, {159: "#afffff", 160: "#d70000", 161: "#d7005f", 162: "#d70087", 163: "#d700af", 164: "#d700d7", 165: "#d700ff", 166: "#d75f00", 167: "#d75f5f", 168: "#d75f87", 169: "#d75faf", 170: "#d75fd7", 171: "#d75fff", 172: "#d78700", 173: "#d7875f", 174: "#d78787", 175: "#d787af", 176: "#d787d7", 177: "#d787ff", 178: "#d7af00", 179: "#d7af5f", 180: "#d7af87", 181: "#d7afaf", 182: "#d7afd7", 183: "#d7afff", 184: "#d7d700", 185: "#d7d75f", 186: "#d7d787", 187: "#d7d7af", 188: "#d7d7d7", 189: "#d7d7ff", 190: "#d7ff00", 191: "#d7ff5f", 192: "#d7ff87", 193: "#d7ffaf", 194: "#d7ffd7", 195: "#d7ffff", 196: "#ff0000", 197: "#ff005f", 198: "#ff0087", 199: "#ff00af", 200: "#ff00d7", 201: "#ff00ff", 202: "#ff5f00", 203: "#ff5f5f", 204: "#ff5f87"})
+      call extend(s:cterm_color, {205: "#ff5faf", 206: "#ff5fd7", 207: "#ff5fff", 208: "#ff8700", 209: "#ff875f", 210: "#ff8787", 211: "#ff87af", 212: "#ff87d7", 213: "#ff87ff", 214: "#ffaf00", 215: "#ffaf5f", 216: "#ffaf87", 217: "#ffafaf", 218: "#ffafd7", 219: "#ffafff", 220: "#ffd700", 221: "#ffd75f", 222: "#ffd787", 223: "#ffd7af", 224: "#ffd7d7", 225: "#ffd7ff", 226: "#ffff00", 227: "#ffff5f", 228: "#ffff87", 229: "#ffffaf", 230: "#ffffd7", 231: "#ffffff", 232: "#080808", 233: "#121212", 234: "#1c1c1c", 235: "#262626", 236: "#303030", 237: "#3a3a3a", 238: "#444444", 239: "#4e4e4e", 240: "#585858", 241: "#626262", 242: "#6c6c6c", 243: "#767676", 244: "#808080", 245: "#8a8a8a", 246: "#949494", 247: "#9e9e9e", 248: "#a8a8a8", 249: "#b2b2b2", 250: "#bcbcbc", 251: "#c6c6c6", 252: "#d0d0d0", 253: "#dadada", 254: "#e4e4e4", 255: "#eeeeee"})
+    endif
   endif
 endif
 
 " Return good color specification: in GUI no transformation is done, in
-" terminal return RGB values of known colors and empty string on unknown
+" terminal return RGB values of known colors and empty string for unknown
 if s:whatterm == "gui"
   function! s:HtmlColor(color)
     return a:color
   endfun
 else
   function! s:HtmlColor(color)
-    if exists("s:cterm_color" . a:color)
-      execute "return s:cterm_color" . a:color
+    if has_key(s:cterm_color, a:color)
+      return s:cterm_color[a:color]
     else
       return ""
     endif
@@ -219,21 +218,27 @@
   else
     exe "normal! a<?xml version=\"1.0\"?>\n\e"
   endif
-  let s:tag_close = '/>'
+  let s:tag_close = ' />'
 else
   let s:tag_close = '>'
 endif
 
+" Cache html_no_pre incase we have to turn it on for non-css mode
+if exists("html_no_pre")
+  let s:old_html_no_pre = html_no_pre
+endif
+
+if !exists("html_use_css")
+  " Cant put font tags in <pre>
+  let html_no_pre=1
+endif
+
 let s:HtmlSpace = ' '
 let s:LeadingSpace = ' '
 let s:HtmlEndline = ''
 if exists("html_no_pre")
   let s:HtmlEndline = '<br' . s:tag_close
-  if exists("use_xhtml")
-    let s:LeadingSpace = '&#x20;'
-  else
     let s:LeadingSpace = '&nbsp;'
-  endif
   let s:HtmlSpace = '\' . s:LeadingSpace
 endif
 
@@ -245,21 +250,14 @@
 if s:html_encoding != ""
   exe "normal! a<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:html_encoding . '"' . s:tag_close . "\n\e"
 endif
+
 if exists("html_use_css")
   exe "normal! a<style type=\"text/css\">\n<!--\n-->\n</style>\n\e"
 endif
 if exists("html_no_pre")
-  if exists("use_xhtml")
-    exe "normal! a</head>\n<body>\n<p>\n\e"
-  else
-    exe "normal! a</head>\n<body>\n\e"
-  endif
+  exe "normal! a</head>\n<body>\n\e"
 else
-  if exists("use_xhtml")
-    exe "normal! a</head>\n<body>\n<p>\n<pre>\n\e"
-  else
-    exe "normal! a</head>\n<body>\n<pre>\n\e"
-  endif
+  exe "normal! a</head>\n<body>\n<pre>\n\e"
 endif
 
 exe s:orgwin . "wincmd w"
@@ -416,18 +414,16 @@
 endwhile
 " Finish with the last line
 exe s:newwin . "wincmd w"
+
+" Close off the font tag that encapsulates the whole <body>
+if !exists("html_use_css")
+  exe "normal! a</font>\e"
+endif
+
 if exists("html_no_pre")
-  if exists("use_xhtml")
-    exe "normal! a</p>\n</body>\n</html>\e"
-  else
-    exe "normal! a</body>\n</html>\e"
-  endif
+  exe "normal! a</body>\n</html>\e"
 else
-  if exists("use_xhtml")
-    exe "normal! a</pre>\n</p>\n</body>\n</html>\e"
-  else
-    exe "normal! a</pre>\n</body>\n</html>\e"
-  endif
+  exe "normal! a</pre>\n</body>\n</html>\e"
 endif
 
 
@@ -451,19 +447,15 @@
 " incorrect.
 if exists("html_use_css")
   if exists("html_no_pre")
-    execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: Courier, monospace; }\e"
+    execute "normal! A\nbody { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }\e"
   else
-    execute "normal! A\npre { color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
+    execute "normal! A\npre { font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }\e"
     yank
     put
     execute "normal! ^cwbody\e"
   endif
 else
-  if exists("html_no_pre")
-    execute '%s:<body>:<body ' . 'bgcolor="' . s:bgc . '" text="' . s:fgc . '" style="font-family\: Courier, monospace;">'
-  else
-    execute '%s:<body>:<body ' . 'bgcolor="' . s:bgc . '" text="' . s:fgc . '">'
-  endif
+    execute '%s:<body>:<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"><font face="'. s:htmlfont .'">'
 endif
 
 " Line numbering attributes
@@ -493,7 +485,7 @@
       execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+' . s:HtmlOpening(s:id) . '\1' . s:HtmlClosing(s:id) . '+g'
     endif
   else
-    execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+g'
+    execute '%s+<span class="' . s:id_name . '">\([^<]*\)</span>+\1+ge'
     if exists("html_use_css")
       1;/<style type="text/+1
     endif
@@ -504,12 +496,10 @@
 %s+\(https\=://\S\{-}\)\(\([.,;:}]\=\(\s\|$\)\)\|[\\"'<>]\|&gt;\|&lt;\|&quot;\)+<a href="\1">\1</a>\2+ge
 
 " The DTD
-if exists("html_use_css")
-  if exists("use_xhtml")
-    exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\e"
-  else
-    exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n\e"
-  endif
+if exists("use_xhtml")
+  exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\e"
+else
+  exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\e"
 endif
 
 if exists("use_xhtml")
@@ -530,7 +520,16 @@
 let &l:et = s:old_et
 exe s:newwin . "wincmd w"
 
+" Reset old <pre> settings
+if exists("s:old_html_no_pre")
+  let html_no_pre = s:old_html_no_pre
+  unlet s:old_html_no_pre
+elseif exists("html_no_pre")
+  unlet html_no_pre
+endif
+
 " Save a little bit of memory (worth doing?)
+unlet s:htmlfont
 unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search
 unlet s:whatterm s:idlist s:lnum s:end s:fgc s:bgc s:old_magic
 unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:numblines