Here is the updated patch with some modifications...

(most of them are in "website/www/utils.scm")

--
Mathieu Lirzin