Fix: catalog, templates