refactor color fcns v2