Latest template changes

Includes new AMI for wordpress theme changes.