colors refactor fixes