Add support for multiple themes