Handles toolbar json also
Merge: My version was better. :)