Added some more coloring