Update with latest theme changes