Fix themes/cookies in (CM) demos