Various adjustments
Declare common colors as constants