fixed color/mask references