merged with osx settings