Restarted switch to Balzac theme

I had a bit of a time trying to merge different branches, but I think I've
got everything settled now.  The git log before this commit is likely a huge
mess.  Sorry.