Make the color variables more clear. #117