Fixed comment typo and using generic theme