courgette theme fixes

Fixes some errors occuring when we use the courgette theme.
Errors which are currently observable on the demo site.

Sorry, I just notice that my commits are full of differences due to spaces... not very elegant.