Refactor vaocabulary
Correct toolbar code
Update catalog.xml with third party values
Refactor publication schema