Refs #17611; simplify themes field and passed in the correct vocabulary_factory