Elektro and explosion recreated after refactor.
Merge remote-tracking branch 'origin/master' into Elektro