Added support for themes.