Update with changes to the theme from upstream