Partial PR here, I didn't have time to look into more detail: https://github.com/xwiki-contrib/guided-tour/pull/51/changes