Theme fixes and type style changes.