Fixed some of the colour marking

This is the repository I forked and fixed, I think we can merge it back now