Support for funky app names, update watch