Cleaning up web-fonts and moving into main css

- This is part of #497 even though it doesn't actually remove any CSS requests