WIP: Better coloring