Adding support for theme