added support for themes