Tidied colour classes up a bit

Colour is still not working.
ColourSoftware is working though.