Don't require each plugin to include each element

Will be hard to add new things and avoid updating everything that uses this.

merged

mentioned in commit bff956c4