diff --git a/syntax/org.vim b/syntax/org.vim
index 784a0ac..be7ddc6 100644
--- a/syntax/org.vim
+++ b/syntax/org.vim
@@ -23,7 +23,7 @@ else
     highlight def orgItalic term=none cterm=none gui=none
 endif
 
-highlight def orgBold      term=bold      cterm=bold      gui=bold
+highlight def orgBold term=bold cterm=bold gui=bold
 highlight def orgUnderline term=underline cterm=underline gui=underline
 highlight def link orgItalicDelimiter    orgItalic
 highlight def link orgBoldDelimiter      orgBold
@@ -35,7 +35,7 @@ syntax match  orgOption /^\s*#+\w\+.*$/ keepend
 syntax region orgTitle matchgroup=orgOption start="^\s*#+TITLE:\s*" end="$" keepend oneline
 
 highlight def link orgBlockDelimiter SpecialComment
-highlight def link orgOption Constant
+highlight def link orgOption Type
 highlight def link orgTitle Function
 
 
@@ -47,10 +47,10 @@ syntax region orgVerbatim matchgroup=orgBlockDelimiter start="^\s*#+BEGIN_.*"
 syntax region orgCode     matchgroup=orgBlockDelimiter start="^\s*#+BEGIN_SRC"     end="^\s*#+END_SRC"     keepend
 syntax region orgCode     matchgroup=orgBlockDelimiter start="^\s*#+BEGIN_EXAMPLE" end="^\s*#+END_EXAMPLE" keepend
 
-highlight def link orgVerbatim          Delimiter
+highlight def link orgVerbatim Identifier
 highlight def link orgVerbatimDelimiter orgVerbatim
-highlight def link orgCode              Statement
-highlight def link orgCodeDelimiter     orgCode
+highlight def link orgCode Statement
+highlight def link orgCodeDelimiter orgCode
 
 
 " Comments
@@ -66,18 +66,31 @@ syntax match orgHeading3 /^\s*\*\{3}\s\+.*$/ keepend contains=@Spell,orgTag,orgT
 syntax match orgHeading4 /^\s*\*\{4}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo
 syntax match orgHeading5 /^\s*\*\{5}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo
 syntax match orgHeading6 /^\s*\*\{6}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo
+syntax match orgHeadingE /^\s*\*\{7,}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo
+
 syntax match orgTag /:\w\{-}:/ contained contains=orgTag
 exec 'syntax keyword orgTodo contained ' . join(g:org_state_keywords, ' ')
 
+if hlexists('htmlH1')
+    highlight def link orgHeading1 htmlH1
+    highlight def link orgHeading2 htmlH2
+    highlight def link orgHeading3 htmlH3
+    highlight def link orgHeading4 htmlH4
+    highlight def link orgHeading5 htmlH5
+    highlight def link orgHeading6 htmlH6
+    highlight def link orgHeadingE htmlH6
+else
+    hi def link orgHeading1 Constant
+    hi def link orgHeading2 String
+    hi def link orgHeading3 PreProc
+    hi def link orgHeading4 PreProc
+    hi def link orgHeading5 PreProc
+    hi def link orgHeading6 PreProc
+    hi def link orgHeadingE PreProc
+endif
 
-highlight def link orgHeading1 htmlH1
-highlight def link orgHeading2 htmlH2
-highlight def link orgHeading3 htmlH3
-highlight def link orgHeading4 htmlH4
-highlight def link orgHeading5 htmlH5
-highlight def link orgHeading6 htmlH6
 highlight def link orgTodo Todo
-highlight def link orgTag Constant
+highlight def link orgTag Type
 
 
 " Timestamps