Change a few things around to make theme selection more joyful than hateful.