Some reorganization in the code and templates:

 - Moved feed generation to a separate function
 - Using different templates for catalogs and collections.