Re-add support for header.html and footer.html