starting settings
adding text editing settings
merging into master
in progress
fixing merge issues