Add Theme Manager Support