Add support for Theme Features