Major revamp of energy rules targets net zero and boosts competition