fixed mix-texts
changed keywords for dialogs