add theme support for all