Added type list
Added font lock for types