fix font fallback
Split units into sub-classes