Better coloring, expandos are handled everywhere.
Updating package.json