This is from the henneth annun website which I reccomend if you haven't seen it already.
Vanyar - the Fair Elves, the beloved of Manwë and Varda; led by Ingwë
Noldor - the Deep Elves, friends of Aulë; led by Finwë
Teleri - the Sea Elves; led by Elwë and Olwë
Calaquendi - Elves of Light, those who passed into the West in the days of the Trees
Úmanyar - those who never came to the Aman and the Blessed Realm; they are elves who were lost during the journey or who turned aside
Moriquendi - Elves of the Darkness; the Úmanyar and Avari
Of the Teleri, there were:
Sindar - the Grey-Elves, the Elves of Twilight; led by Elwë and Melian
Nandor - "those who turned back", from among Olwë's host, they turned aside from the journey westward, led by Lenwë
Eglath - the Forsaken People, those of Elwë's people who searched for him (as he stood enchanted after meeting Melian) and were left behind when Ulmo and Olwë would not wait
Falathrim - the Elves of the Fala, who were persuaded by Ossë to remain in Middle-earth when Ulmo took the remaining Teleri to Valinor; led by Cirdan
Of the Nandor:
Laiquendi - the Green-Elves, who "kept themselves by wariness and secrecy" after the death of Denethor, son of Lenwë
Silvan - Wood(land) Elves, those who never passed west but remained along the Anduin and in Greenwood.