Rework of units

Changes to `diagrams-svg` to track changes in `units2` branch