We need to look into the Hugo changes and see what we can use in this new version. Probably in another PR.