CMS-3841 Content Type Site - Misc fixes to "theme" selector