Hotfixes for themes and paymill_payment.