Rename themeNameSpace to themeName and add themeTitle