Improve coloring some. Still ugly but better.
merge