Refactor theme templates
Add new hero images