Add emotes from upstream