Fixed color var and fixed array names, see #88