Fix bug preventing export of module settings and templates.
Improve themes import.
Minor bug fixes.