Changed how demo handling works, now there are proper link in feeds, injected demos and more, fixes #25