wip fix color