Menu changes. Officially 2.2 compatible

Brush Options are now all under one menu option to reduce scrolling