Add elcid discharge
Chanve upstream branch
add wardround dep
Tweak brandname settings