Separate electricity and energy
Improved significantly :P
Signed-off-by:thehutch
Fixed incorrect symbol :P
Signed-off-by:thehutch
Spelt subtract wrong :P
Signed-off-by:thehutch
No value for Energy
Added VP License
Signed-off-by:thehutch
Update for API changes