Add chocolat.
Move to latest xquarz.