moved all colours to colour-palette