#980: themes (tests fixed)