Fixed some issues on the ThemePlugin.