@wes_w So, just to be clear: the method I described for overriding theme templates via an extension is not officially recognised as legitimate customisation method. Ie, it's a bit hacky. So use at your own risk. Secondly, yes that would probably be the best way to do it.