added support for other themes