Updated mapping for theme and speaker management.