Reorganize language highlights a bit