Merged some, and removed some useless directives.
This increases the ease at which you can edit the colours.