fix escape
move them to settings
changes

changes