Updates to theming