Add word-shape classes

Add word-shape classes