Refactor witness to use svg and floats