Update to use new theme