Merged latest so-simple-theme changes.

Up to 14c86514cc8ceb724b3410e7920d7f3fb1550ee2.