Reorganisation of fonts loading