Change to COLOR-PARSE and some bug fixes