Fixed errors arising out of nomenclature changes from Subtheme to
Category and Category to Sub-Category