#30 Set colors more consistent