Avatar support

A bit hacky having to use regex - but I don't see a better way...