Update to theming