Trivia plugin: revert refactor, keep working updates