Clean-ups. Unify color selection.