Improved svg formulas