I'd just like to mention that I've managed to fix all of my WPSes to the upcoming code via testing on the patched sim, and I must say... No bugs to report, but dang is it fun trying to make sure I don't make a small mistake somewhere that kills everything, and more fun finding it when I do. In any case, I'm ready and waiting for the commit now to do a dump of the updated WPS themes.