Core: make sure the theme doesn't get reset