highlighting
tokens
removed deprecated token
typo
fix compilation