merge from contao theme

yeah yeah... lazy me, there will be better comments when we reach the
final version
i promise!