Adding support for theme+style