Adding more templated language in several categories.