Changed some regex to give a better highlighting
Properties are now hidden