Update templates so that they look for Product and Category by default