Rolled back to use Twitch URLs. Minor refactoring.
Resolved merge conflict