Donation / theme refactor