more fixes for theme support