added zoo and osx profiles
fixed conflicts