Added buffer color support