added color codes
Fixed some conflicts with Colour.java