Merge Windows / OSX settings