Refactor|Fonts|Resources|Client: Split up more Fonts collection logic