Update page templates to accept html options
Merge branch 'html-options'