Improve final content rendering
Clean up vendor definitions