various fixes to theme