Rename keys, add KEY_STARRED