updates to theme support and a few other things