changed order of colours
changes to colour names and font family