Add generic templates and change links to remote_links