the question arises because some of the spell now said : Inflict X% of Weapon DPS

Thus i question which type of dmg increment affect this
For Example, Prismatic Bolt and Frost Wave BOTH inflict 10% of weapon dps
But because Prismatic Bolt is in Shock Tree, dmg increment to shock affect this?
and Frost Wave is in Ice tree, so ice dmg increment affect this?
is it like that?

Which makes me wonder if the mod changes how the overall damage scaling works
in Vanilla
add X dmg to Y element damage
- added to % based skill ( deal X% of Weapon dps as Y element)
- NOT added to fixed dmg skill ( deal X1 - X2 of Y element damage)

while add X% dmg to Y element damage is used for both
- added additively to % based skill
- added multiplicatively after all the present % modifier addition

So is it different now? i wanna maximized the dmg of my Prismatic bolt