3.0 support for multiple themes

Support multiple themes.