Trivia plugin: revert refactor, keep working updates
Merge pull request #1316 from Morfent/trivia

Trivia plugin: revert refactor, keep working updates