Revise /avatars and !avatars