fix color refactor