Added support for themes