Rearranging. Added osx defaults