Updated based on comments
Small update

Added diacritics as well as making the "language" attribute necessary
for underlining.
First pass