Ok, another probably-failed ground-up redesign incoming. I tried the approach of assigning each colour pair a theme/strategy and building from there, but it was hard not to end up with a bunch of isolated subsets of cards that never really interacted with each other. Instead I'm going to try...