Upstream updates

v3.2.0+2 has added two new themes and a handful of other changes. I have split out the changes that `./rearranges` recommended from the others as a separate commit (77e9563) because they seemed a bit spurious to me.