Introduce key-chord to the default-packages
Pull in upstream changes