Massive changes to support hue-shifting