Simplify swapping themes