simplify code in places; have only one catalog in ~/Pictures/Catalog