adding support for custom theme