Apply 2715ff0 to the right set of files,
adding 32-bit methods to get/set colors