Use my own fork
Use gnome-keyring
Update submodule