Sync with latest npyscreen