Added more colours, and stuff