added support for THEME