More use of <kbd>
Various further additions for 2.5