Fix #419 - Clean up color variables and simplify associated documentation