Updated theme name in files & refactored comment temp.