Fix Theme 2 fonts falling back to serif after upgrade