Replace colour variables used in various places with generic variables

Allows easier theming