Add delivered primary energy sources to Sankey diagram
Tweaked visual output