Set up the Accessories
Merge branch 'dev2' into Vala
Fixed one last thing