Viewmodel re-org and "theme" support for callouts
Merge branch 'master' of github.com:quedigital/tenth_hcw