New version

New version - still does not quite yet work as the SVG borders are not
correctly calculated