Make using shortcuts optional. And temporarily remove end_text_ because that's not designed at all