Updated to new colorization by id. Removed old callback cruft