Added Windows settings as well.