Issue #16. Small colors updates