Add more vendor prefixes and make regex less strict