replaced colour*'s with a proper pallette class