Moved typography stuff from base to custom