Fixed broken support for themes.