Fix the device dialog not working because the name of the style file changed.
Ensure that bookmarks are always sorted alphabetically when listed.