Upstream fixes

This branch contains a bunch of fixes and updates for your theme.

Take a look through the commits, they're pretty straightforward.

Apologies for the big pull request with a bunch of different stuff in it.