Contrib more extraction formats and templates

Untested, only submitted because Kenneth pushed me about it :-P