Fix color_modifier_raw (color IDs are actually pattern IDs), add some other stuff