tidied
added colours back into constants class