Color func order changed, more clean code