Adjust to theme names