Allow embedding images/files in template
- also small changes to quoting