Wordsmithed, updated '<theme-name>' and similar constructs to '[theme-name]' and similar
Merge pull request #972 from jrao/resources-importer-updates

resources-importer-updates