color updates; minor refactoring