Bring back -gray, -gray and -border-gray, to avoid breaking changes.