changed coloring of types to differentiate from keywords
added some basic functional types