@tclem this is what I had in mind !8961. With the exception of EUDC collection, which is easy to fix, every collection is now created from a font set. This makes it easy to reuse entries for following GetFontSet() calls. Could you take a look and ideally try to use it as a base, and test with it. I can certainly finish it too.