Fixing color/subtype setting on a few tokens