Improve event coloring