Fixed issue with base themes.