Colour refactor and fixes #9