Update with theme changes