Switched over all calls to use V2, and added some color-conversion code