Comment 20 for bug 239854

Great move, Jaap! I beg to differ on the Mark/Underline point, though, you could solve it like this:
1) Give the Mark style a different keyboard shortcut and icon.
2) Two versions down the line, create a new style called Underline.
3) Give the new Underline style the proper icon and keyboard shortcut.