bs:050314, Emote Formatting changes

Put in a couple more changes that made animated and regular emotes all
show in orange now.