21. This according to the entries for each sonata in Helm, Thematic Catalogue.