Updated for 2.0.0 - needs a few screenshots redone, however