add theme compat, minor changes