Thank you for fixing this.
About Selva, I've got it on my todo. I was waiting for the fix of site template to do it ;).
See you tonight.