various fixes for theme cms