Use a more standard layout.
Fix keyring.