As discussed :)
Todo: update some links, update the HTML bodies
@wiebalck may have some suggestions as well