Files I updated early after the merge

You can ignore all but the last 3, the rest were me trying to merge the forks.
mailto links are picked up by extensions/programs that use them, making this extra attribute pointless, as it'll never be called.