Update for linear and new Diagram type.

This updates everything I could find for the linear changes and the new Diagram type.  Everything builds for me under SVG.