Update Catalogue

Fix a syntax bug in rendering Catalogue badges without color.

A refactor made Catalogue easier to work with.

Plus tests added to ensure that any error is raised if Catalogue badges have bad fields.