New theme, fixes