I don't know if a swapping theme was done recently but I think it could be fun. And yes, I like puzzle games.