Language category overhaul