Re-add evil and key-chord modes