Fixed an issue with the previous commit, where I reversed Marius's first name and last name.

Adapted the template language filter, adapted some elements in the Enterprise template.
#5: Adapted templates, both Marketing and Enterprise.