Started work on font-faces.

Also fixed underline, underline was sent in as a list in the method
therefore always hit the else-clause.