Moved typography into themes & re-worked vendor files