Conditions added for vim and darwin detection