Completed support for page templates