Updated type styles etc