Removing more markup from template files and including it in the content text files.