add theme support
fix typo
Merge branch 'master' of https://github.com/cosmocommerce/cosmocommerce