Fixes for new Themes